winterishere · LoveMeWithoutAll · Nov 17, 2016 · Jun 12, 2016 · Jun 12, 2016 · Jun 13, 2016
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,6 +6,28 @@ see:
 
 http://docs.python-guide.org/en/latest/notes/contribute/
 
+How to test your changes
+------------------------
+
+The html version of this guide is built with [sphinx](http://www.sphinx-doc.org/en/stable/). You may test your revisions locally by having sphinx installed. You can do this easily with pip (as described in the link).
+
+``` bash
+pip install --user sphinx
+```
+
+Then navigate to the directory of the makefile and ```make build``` or ```make html```. Sphinx will then generate the html in a folder called _build/html
+
+After navigating to this folder, you can then use python's built in webserver to view your changes locally:
+
+``` bash
+python3 -m http.server
+```
+
+By default, http.server listens on every ip address bound on your host on port 8000. To bind to a specific one, say, localhost on port 8005:
+
+``` bash
+python3 -m http.server 8005 --bind 127.0.0.1
+```
 
 Style Guide
 -----------

diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
@@ -22,7 +22,7 @@ <h3>Stay Informed</h3>
 
 <h3>O'Reilly Book</h3>
 
-<p>This guide is now available for pre-order in tangible book form!</p>
+<p>This guide is now available in tangible book form!</p>
 
 <a href="https://www.amazon.com/Hitchhikers-Guide-Python-Practices-Development/dp/1491933178/ref=as_li_ss_il?ie=UTF8&linkCode=li2&tag=bookforkind-20&linkId=804806ebdacaf3b56567347f3afbdbca" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491933178&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=bookforkind-20" ></a><img src="//ir-na.amazon-adsystem.com/e/ir?t=bookforkind-20&l=li2&o=1&a=1491933178" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
 

diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
@@ -21,7 +21,7 @@ <h3>Get Updates</h3>
 
 <h3>O'Reilly Book</h3>
 
-<p>This guide is now available for pre-order in tangible book form!</p>
+<p>This guide is now available in tangible book form!</p>
 
 <a href="https://www.amazon.com/Hitchhikers-Guide-Python-Practices-Development/dp/1491933178/ref=as_li_ss_il?ie=UTF8&linkCode=li2&tag=bookforkind-20&linkId=804806ebdacaf3b56567347f3afbdbca" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491933178&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=bookforkind-20" ></a><img src="//ir-na.amazon-adsystem.com/e/ir?t=bookforkind-20&l=li2&o=1&a=1491933178" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
 

diff --git a/docs/contents.rst.inc b/docs/contents.rst.inc
@@ -64,6 +64,7 @@ different scenarios.
    scenarios/xml
    scenarios/json
    scenarios/crypto
+   scenarios/ml
    scenarios/clibs
 
 

diff --git a/docs/dev/virtualenvs.rst b/docs/dev/virtualenvs.rst
@@ -8,8 +8,8 @@ projects in separate places, by creating virtual Python environments for them.
 It solves the "Project X depends on version 1.x but, Project Y needs 4.x"
 dilemma, and keeps your global site-packages directory clean and manageable.
 
-For example, you can work on a project which requires Django 1.3 while also
-maintaining a project which requires Django 1.0.
+For example, you can work on a project which requires Django 1.10 while also
+maintaining a project which requires Django 1.8.
 
 virtualenv
 ----------

diff --git a/docs/locale/ko/LC_MESSAGES/dev/virtualenvs.mo b/docs/locale/ko/LC_MESSAGES/dev/virtualenvs.mo
diff --git a/docs/locale/ko/LC_MESSAGES/dev/virtualenvs.po b/docs/locale/ko/LC_MESSAGES/dev/virtualenvs.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pythonguide 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-11 08:03+0000\n"
+"POT-Creation-Date: 2016-11-17 01:45+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: ../../dev/virtualenvs.rst:11
 msgid ""
-"For example, you can work on a project which requires Django 1.3 while "
-"also maintaining a project which requires Django 1.0."
+"For example, you can work on a project which requires Django 1.10 while "
+"also maintaining a project which requires Django 1.8."
 msgstr ""
 
 #: ../../dev/virtualenvs.rst:15
@@ -308,41 +308,12 @@ msgid "And on Linux:"
 msgstr ""
 
 #~ msgid ""
-#~ "This will create a :file:`requirements.txt`"
-#~ " file, which contains a simple list"
-#~ " of all the packages in the "
-#~ "current environment, and their respective "
-#~ "versions. Later it will be easier "
-#~ "for a different developer (or you, "
-#~ "if you need to re-create the "
-#~ "environment) to install the same "
-#~ "packages using the same versions:"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "`virtualenvwrapper "
-#~ "<http://virtualenvwrapper.readthedocs.org/en/latest/index.html>`_ "
-#~ "provides a set of commands which "
-#~ "makes working with virtual environments "
-#~ "much more pleasant. It also places "
-#~ "all your virtual environments in one "
-#~ "place."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "(`Full virtualenvwrapper install instructions "
-#~ "<http://virtualenvwrapper.readthedocs.org/en/latest/install.html>`_.)"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "For Windows, you can use the "
-#~ "`virtualenvwrapper-powershell "
-#~ "<https://bitbucket.org/guillermooo/virtualenvwrapper-"
-#~ "powershell>`_ clone."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "`Full list of virtualenvwrapper commands "
-#~ "<http://virtualenvwrapper.readthedocs.org/en/latest/command_ref.html>`_."
+#~ "For example, you can work on a "
+#~ "project which requires Django 1.3 while"
+#~ " also maintaining a project which "
+#~ "requires Django 1.0."
 #~ msgstr ""
 
diff --git a/docs/locale/ko/LC_MESSAGES/scenarios/cli.mo b/docs/locale/ko/LC_MESSAGES/scenarios/cli.mo
diff --git a/docs/locale/ko/LC_MESSAGES/scenarios/cli.po b/docs/locale/ko/LC_MESSAGES/scenarios/cli.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pythonguide 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-11 08:03+0000\n"
+"POT-Creation-Date: 2016-11-17 01:45+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: ../../scenarios/cli.rst:19
 msgid ""
-"`mercurial <http://mercurial.selenic.com/>`_ - A distributed version "
+"`mercurial <https://www.mercurial-scm.org/>`_ - A distributed version "
 "control system primarily written in Python"
 msgstr ""
 
@@ -123,17 +123,26 @@ msgid ""
 "parsing and then invokes a sub-command to do the work."
 msgstr ""
 
+#: ../../scenarios/cli.rst:67
+msgid "Cement"
+msgstr ""
+
+#: ../../scenarios/cli.rst:69
+msgid ""
+"`Cement <http://builtoncement.com/>`_ is an advanced CLI Application "
+"Framework. Its goal is to introduce a standard, and feature-full platform"
+" for both simple and complex command line applications as well as support"
+" rapid development needs without sacrificing quality. Cement is flexible,"
+" and it's use cases span from the simplicity of a micro-framework to the "
+"complexity of a meg-framework."
+msgstr ""
+
+#~ msgid ""
+#~ msgstr ""
+
 #~ msgid ""
-#~ "`Cliff <https://cliff.readthedocs.org/en/latest>`_  is "
-#~ "a framework for building command-line"
-#~ " programs. It uses setuptools entry "
-#~ "points to provide subcommands, output "
-#~ "formatters, and other extensions. The "
-#~ "framework is meant to be used to"
-#~ " create multi-level commands such as"
-#~ " subversion and git, where the main"
-#~ " program handles some basic argument "
-#~ "parsing and then invokes a sub-"
-#~ "command to do the work."
+#~ "`mercurial <http://mercurial.selenic.com/>`_ - A "
+#~ "distributed version control system primarily"
+#~ " written in Python"
 #~ msgstr ""
 
diff --git a/docs/locale/ko/LC_MESSAGES/scenarios/ml.mo b/docs/locale/ko/LC_MESSAGES/scenarios/ml.mo
diff --git a/docs/locale/ko/LC_MESSAGES/scenarios/ml.po b/docs/locale/ko/LC_MESSAGES/scenarios/ml.po
@@ -0,0 +1,191 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2016. A <a
+# href="http://kennethreitz.com/pages/open-projects.html">Kenneth Reitz</a>
+# Project. <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">CC
+# BY-NC-SA 3.0</a>
+# This file is distributed under the same license as the pythonguide
+# package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: pythonguide 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-11-17 01:45+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+#: ../../scenarios/ml.rst:3
+msgid "Machine Learning"
+msgstr ""
+
+#: ../../scenarios/ml.rst:5
+msgid ""
+"Python has a vast number of libraries for data analysis, statistics and "
+"Machine Learning itself, making it a language of choice for many data "
+"scientists."
+msgstr ""
+
+#: ../../scenarios/ml.rst:7
+msgid ""
+"Some widely used packages for Machine Learning and other Data Science "
+"applications are enlisted below."
+msgstr ""
+
+#: ../../scenarios/ml.rst:10
+msgid "Scipy Stack"
+msgstr ""
+
+#: ../../scenarios/ml.rst:12
+msgid ""
+"The Scipy stack consists of a bunch of core helper packages used in data "
+"science, for statistical analysis and visualising data. Because of its "
+"huge number of functionalities and ease of use, the Stack is considered a"
+" must-have for most data science applications."
+msgstr ""
+
+#: ../../scenarios/ml.rst:14
+msgid ""
+"The Stack consists of the following packages (link to documentation "
+"given):"
+msgstr ""
+
+#: ../../scenarios/ml.rst:16
+msgid "`NumPy <http://www.numpy.org/>`_"
+msgstr ""
+
+#: ../../scenarios/ml.rst:17
+msgid "`SciPy library <https://www.scipy.org/>`_"
+msgstr ""
+
+#: ../../scenarios/ml.rst:18
+msgid "`Matplotlib <http://matplotlib.org/>`_"
+msgstr ""
+
+#: ../../scenarios/ml.rst:19
+msgid "`IPython <https://ipython.org/>`_"
+msgstr ""
+
+#: ../../scenarios/ml.rst:20
+msgid "`pandas <http://pandas.pydata.org/>`_"
+msgstr ""
+
+#: ../../scenarios/ml.rst:21
+msgid "`Sympy <http://www.sympy.org/en/index.html>`_"
+msgstr ""
+
+#: ../../scenarios/ml.rst:22
+msgid "`nose <http://nose.readthedocs.io/en/latest/>`_"
+msgstr ""
+
+#: ../../scenarios/ml.rst:24
+msgid ""
+"The stack also comes with Python bundled in, but has been excluded from "
+"the above list."
+msgstr ""
+
+#: ../../scenarios/ml.rst:27 ../../scenarios/ml.rst:41
+msgid "Installation"
+msgstr ""
+
+#: ../../scenarios/ml.rst:29
+msgid ""
+"For installing the full stack, or individual packages, you can refer to "
+"the instructions given `here <https://www.scipy.org/install.html>`_."
+msgstr ""
+
+#: ../../scenarios/ml.rst:31
+msgid ""
+"**NB:** `Anaconda <https://www.continuum.io/anaconda-overview>`_ is "
+"highly preferred and recommended for installing and maintaining data "
+"science packages seamlessly."
+msgstr ""
+
+#: ../../scenarios/ml.rst:34
+msgid "scikit-learn"
+msgstr ""
+
+#: ../../scenarios/ml.rst:36
+msgid ""
+"Scikit is a free and open-source machine learning library for Python. It "
+"offers off-the-shelf functions to implement many algorithms like linear "
+"regression, classifiers, SVMs, k-means, Neural Networks etc. It also has "
+"a few sample datasets which can be directly used for training and "
+"testing."
+msgstr ""
+
+#: ../../scenarios/ml.rst:38
+msgid ""
+"Because of its speed, robustness and easiness to use, it's one of the "
+"most widely-used libraries for many Machine Learning applications."
+msgstr ""
+
+#: ../../scenarios/ml.rst:43
+msgid "Through PyPI:"
+msgstr ""
+
+#: ../../scenarios/ml.rst:49
+msgid "Through conda:"
+msgstr ""
+
+#: ../../scenarios/ml.rst:55
+msgid ""
+"scikit-learn also comes in shipped with Anaconda (mentioned above). For "
+"more installation instructions, refer to `this link <http://scikit-"
+"learn.org/stable/install.html>`_."
+msgstr ""
+
+#: ../../scenarios/ml.rst:58
+msgid "Example"
+msgstr ""
+
+#: ../../scenarios/ml.rst:60
+msgid ""
+"For this example, we train a simple classifier on the `Iris dataset "
+"<http://en.wikipedia.org/wiki/Iris_flower_data_set>`_, which comes "
+"bundled in with scikit-learn."
+msgstr ""
+
+#: ../../scenarios/ml.rst:62
+msgid ""
+"The dataset takes four features of flowers: sepal length, sepal width, "
+"petal length and petal width, and classifies them into three flower "
+"species (labels): setosa, versicolor or virginica. The labels have been "
+"represented as numbers in the dataset: 0 (setosa), 1 (versicolor) and 2 "
+"(virginica)."
+msgstr ""
+
+#: ../../scenarios/ml.rst:64
+msgid ""
+"We shuffle the Iris dataset, and divide it into separate training and "
+"testing sets: keeping the last 10 data points for testing and rest for "
+"training. We then train the classifier on the training set, and predict "
+"on the testing set."
+msgstr ""
+
+#: ../../scenarios/ml.rst:107
+msgid ""
+"Since we're splitting randomly and the classifier trains on every "
+"iteration, the accuracy may vary. Running the above code gives:"
+msgstr ""
+
+#: ../../scenarios/ml.rst:115
+msgid ""
+"The first line contains the labels (i.e flower species) of the testing "
+"data as predicted by our classifier, and the second line contains the "
+"actual flower species as given in the dataset. We thus get an accuracy of"
+" 100% this time."
+msgstr ""
+
+#: ../../scenarios/ml.rst:117
+msgid ""
+"More on scikit-learn can be read in the `documentation <http://scikit-"
+"learn.org/stable/user_guide.html>`_."
+msgstr ""
+
diff --git a/docs/locale/ko/LC_MESSAGES/scenarios/speed.mo b/docs/locale/ko/LC_MESSAGES/scenarios/speed.mo