Merge pull request mattmakai#54 from mjhea0/gh-pages

mattmakai · mattmakai · commit 11eda29583a4 · 2015-06-14T10:01:49.000-07:00
updates ...
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,4 @@ pip-log.txt
 *~
 
 source/cache/
+venv
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -2,44 +2,48 @@
 Contributing
 ============
 
-Contributions are welcome and greatly appreciated! 
+Contributions are welcome and greatly appreciated!
 
 
 Fix Typos, Grammar Errors, etc
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Create pull requests at 
+Create pull requests at
 https://github.com/makaimc/fullstackpython.github.com/pulls.
 
 
 Submit Feedback
 ~~~~~~~~~~~~~~~
 
-The best way to send feedback is to file an issue at 
+The best way to send feedback is to file an issue at
 https://github.com/makaimc/fullstackpython.github.com/issues.
 
 
 Get Started!
 ------------
 
-If you're not familiar with `Pelican <http://docs.getpelican.com/>`_, check out the blog post on 
+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 
+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.
 
-2. Clone your fork locally::
+1. Clone your fork locally::
 
     $ git clone git@github.com:your_name_here/fullstackpython.github.com.git fsp
 
-3. Install your local copy into a virtualenv and set up your fork for local development::
+1. 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:
+
+    $ 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.
 
diff --git a/all.html b/all.html
@@ -1901,22 +1901,25 @@ <h1>Bottle</h1>
 <h2>Bottle resources</h2>
 <ul>
 <li>
-<p>The <a href="http://bottlepy.org/docs/dev/tutorial.html">official Bottle tutorial</a> 
+<p>The <a href="http://bottlepy.org/docs/dev/tutorial.html">official Bottle tutorial</a>
   provides a thorough view of basic concepts and features for the framework.</p>
 </li>
 <li>
 <p>Digital Ocean provides an extensive <a href="https://www.digitalocean.com/community/articles/how-to-use-the-bottle-micro-framework-to-develop-python-web-apps">introductory post on Bottle</a>.</p>
 </li>
 <li>
+<p><a href="https://realpython.com/blog/python/developing-with-bottle-part-1/">Developing With Bottle</a> details how to create a basic application with Bottle.</p>
+</li>
+<li>
 <p>This tutorial provides a walkthrough for
 <a href="http://www.giantflyingsaucer.com/blog/?p=3598">getting started with Bottle</a>.</p>
 </li>
 <li>
-<p>Here's a short code snippet for 
+<p>Here's a short code snippet for
   <a href="http://myadventuresincoding.wordpress.com/2011/01/02/creating-a-rest-api-in-python-using-bottle-and-mongodb/">creating a RESTful API with Bottle and MongoDB</a>.</p>
 </li>
 <li>
-<p>This <a href="http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/">tutorial</a> 
+<p>This <a href="http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/">tutorial</a>
   is another Bottle walkthrough for creating a RESTful web API.</p>
 </li>
 <li>
@@ -1937,27 +1940,27 @@ <h2>Open source Bottle example projects</h2>
   Bottle.</p>
 </li>
 <li>
-<p><a href="http://gengo.github.io/decanter/">Decanter</a> is a library for structuring 
+<p><a href="http://gengo.github.io/decanter/">Decanter</a> is a library for structuring
   Bottle projects.</p>
 </li>
 </ul>
 <h2>Bottle framework learning checklist</h2>
 <ol>
 <li>
-<p><a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a> 
-   or install via pip with <code>pip install bottle</code> on your local development 
+<p><a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a>
+   or install via pip with <code>pip install bottle</code> on your local development
    machine.</p>
 </li>
 <li>
-<p>Work through the official 
+<p>Work through the official
    <a href="http://bottlepy.org/docs/dev/tutorial.html">Bottle tutorial</a>.</p>
 </li>
 <li>
