Skip to content

Several modifications #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 12, 2014
Merged

Several modifications #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
832f698
update intro section: add Pro Python link
cli248 Feb 11, 2014
dcaa25d
remote duplicate Chef in admin.rst
cli248 Feb 12, 2014
2b78a93
add link to Numba
cli248 Feb 12, 2014
a8e7b57
update untangle link
cli248 Feb 12, 2014
0471855
update Ubuntu Python packaging docs link
cli248 Feb 12, 2014
78f2b9e
expand "-" belongs to "Ansible"
cli248 Feb 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/intro/community.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docs/intro/learning.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please collapse remove this and make This book at the beginning of the preceding paragraph the link.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @sigmavirus24, it seems the other suggested books, i.e., Python Koans, A Byte of Python, Expert Python, they don't have the link at the beginning of the preceding paragraph. That is why I put the Pro Python link at the line 107, which is consistent with other books.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, good call. I had forgotten about that.



Expert Python Programming
~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -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>`_
Expand Down
3 changes: 1 addition & 2 deletions docs/scenarios/admin.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 5 additions & 4 deletions docs/scenarios/scientific.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/scenarios/xml.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docs/shipping/packaging.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>`_
Expand Down