Merge pull request realpython#367 from cli248/update

sigmavirus24 · sigmavirus24 · commit 09de7cb15a8c · 2014-02-12T11:31:33.000-06:00
Several modifications
diff --git a/docs/intro/community.rst b/docs/intro/community.rst
@@ -75,7 +75,7 @@ The major events for the Python community are developer conferences. The two
 most notable conferences are PyCon, which is held in the US, and its European
 sibling, EuroPython.
 
-A comprehensive list of conferences is maintained `at pycon.org <http://www.pycon.org/>`_.
+A comprehensive list of conferences is maintained at `pycon.org <http://www.pycon.org/>`_.
 
 
 Python User Groups
diff --git a/docs/intro/learning.rst b/docs/intro/learning.rst
@@ -104,6 +104,8 @@ Pro Python
 This book is for intermediate to advanced Python programmers who are looking to understand how
 and why Python works the way it does and how they can take their code to the next level.
 
+    `Pro Python <http://propython.com>`_
+
 
 Expert Python Programming
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -145,7 +147,7 @@ chosen from mathematics and the natural sciences.
 Numerical Methods in Engineering with Python
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Numerical Methods in Engineering with Python,written by Jaan Kiusalaas, attempts to
+Numerical Methods in Engineering with Python, written by Jaan Kiusalaas, attempts to
 emphasis on numerical methods and how to implement them in Python.
 
     `Numerical Methods in Engineering with Python <http://www.cambridge.org/us/academic/subjects/engineering/engineering-mathematics-and-programming/numerical-methods-engineering-python-2nd-edition>`_
diff --git a/docs/scenarios/admin.rst b/docs/scenarios/admin.rst
@@ -177,8 +177,7 @@ A full terminal application like a widely extended top which is based on psutil
 monitoring is `glance <https://github.com/nicolargo/glances/>`_.
 
 Ansible
-Chef
-----
+-------
 
 .. todo:: Write about Ansible
 
diff --git a/docs/scenarios/scientific.rst b/docs/scenarios/scientific.rst
@@ -53,10 +53,11 @@ NumPy is compatible with Python versions 2.4 through to 2.7.2 and 3.1+.
 
 Numba
 -----
-Numba is an Numpy aware Python compiler (just-in-time (JIT) specializing 
-compiler) which compiles annotated Python (and Numpy) code to LLVM (Low Level 
-Virtual Machine) (through special decorators). 
-Briefly, Numba using system that compiles Python code with LLVM to code which 
+
+`Numba <http://numba.pydata.org>`_ is an Numpy aware Python compiler
+(just-in-time (JIT) specializing compiler) which compiles annotated Python (and
+Numpy) code to LLVM (Low Level Virtual Machine) (through special decorators).
+Briefly, Numba using system that compiles Python code with LLVM to code which
 can be natively executed at runtime.
 
 SciPy
diff --git a/docs/scenarios/xml.rst b/docs/scenarios/xml.rst
@@ -4,8 +4,8 @@ XML parsing
 untangle
 --------
 
-`untangle <http://0chris.com/untangle>`_ is a simple library which takes
-an XML document and returns a Python object which mirrors the nodes and
+`untangle <https://github.com/stchris/untangle>`_ is a simple library which
+takes an XML document and returns a Python object which mirrors the nodes and
 attributes in its structure.
 
 For example, an XML file like this:
diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
@@ -99,12 +99,12 @@ One simple option for a personal PyPi server is to use Amazon S3. A prerequisite
 
 6. **All done**
 
-* You can now your package with :code:`pip install --index-url=http://your-s3-bucket/packages/simple/ YourPackage`
+* You can now install your package with :code:`pip install --index-url=http://your-s3-bucket/packages/simple/ YourPackage`
 
 For Linux Distributions
 ::::::::::::::::::::::::
 
-* `Ubuntu <https://wiki.ubuntu.com/PackagingGuide/Python>`_
+* `Ubuntu <http://packaging.ubuntu.com/html/python-packaging.html>`_
 * `Fedora <https://fedoraproject.org/wiki/Packaging:Python>`_
 * `Debian <http://www.debian.org/doc/packaging-manuals/python-policy/>`_
 * `Arch <https://wiki.archlinux.org/index.php/Python_Package_Guidelines>`_
