Merge remote-tracking branch 'origin/master'

fisherds · fisherds · commit 75ec7eadda0b · 2017-08-28T12:56:10.000-04:00
diff --git a/src/m1e_comments_strings_print.py b/src/m1e_comments_strings_print.py
@@ -1,5 +1,17 @@
+########################################################################
+#
+# TODO: 1.
+#   (Yes, that means for YOU to DO things per these instructions:)
+#
+#   Run this module by right clicking anywhere in this window, then select
+#        Run 'name of file'
+#   After running, find the Console tab (below) and confirm that everything
+#   did indeed get printed (displayed).
+#
+########################################################################
+
 print('Hello, World')
 print('hi there')
-print('one', 'two', 'through my shoe')
+print('one', 'two', 'buckle my shoe')
 print(3 + 9)
 print('3 + 9', 'versus', 3 + 9)
diff --git a/src/m2_hello_world.py b/src/m2_hello_world.py
@@ -44,7 +44,7 @@
 # finished all the exercises in a module -- there will be no blue bars
 # left on the scrollbar-like thing to the right.
 #
-# You have now completed TO DO #2, so change its TO DO on line 26 to DONE
+# You have now completed TO DO #2, so change its TO DO on line 29 to DONE
 # (and proceed similarly for all forthcoming TODOs in this course).
 #
 ########################################################################
@@ -77,19 +77,18 @@
 ########################################################################
 #
 # TODO: 5.
-#   Look at the list of files in this project in the
-#     PyDev Package Explorer
-#   to the left.
+#   Look at the list of files in this project to the left.
 #   Note that this file (m2_hello_world.py) is now displayed in a blue
-#   font color.  That means that you have made changes to this file which
-#   have not yet been committed.
+#   font color (if the file is highlighted select a different file so yu can
+#   see the blue font color).  That means that you have made changes to
+#   this file which have not yet been committed.
 #
 #   COMMIT your work by selecting VCS from the menu bar, then select Commit Changes
 #   Make sure only the files you want to commit are checked and optionally
 #   add a quick Commit message to describe your work.  Then hover over the
 #   Commit button and select Commit and Push.  Commit saves the work to
-#   your computer.  Push saves a copy of your work up into your Github
-#   repository (saving to the cloud is saver).
+#   your computer.  "and Push" saves a copy of your work up into your Github
+#   repository (saving to the cloud is a better way to permanently safe work).
 #
 #   Oh, one more thing:
 #   Do you have any blue bars left on the on the scrollbar-like thing
diff --git a/src/m3_turtles.py b/src/m3_turtles.py
@@ -33,6 +33,7 @@
 #   Allow this file to use the rosegraphics.py file by marking the src
 #   directory as a "Sources Root".  Do that by right clicking on the src folder,
 #   then selector  Mark Directory As --> Sources Root
+#   Watch the red underlines on the line of code above disappear as you do that step.
 #   You will do that once for every project that uses rosegraphics so get used to it. :)
 #
 #   Run this module by Right clicking in this window and select Run 'filename'
@@ -73,6 +74,7 @@
 akil.left(90)
 akil.forward(50)
 
+
 ########################################################################
 #
 # TODO: 3.
@@ -116,6 +118,14 @@
 #
 #   Then COMMIT and Push your work using the VCS menu option.
 #
+#   Reminder of those steps...
+#   COMMIT your work by selecting VCS from the menu bar, then select Commit Changes
+#   Make sure only the files you want to commit are checked and optionally
+#   add a quick Commit message to describe your work.  Then hover over the
+#   Commit button and select Commit and Push.  Commit saves the work to
+#   your computer.  "and Push" saves a copy of your work up into your Github
+#   repository (saving to the cloud is a better way to permanently safe work).
+#
 #   You can COMMIT as often as you like.  DO FREQUENT COMMITS.
 #
 ########################################################################

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`# Allow this file to use the rosegraphics.py file by marking the src`
`34`	`34`	`# directory as a "Sources Root". Do that by right clicking on the src folder,`
`35`	`35`	`# then selector Mark Directory As --> Sources Root`
	`36`	`+# Watch the red underlines on the line of code above disappear as you do that step.`
`36`	`37`	`# You will do that once for every project that uses rosegraphics so get used to it. :)`
`37`	`38`	`#`
`38`	`39`	`# Run this module by Right clicking in this window and select Run 'filename'`
`@@ -73,6 +74,7 @@`
`73`	`74`	`akil.left(90)`
`74`	`75`	`akil.forward(50)`
`75`	`76`
	`77`	`+`
`76`	`78`	`########################################################################`
`77`	`79`	`#`
`78`	`80`	`# TODO: 3.`
`@@ -116,6 +118,14 @@`
`116`	`118`	`#`
`117`	`119`	`# Then COMMIT and Push your work using the VCS menu option.`
`118`	`120`	`#`
	`121`	`+# Reminder of those steps...`
	`122`	`+# COMMIT your work by selecting VCS from the menu bar, then select Commit Changes`
	`123`	`+# Make sure only the files you want to commit are checked and optionally`
	`124`	`+# add a quick Commit message to describe your work. Then hover over the`
	`125`	`+# Commit button and select Commit and Push. Commit saves the work to`
	`126`	`+# your computer. "and Push" saves a copy of your work up into your Github`
	`127`	`+# repository (saving to the cloud is a better way to permanently safe work).`
	`128`	`+#`
`119`	`129`	`# You can COMMIT as often as you like. DO FREQUENT COMMITS.`
`120`	`130`	`#`
`121`	`131`	`########################################################################`