lots of new text in the gitHub classroom page!

Author: PythonCHB

source/modules/Py2vsPy3.rst

@@ -4,8 +4,9 @@
 Python 2 versus Python 3
 ########################
 
+now that Python version 2 has officially reached end of life, most recent information is in/about Python 3.
 
-Much of the example code you'll find online is Python2, rather than Python3
+But you will still find a lot of older example code online in Python2, rather than Python3
 
 For the most part, they are the same -- so you can use those examples to learn from.
 
@@ -98,4 +99,3 @@ Most of the other differences are essentially implementation details, like getti
 
 There are also a few syntax differences with more advanced topics: Exceptions, ``super()``, etc.
 
-We'll talk about all that when we cover those topics as well.

source/topics/01-setting_up/feature_branching.rst

@@ -2,6 +2,9 @@
 Feature Branching
 *****************
 
+.. note:: Feature branching is an important topic, but not one you need to know about right off -- if you are brand new to git -- feel free to ignore this, with gitHub classroom, it should handle it for you.
+
+
 Why use Feature Branches?
 =========================
 

source/topics/01-setting_up/git.rst

@@ -10,5 +10,5 @@ Git is a very powerful and useful tool. We only use a few of its features for th
     intro_to_git
     github_classroom
     git_overview
-    feature_branching
     git_hints
+    feature_branching

source/topics/01-setting_up/git_hints.rst

@@ -8,7 +8,10 @@ git is a very complex system, and can be used in many ways. Because of this, it
 
 Every group using git has to establish a standard "work flow". If you google "git workflow" you find a LOT of discussion, and they are not all the same. And depending on the workflow you are using, the problems you'll have and the solutions to them will be different.
 
-We are using a very simplified workflow for this class, and this page seeks to provide solutions to problems that you might encounter specifically with this workflow.
+We are using a very simplified workflow with gitHub classroom for this class, and this page seeks to provide solutions to problems that you might encounter specifically with this workflow.
+
+.. note:: This is a page for reference. It is a bit outdated, and should not be required right off. But do remember that it's here if you get tangled up in git as we move along.
+
 
 "origin" and "upstream"
 =======================
@@ -33,27 +36,18 @@ After cloning a repository (from gitHub, for instance) on your machine, is will
 
 so I have one remote repository, on gitHub. It is listed twice, as I am both fetching from (pulling) and pushing to the same repository. "origin" is created when you do a clone, and it is the one that is pushed to and pulled from by default. git is so flexible that you could set it up to push and pull be default to two different repos, but I've never seen that done.
 
-In case of the PythonCertclass, we need *another* remote repository:
-
-There is the central class repository, which only the instructors have permissions to change. But you want to be able to get updated materials from that repository as well.  Since this repo is the one your personal repo was "forked" from, the convention is to call it the "upstream" repository. You should have set that up with a command like this:
-
-.. code-block:: bash
+There is often use for having more than one remote repository, to keep various workflows in sync. But with gitHub classroom, you will have one: the "origin" remote that was created when you cloned your gitHub repo.
 
-    $ git remote add upstream https://github.com/UWPCE-PythonCert-ClassRepos/Sp2018-Accelerated.git
+Adding a remote
+---------------
 
-And it should look something like this when you check your remotes:
+If you do need to add a remote, you it's pretty easy:
 
 .. code-block:: bash
 
-    $ git remote -v
-    origin  https://github.com/PythonCHB/Sp2018-Accelerated.git (fetch)
-    origin  https://github.com/PythonCHB/Sp2018-Accelerated.git (push)
-    upstream    https://github.com/UWPCE-PythonCert-ClassRepos/Sp2018-Accelerated.git (fetch)
-    upstream    https://github.com/UWPCE-PythonCert-ClassRepos/Sp2018-Accelerated.git (push)
-
-So I now have two more remotes, one for pushing and one for pulling (fetching).
+  git remote add name_of_remote https://the_long_url_to_the_remote_repo.git
 
-Do this now on your own machine, and make sure that "origin" points to your repo on gitHub, and "upstream" is pointed to the one in the "UWPCE-PythonCert-ClassRepos" gitHub organization.
+"upstream" is a common name for antoher remote you need to talk to.
 
 Changing a remote
 -----------------
@@ -66,9 +60,8 @@ If your remotes are not set up right, you can reset them, but removing one:
 
 and then adding it back correctly:
 
-    $ git remote add upstream https://github.com/UWPCE-PythonCert-ClassRepos/Sp2018-Accelerated.git
+    $ git remote add upstream https://the_long_url_to_the_remote_repo.git
 
-**make sure to adjust that command for your particular class!**
 
 Working with "upstream"
 -----------------------