diff options
| author | Georg Brandl <georg@python.org> | 2014-10-29 09:57:42 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-29 09:57:42 (GMT) |
| commit | bad8d4bb53577fbea939d3490713dc9d941eb27f (patch) | |
| tree | 4c0c54f3f3d2a671f754cead2fafe30cddead67f /Doc/howto | |
| parent | 794e9bf1fe5bd0000f90c1502b16c96eb68a59af (diff) | |
| parent | b7354a65ce71ac39d7dec97cce4ca7afdffcb8a3 (diff) | |
| download | cpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.zip cpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.tar.gz cpython-bad8d4bb53577fbea939d3490713dc9d941eb27f.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/howto')
| -rw-r--r-- | Doc/howto/cporting.rst | 2 | ||||
| -rw-r--r-- | Doc/howto/pyporting.rst | 3 | ||||
| -rw-r--r-- | Doc/howto/webservers.rst | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst index 6ebcc41..d7a7086 100644 --- a/Doc/howto/cporting.rst +++ b/Doc/howto/cporting.rst @@ -252,6 +252,6 @@ Other options ============= If you are writing a new extension module, you might consider `Cython -<http://www.cython.org>`_. It translates a Python-like language to C. The +<http://cython.org/>`_. It translates a Python-like language to C. The extension modules it creates are compatible with Python 3 and Python 2. diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst index 4f76bde..68fa33a 100644 --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -609,11 +609,10 @@ please email the python-porting_ mailing list. .. _future: http://python-future.org/ .. _modernize: https://github.com/mitsuhiko/python-modernize .. _Porting to Python 3: http://python3porting.com/ -.. _PyPI: https://pypi.python.org/ +.. _PyPI: https://pypi.python.org/pypi .. _Python 3 Packages: https://pypi.python.org/pypi?:action=browse&c=533&show=all .. _Python 3 Q & A: http://ncoghlan-devs-python-notes.readthedocs.org/en/latest/python3/questions_and_answers.html .. _python-porting: https://mail.python.org/mailman/listinfo/python-porting .. _six: https://pypi.python.org/pypi/six .. _tox: https://pypi.python.org/pypi/tox .. _trove classifiers: https://pypi.python.org/pypi?%3Aaction=list_classifiers - diff --git a/Doc/howto/webservers.rst b/Doc/howto/webservers.rst index ab233f4..9ce9095 100644 --- a/Doc/howto/webservers.rst +++ b/Doc/howto/webservers.rst @@ -515,7 +515,7 @@ Popular template engines include: * `Mako <http://www.makotemplates.org/>`_ * `Genshi <http://genshi.edgewall.org/>`_ - * `Jinja <http://jinja.pocoo.org/2/>`_ + * `Jinja <http://jinja.pocoo.org/>`_ .. seealso:: |