-<p>Start coding your Bottle app based on what you learned in the official 
-   tutorial plus reading open source example applications found below. </p>
+<p>Start coding your Bottle app based on what you learned in the official
+   tutorial plus reading open source example applications found above.</p>
 </li>
 <li>
-<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial 
+<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial
    Bottle application on the web.</p>
 </li>
 </ol>
diff --git a/bottle.html b/bottle.html
@@ -42,22 +42,25 @@ <h1>Bottle</h1>
 <h2>Bottle resources</h2>
 <ul>
 <li>
-<p>The <a href="http://bottlepy.org/docs/dev/tutorial.html">official Bottle tutorial</a> 
+<p>The <a href="http://bottlepy.org/docs/dev/tutorial.html">official Bottle tutorial</a>
   provides a thorough view of basic concepts and features for the framework.</p>
 </li>
 <li>
 <p>Digital Ocean provides an extensive <a href="https://www.digitalocean.com/community/articles/how-to-use-the-bottle-micro-framework-to-develop-python-web-apps">introductory post on Bottle</a>.</p>
 </li>
 <li>
+<p><a href="https://realpython.com/blog/python/developing-with-bottle-part-1/">Developing With Bottle</a> details how to create a basic application with Bottle.</p>
+</li>
+<li>
 <p>This tutorial provides a walkthrough for
 <a href="http://www.giantflyingsaucer.com/blog/?p=3598">getting started with Bottle</a>.</p>
 </li>
 <li>
-<p>Here's a short code snippet for 
+<p>Here's a short code snippet for
   <a href="http://myadventuresincoding.wordpress.com/2011/01/02/creating-a-rest-api-in-python-using-bottle-and-mongodb/">creating a RESTful API with Bottle and MongoDB</a>.</p>
 </li>
 <li>
-<p>This <a href="http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/">tutorial</a> 
+<p>This <a href="http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/">tutorial</a>
   is another Bottle walkthrough for creating a RESTful web API.</p>
 </li>
 <li>
@@ -78,27 +81,27 @@ <h2>Open source Bottle example projects</h2>
   Bottle.</p>
 </li>
 <li>
-<p><a href="http://gengo.github.io/decanter/">Decanter</a> is a library for structuring 
+<p><a href="http://gengo.github.io/decanter/">Decanter</a> is a library for structuring
   Bottle projects.</p>
 </li>
 </ul>
 <h2>Bottle framework learning checklist</h2>
 <ol>
 <li>
-<p><a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a> 
-   or install via pip with <code>pip install bottle</code> on your local development 
+<p><a href="https://github.com/defnull/bottle/raw/master/bottle.py">Download Bottle</a>
+   or install via pip with <code>pip install bottle</code> on your local development
    machine.</p>
 </li>
 <li>
-<p>Work through the official 
+<p>Work through the official
    <a href="http://bottlepy.org/docs/dev/tutorial.html">Bottle tutorial</a>.</p>
 </li>
 <li>
-<p>Start coding your Bottle app based on what you learned in the official 
-   tutorial plus reading open source example applications found below. </p>
+<p>Start coding your Bottle app based on what you learned in the official
+   tutorial plus reading open source example applications found above.</p>
 </li>
 <li>
-<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial 
+<p>Move on to the <a href="/deployment.html">deployment section</a> to get your initial
    Bottle application on the web.</p>
 </li>
 </ol>
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-13T09:50:31Z</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-14T09:42:37Z</updated></feed>
diff --git a/source/content/pages/04-web-development/04-bottle.markdown b/source/content/pages/04-web-development/04-bottle.markdown
@@ -2,7 +2,7 @@ title: Bottle
 category: page
 slug: bottle
 sort-order: 0404
-meta: Bottle is a Python web framework contained within a single source file. Learn more about Bottle on Full Stack Python. 
+meta: Bottle is a Python web framework contained within a single source file. Learn more about Bottle on Full Stack Python.
 
 
 # Bottle
@@ -13,18 +13,20 @@ included with Python.
 
 
 ## Bottle resources
