diff options
| -rw-r--r-- | Doc/faq/extending.rst | 5 | ||||
| -rw-r--r-- | Doc/howto/functional.rst | 2 | ||||
| -rw-r--r-- | Doc/using/mac.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/2.1.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/2.6.rst | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst index 7f0c16e..856b1c6 100644 --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -54,7 +54,8 @@ with a tool such as `SWIG <http://www.swig.org>`_. `SIP <http://www.riverbankcomputing.co.uk/software/sip/>`__, `CXX <http://cxx.sourceforge.net/>`_ `Boost <http://www.boost.org/libs/python/doc/index.html>`_, or `Weave -<http://www.scipy.org/Weave>`_ are also alternatives for wrapping C++ libraries. +<http://www.scipy.org/Weave>`_ are also alternatives for wrapping +C++ libraries. How can I execute arbitrary Python statements from C? @@ -200,7 +201,7 @@ whole lot of difference between C and C++ -- so the strategy of building a new Python type around a C structure (pointer) type will also work for C++ objects. For C++ libraries, you can look at `SIP -<http://www.riverbankcomputing.co.uk/sip/>`_, `CXX +<http://www.riverbankcomputing.co.uk/software/sip/>`_, `CXX <http://cxx.sourceforge.net/>`_, `Boost <http://www.boost.org/libs/python/doc/index.html>`_, `Weave <http://www.scipy.org/Weave>`_ or `SWIG <http://www.swig.org>`_ diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst index 920dc2d..76a4400 100644 --- a/Doc/howto/functional.rst +++ b/Doc/howto/functional.rst @@ -336,7 +336,7 @@ substring. List comprehensions and generator expressions (short form: "listcomps" and "genexps") are a concise notation for such operations, borrowed from the -functional programming language Haskell (http://www.haskell.org). You can strip +functional programming language Haskell (http://www.haskell.org/). You can strip all the whitespace from a stream of strings with the following code:: line_list = [' line 1\n', 'line 2 \n', ...] diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst index 5ab30b6..13ac4b2 100644 --- a/Doc/using/mac.rst +++ b/Doc/using/mac.rst @@ -66,7 +66,7 @@ number of standard Unix command line editors, :program:`vim` and http://www.barebones.com/products/bbedit/index.shtml) are good choices, as is :program:`TextMate` (see http://macromates.com/). Other editors include :program:`Gvim` (http://macvim.org) and :program:`Aquamacs` -(http://aquamacs.org). +(http://aquamacs.org/). To run your script from the Terminal window you must make sure that :file:`/usr/local/bin` is in your shell search path. diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst index 6b2ce3f..7f40521 100644 --- a/Doc/whatsnew/2.1.rst +++ b/Doc/whatsnew/2.1.rst @@ -731,7 +731,7 @@ of the more notable changes are: ... For a fuller discussion of the line I/O changes, see the python-dev summary for - January 1-15, 2001 at http://www.python.org/dev/summary/2001-01-1.html. + January 1-15, 2001 at http://www.python.org/dev/summary/2001-01-1/. * A new method, :meth:`popitem`, was added to dictionaries to enable destructively iterating through the contents of a dictionary; this can be faster diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst index c94327b..cb5837a 100644 --- a/Doc/whatsnew/2.6.rst +++ b/Doc/whatsnew/2.6.rst @@ -2195,7 +2195,7 @@ changes, or look through the Subversion logs for all the details. This produces better results when operating on Unix's dot-files. For example, ``os.path.splitext('.ipython')`` now returns ``('.ipython', '')`` instead of ``('', '.ipython')``. - (:issue:`115886`) + (:issue:`1115886`) A new function, ``os.path.relpath(path, start='.')``, returns a relative path from the ``start`` path, if it's supplied, or from the current |