updates to contrinuting guide - added info about upstream

mjhea0 · mjhea0 · commit 1600618e2e91 · 2015-06-16T11:18:09.000-06:00
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -25,8 +25,7 @@ Get Started!
 If you're not familiar with `Pelican <http://docs.getpelican.com/>`_, check out the blog post on
 `Getting Started with Pelican and GitHub Pages <http://www.mattmakai.com/introduction-to-pelican.html>`_.
 
-Ready to contribute? Here's how to set up Full Stack Python for local
-development.
+**Ready to contribute? Here's how to set up Full Stack Python for local development.**
 
 1. Fork the `fullstackpython.github.com <https://github.com/makaimc/fullstackpython.github.com>`_ repo on GitHub.
 
@@ -55,6 +54,8 @@ Note: make changes to the source/content/pages/\*.rst files then execute a
 
 6. Submit a pull request through the GitHub website.
 
+**Keep your fork in Sync**
+
 7. To keep your fork in sync with the original repo, add an `upstream remote <https://help.github.com/articles/configuring-a-remote-for-a-fork/>`_::
 
     $ git remote add upstream git@github.com:makaimc/fullstackpython.com.git
@@ -63,5 +64,4 @@ Note: make changes to the source/content/pages/\*.rst files then execute a
 
     $ git checkout master
     $ git fetch upstream
-    $ git merge upstream/master
-
+    $ git merge upstream/master
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T11:12:33Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T11:17:59Z</updated></feed>
diff --git a/source/static-html/CONTRIBUTING.rst b/source/static-html/CONTRIBUTING.rst
@@ -25,43 +25,43 @@ Get Started!
 If you're not familiar with `Pelican <http://docs.getpelican.com/>`_, check out the blog post on
 `Getting Started with Pelican and GitHub Pages <http://www.mattmakai.com/introduction-to-pelican.html>`_.
 
-Ready to contribute? Here's how to set up Full Stack Python for local
-development.
+**Ready to contribute? Here's how to set up Full Stack Python for local development.**
 
 1. Fork the `fullstackpython.github.com <https://github.com/makaimc/fullstackpython.github.com>`_ repo on GitHub.
 
-1. Clone your fork locally::
+2. Clone your fork locally::
 
     $ git clone git@github.com:your_name_here/fullstackpython.github.com.git fsp
 
-1. Install your local copy into a virtualenv and set up your fork for local development::
+3. Install your local copy into a virtualenv and set up your fork for local development::
 
     $ virtualenv --no-site-packages venvs/fsp
     $ source venvs/fsp/bin/activate
     $ cd fsp
 
-1. Install the requirements::
+4. Install the requirements::
 
     $ pip install -r source/requirements.txt
 
 Note: make changes to the source/content/pages/\*.rst files then execute a
 *make run* command from the source/ directory.
 
-1. Commit your changes and push your branch to GitHub::
+5. Commit your changes and push your branch to GitHub::
 
     $ git add .
     $ git commit -m "Your detailed description of your changes."
     $ git push origin gh-pages
 
-1. Submit a pull request through the GitHub website.
+6. Submit a pull request through the GitHub website.
 
-1. To keep your fork in sync with the original repo, add an `upstream remote <https://help.github.com/articles/configuring-a-remote-for-a-fork/>`_::
+**Keep your fork in Sync**
+
+7. To keep your fork in sync with the original repo, add an `upstream remote <https://help.github.com/articles/configuring-a-remote-for-a-fork/>`_::
 
     $ git remote add upstream git@github.com:makaimc/fullstackpython.com.git
 
-1. Sync your repo with the original repo::
+8. Sync your repo with the original repo::
 
     $ git checkout master
     $ git fetch upstream
-    $ git merge upstream/master
-
+    $ git merge upstream/master

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T11:12:33Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-06-16T11:17:59Z</updated></feed>`