Skip to content

Commit 29f6248

Browse files
author
Kenneth Reitz
committed
Merge pull request #141 from mahmoudhossam/master
More content.
2 parents 4760a40 + cf18ac9 commit 29f6248

3 files changed

Lines changed: 41 additions & 6 deletions

File tree

‎docs/intro/learning.rst‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,16 @@ additional resource or reference will be helpful.
7676

7777
More information about test driven development can be found at these resources:
7878

79-
`Test Driven Development <http://en.wikipedia.org/wiki/Test-driven_development>`
79+
`Test Driven Development <http://en.wikipedia.org/wiki/Test-driven_development>`_
80+
81+
A Byte of Python
82+
~~~~~~~~~~~~~~~~
83+
84+
A free introductory book that teaches python at the beginner level, it assumes no
85+
previous programming experience.
86+
87+
`A Byte of Python for Python 2.x <http://www.ibiblio.org/swaroopch/byteofpython/read/>`_
88+
`A Byte of Python for Python 3.x <http://www.swaroopch.org/notes/Python_en:Table_of_Contents>`_
8089

8190

8291
Advanced
@@ -85,7 +94,9 @@ Advanced
8594
Pro Python
8695
~~~~~~~~~~
8796

88-
.. todo:: Write about `Pro Python <http://propython.com/>`_
97+
This book is for intermediate to advanced Python programmers who are looking to understand how
98+
and why Python works the way it does and how they can take their code to the next level.
99+
89100

90101
Expert Python Programming
91102
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -103,6 +114,14 @@ development, version control, and optimization/profiling.
103114

104115
`Expert Python Programming <http://www.packtpub.com/expert-python-programming/book>`_
105116

117+
The Python Tutorial
118+
~~~~~~~~~~~~~~~~~~~~
119+
120+
This is the official tutorial, it covers all the basics, and offers a tour of the
121+
language and the standard library, recommended for those who need a quickstart
122+
guide to the language.
123+
124+
`The Python Tutorial <http://docs.python.org/tutorial/index.html>`_
106125

107126
References
108127
----------
@@ -113,3 +132,11 @@ Python in a Nutshell
113132
Python in a Nutshell, written by Alex Martelli, covers most cross-platform
114133
python's usage, from its syntax to built-in libraries to advanced topics such
115134
as writing C extensions.
135+
136+
The Python Language Reference
137+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
138+
139+
This is Python's reference manual, it covers the syntax and the core symantics of the
140+
language.
141+
142+
`The Python Language Reference <http://docs.python.org/reference/index.html>`_

‎docs/scenarios/db.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ database access modules. It's documented in `PEP 249 <http://www.python.org/dev/
99
Nearly all Python database modules such as `sqlite3`, `psycopg` and
1010
`mysql-python` conform to this interface.
1111

12-
12+
Tutorials that explain how to work with modules that conform to this interface can be found
13+
`here <http://halfcooked.com/presentations/osdc2006/python_databases.html>`_ and
14+
`here <http://www.amk.ca/python/writing/DB-API.html>`_.
1315

1416
SQLAlchemy
1517
----------

‎docs/starting/which-python.rst‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ If you are looking to squeeze more performance out of your Python code, it's
7070
worth giving PyPy a try. On a suite of benchmarks, it's current `over 5 times
7171
faster than CPython <http://speed.pypy.org/>`_.
7272

73-
Currently PyPy supports Python 2.7.
73+
Currently PyPy supports Python 2.7. [#pypy_ver]_
7474

7575
Jython
7676
------
@@ -83,7 +83,7 @@ module.
8383
If you need to interface with an existing Java codebase or have other reasons to
8484
need to write Python code for the JVM, Jython is the best choice.
8585

86-
Currently Jython supports up to Python 2.5.
86+
Currently Jython supports up to Python 2.5. [#jython_ver]_
8787

8888
IronPython
8989
----------
@@ -96,4 +96,10 @@ expose Python code to other .NET languages.
9696
IronPython directly in to the Visual Studio development environment, making it
9797
an ideal choice for Windows developers.
9898

99-
IronPython supports Python 2.7.
99+
IronPython supports Python 2.7. [#iron_ver]_
100+
101+
.. [#pypy_ver] http://pypy.org/compat.html
102+
103+
.. [#jython_ver] http://wiki.python.org/jython/JythonFaq/GeneralInfo#Is_Jython_the_same_language_as_Python.3F
104+
105+
.. [#iron_ver] http://ironpython.codeplex.com/releases/view/54498

0 commit comments

Comments
 (0)