diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-03-05 15:24:07 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-03-05 15:24:07 (GMT) |
| commit | 6a59b70cbac0a35f8b520d196105974949153181 (patch) | |
| tree | f3f32ae39e3aac96e6d23611f403b6c6bf0435f3 /Doc/howto | |
| parent | 80f7102d439446f6e1cf9abacfc5b4eac3796cea (diff) | |
| parent | 420f698d6e1785c767ef4c19ed25016351501e30 (diff) | |
| download | cpython-6a59b70cbac0a35f8b520d196105974949153181.zip cpython-6a59b70cbac0a35f8b520d196105974949153181.tar.gz cpython-6a59b70cbac0a35f8b520d196105974949153181.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Doc/howto')
| -rw-r--r-- | Doc/howto/advocacy.rst | 3 | ||||
| -rw-r--r-- | Doc/howto/cporting.rst | 4 | ||||
| -rw-r--r-- | Doc/howto/regex.rst | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Doc/howto/advocacy.rst b/Doc/howto/advocacy.rst index e67e201..2969d26 100644 --- a/Doc/howto/advocacy.rst +++ b/Doc/howto/advocacy.rst @@ -264,8 +264,7 @@ the organizations that use Python. **What are the restrictions on Python's use?** -They're practically nonexistent. Consult the :file:`Misc/COPYRIGHT` file in the -source distribution, or the section :ref:`history-and-license` for the full +They're practically nonexistent. Consult :ref:`history-and-license` for the full language, but it boils down to three conditions: * You have to leave the copyright notice on the software; if you don't include diff --git a/Doc/howto/cporting.rst b/Doc/howto/cporting.rst index 98db9dd..bea2153 100644 --- a/Doc/howto/cporting.rst +++ b/Doc/howto/cporting.rst @@ -261,8 +261,8 @@ behave slightly differently from real Capsules. Specifically: copy as you see fit.) You can find :file:`capsulethunk.h` in the Python source distribution -in the :file:`Doc/includes` directory. We also include it here for -your reference; here is :file:`capsulethunk.h`: +as :source:`Doc/includes/capsulethunk.h`. We also include it here for +your convenience: .. literalinclude:: ../includes/capsulethunk.h diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst index 07a8b56..3ac03ca 100644 --- a/Doc/howto/regex.rst +++ b/Doc/howto/regex.rst @@ -360,7 +360,7 @@ and more. You can learn about this by interactively experimenting with the :mod:`re` module. If you have :mod:`tkinter` available, you may also want to look at -:file:`Tools/demo/redemo.py`, a demonstration program included with the +:source:`Tools/demo/redemo.py`, a demonstration program included with the Python distribution. It allows you to enter REs and strings, and displays whether the RE matches or fails. :file:`redemo.py` can be quite useful when trying to debug a complicated RE. Phil Schwartz's `Kodos @@ -495,7 +495,7 @@ more convenient. If a program contains a lot of regular expressions, or re-uses the same ones in several locations, then it might be worthwhile to collect all the definitions in one place, in a section of code that compiles all the REs ahead of time. To take an example from the standard library, here's an extract -from the now deprecated :file:`xmllib.py`:: +from the now-defunct Python 2 standard :mod:`xmllib` module:: ref = re.compile( ... ) entityref = re.compile( ... ) |