diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 83a9cd7..ab145a5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,15 +15,15 @@ The html version of this guide is built with [sphinx](http://www.sphinx-doc.org/
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
+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:
+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:
+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
diff --git a/docs/404.rst b/docs/404.rst
new file mode 100644
index 0000000..4398775
--- /dev/null
+++ b/docs/404.rst
@@ -0,0 +1,25 @@
+404 — Not Found
+===============
+
+**Sorry, but we couldn't find the page you requested.**
+
+It looks like this was the result of either:
+
+- a mistyped address
+- an out-of-date link
+
+`Click here to go back to the homepage. `_
+
+Or, try `searching `_.
+
+.. raw:: html
+
+
diff --git a/docs/_static/ad.png b/docs/_static/ad.png
deleted file mode 100644
index 7fb229c..0000000
Binary files a/docs/_static/ad.png and /dev/null differ
diff --git a/docs/_templates/hacks.html b/docs/_templates/hacks.html
index 2d6a576..cea323b 100644
--- a/docs/_templates/hacks.html
+++ b/docs/_templates/hacks.html
@@ -1,47 +1 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index 9811df4..ebe19b3 100644
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -8,7 +8,7 @@
This opinionated guide exists to provide both novice and expert Python developers a best practice handbook to the installation, configuration, and usage of Python on a daily basis.
-
+
Stay Informed
Receive updates on new releases and upcoming projects.
@@ -21,10 +21,6 @@
Join Mailing List.
Say Thanks!
-
-
-
-
O'Reilly Book
diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
index e6d00e7..abaa630 100644
--- a/docs/_templates/sidebarlogo.html
+++ b/docs/_templates/sidebarlogo.html
@@ -8,6 +8,7 @@
This opinionated guide exists to provide both novice and expert Python developers a best practice handbook to the installation, configuration, and usage of Python on a daily basis.
+
Get Updates
Receive updates on new releases and upcoming projects.
@@ -19,10 +20,6 @@
Say Thanks!
Join Mailing List.
-
-
-
-
O'Reilly Book
diff --git a/docs/conf.py b/docs/conf.py
index f0bd46e..ebc2b87 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -106,11 +106,11 @@ html_theme = 'alabaster'
# documentation.
html_theme_options = {
'show_powered_by': False,
- 'github_user': 'kennethreitz',
+ 'github_user': 'realpython',
'github_repo': 'python-guide',
'github_banner': True,
'show_related': False,
- 'note_bg': '#FFF59C'
+ 'note_bg': '#FFF59C',
}
# Add any paths that contain custom themes here, relative to this directory.
diff --git a/docs/dev/virtualenvs.rst b/docs/dev/virtualenvs.rst
index dd6f4e6..dadc299 100644
--- a/docs/dev/virtualenvs.rst
+++ b/docs/dev/virtualenvs.rst
@@ -5,7 +5,7 @@ Pipenv & Virtual Environments
.. image:: https://farm5.staticflickr.com/4290/35294660055_42c02b2316_k_d.jpg
-This tutorial walks you through installing and using Python packages.
+This tutorial walks you through installing and using Python packages.
It will show you how to install and use the necessary tools and make strong
recommendations on best practices. Keep in mind that Python is used for a great
@@ -34,7 +34,7 @@ install the latest 3.x version from `python.org`_ or refer to the
`Installing Python`_ section of this guide.
.. Note:: If you're newcomer and you get an error like this:
-
+
.. code-block:: python
>>> python
@@ -76,7 +76,7 @@ cases.
Use ``pip`` to install Pipenv:
-.. code-block:: python
+.. code-block:: console
$ pip install --user pipenv
@@ -211,7 +211,7 @@ Install virtualenv via pip:
.. code-block:: console
$ pip install virtualenv
-
+
Test your installation
.. code-block:: console
diff --git a/docs/index.rst b/docs/index.rst
index 843d663..d766b0e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,7 +9,7 @@ The Hitchhiker's Guide to Python!
Greetings, Earthling! Welcome to The Hitchhiker's Guide to Python.
**This is a living, breathing guide.** If you'd like to contribute,
-`fork us on GitHub `_!
+`fork us on GitHub `_!
This handcrafted guide exists to provide both novice and expert Python
developers a best practice handbook to the installation, configuration, and
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
index 694abd8..8e71cfc 100644
--- a/docs/intro/learning.rst
+++ b/docs/intro/learning.rst
@@ -15,13 +15,21 @@ quick-start guide to the language.
`The Python Tutorial `_
+Real Python
+~~~~~~~~~~~
+
+Real Python is a repository of free and in-depth Python tutorials created by a diverse team of professional Python developers. At Real Python you can learn all things Python from the ground up. Everything from the absolute basics of Python, to web development and web scraping, to data visualization, and beyond.
+
+ `Real Python `_
+
+
Python Basics
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
pythonbasics.org is an introductiory tutorial for beginners. The tutorial includes exercises. It covers the basics and there are also in-depth lessons like object oriented programming and regular expressions.
`Python basics `_
-
+
Python for Beginners
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -32,14 +40,6 @@ At last it finishes off with tutorial "How to access MySQL db using python"
`Python for beginners `_
-Learn Python for Data Science Interactively
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you prefer an online interactive environment to learn Python for Data Science, `this free python tutorial by DataCamp `_ is a great way to get started. If you're already somewhat advanced and interested in machine learning, check out this `course on Supervised Learning with scikit-learn `_, by one the core developers of scikit-learn.
-
-
-`Python for data science `_
-
Learn Python Interactive Tutorial
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -51,12 +51,10 @@ without having to install Python locally.
`Learn Python `_
-
If you want a more traditional book, *Python For You and Me* is an excellent
resource for learning all aspects of the language.
`Python for You and Me `_
- `Learn Python Interactively with DataCamp! `_
Learn Python Step by Step
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -198,6 +196,15 @@ making the process of learning Python fun and engaging.
Intermediate
------------
+Python Tricks: The Book
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Discover Python's best practices with simple examples and start writing even more beautiful + Pythonic code. "Python Tricks: The Book" shows you exactly how.
+
+You’ll master intermediate and advanced-level features in Python with practical examples and a clear narrative:
+
+ `Python Tricks: The Book `_
+
Effective Python
~~~~~~~~~~~~~~~~
@@ -250,7 +257,7 @@ and can make classes and objects behave in different and magical ways.
.. note:: The Rafekettler.com is currently down, you can go to their Github version directly. Here you can find a PDF version:
`A Guide to Python's Magic Methods (repo on GitHub) `_
-
+
For Engineers and Scientists
diff --git a/docs/scenarios/scrape.rst b/docs/scenarios/scrape.rst
index e329782..7a8e944 100644
--- a/docs/scenarios/scrape.rst
+++ b/docs/scenarios/scrape.rst
@@ -105,5 +105,3 @@ using Python or we can save it to a file and share it with the world.
Some more cool ideas to think about are modifying this script to iterate
through the rest of the pages of this example dataset, or rewriting this
application to use threads for improved speed.
-
-If you want to learn how to import data using python - this `DataCamp course on Importing Data `_ is a great place to start.
diff --git a/requirements.txt b/requirements.txt
index 7813214..c2886a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,20 @@
-alabaster==0.7.7
-Babel==2.2.0
-docutils==0.12
-Jinja2==2.8
-MarkupSafe==0.23
-Pygments==2.1.1
-pytz==2015.7
-six==1.10.0
+alabaster==0.7.11
+Babel==2.6.0
+certifi==2018.4.16
+chardet==3.0.4
+docutils==0.14
+idna==2.7
+imagesize==1.0.0
+Jinja2==2.10
+MarkupSafe==1.0
+packaging==17.1
+Pygments==2.2.0
+pyparsing==2.2.0
+pytz==2018.5
+requests==2.19.1
+six==1.11.0
snowballstemmer==1.2.1
-Sphinx==1.3.5
-sphinx-rtd-theme==0.1.9
-wheel==0.29.0
+Sphinx==1.7.6
+sphinx-sitemap==0.3.1
+sphinxcontrib-websupport==1.1.0
+urllib3==1.23