-* The [official Bottle tutorial](http://bottlepy.org/docs/dev/tutorial.html) 
+* The [official Bottle tutorial](http://bottlepy.org/docs/dev/tutorial.html)
   provides a thorough view of basic concepts and features for the framework.
 
 * Digital Ocean provides an extensive [introductory post on Bottle](https://www.digitalocean.com/community/articles/how-to-use-the-bottle-micro-framework-to-develop-python-web-apps).
 
+* [Developing With Bottle](https://realpython.com/blog/python/developing-with-bottle-part-1/) details how to create a basic application with Bottle.
+
 * This tutorial provides a walkthrough for
 [getting started with Bottle](http://www.giantflyingsaucer.com/blog/?p=3598).
 
-* Here's a short code snippet for 
+* Here's a short code snippet for
   [creating a RESTful API with Bottle and MongoDB](http://myadventuresincoding.wordpress.com/2011/01/02/creating-a-rest-api-in-python-using-bottle-and-mongodb/).
 
-* This [tutorial](http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/) 
+* This [tutorial](http://gotofritz.net/blog/weekly-challenge/restful-python-api-bottle/)
   is another Bottle walkthrough for creating a RESTful web API.
 
 * [BAM! A Web Framework "Short Stack"](http://reachtim.com/articles/BAM-Short-Stack.html)
@@ -40,22 +42,22 @@ included with Python.
 * [Pattle](https://github.com/thekad/pasttle) is a pastebin clone built with
   Bottle.
 
-* [Decanter](http://gengo.github.io/decanter/) is a library for structuring 
+* [Decanter](http://gengo.github.io/decanter/) is a library for structuring
   Bottle projects.
 
 
 
 ## Bottle framework learning checklist
-1. [Download Bottle](https://github.com/defnull/bottle/raw/master/bottle.py) 
-   or install via pip with ``pip install bottle`` on your local development 
+1. [Download Bottle](https://github.com/defnull/bottle/raw/master/bottle.py)
+   or install via pip with ``pip install bottle`` on your local development
    machine.
 
-1. Work through the official 
+1. Work through the official
    [Bottle tutorial](http://bottlepy.org/docs/dev/tutorial.html).
 
-1. Start coding your Bottle app based on what you learned in the official 
-   tutorial plus reading open source example applications found below. 
+1. Start coding your Bottle app based on what you learned in the official
+   tutorial plus reading open source example applications found above.
 
-1. Move on to the [deployment section](/deployment.html) to get your initial 
+1. Move on to the [deployment section](/deployment.html) to get your initial
    Bottle application on the web.
 
diff --git a/source/static-html/CONTRIBUTING.rst b/source/static-html/CONTRIBUTING.rst
@@ -2,44 +2,48 @@
 Contributing
 ============
 
-Contributions are welcome and greatly appreciated! 
+Contributions are welcome and greatly appreciated!
 
 
 Fix Typos, Grammar Errors, etc
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Create pull requests at 
+Create pull requests at
 https://github.com/makaimc/fullstackpython.github.com/pulls.
 
 
 Submit Feedback
 ~~~~~~~~~~~~~~~
 
-The best way to send feedback is to file an issue at 
+The best way to send feedback is to file an issue at
 https://github.com/makaimc/fullstackpython.github.com/issues.
 
 
 Get Started!
 ------------
 
-If you're not familiar with `Pelican <http://docs.getpelican.com/>`_, check out the blog post on 
+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 
+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.
 
-2. Clone your fork locally::
+1. Clone your fork locally::
 
     $ git clone git@github.com:your_name_here/fullstackpython.github.com.git fsp
 
-3. Install your local copy into a virtualenv and set up your fork for local development::
+1. 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:
+
+    $ 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.
 

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,4 @@ pip-log.txt`
`33`	`33`	`*~`
`34`	`34`
`35`	`35`	`source/cache/`
	`36`	`+venv`
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-13T09:50:31Z</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-14T09:42:37Z</updated></feed>`