diff options
| author | Georg Brandl <georg@python.org> | 2013-03-28 12:28:55 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-03-28 12:28:55 (GMT) |
| commit | 1bab7134a8d2e431ccca11a45ba4acb4203db495 (patch) | |
| tree | 0d65ff15a549ddf8d5a815c7c66b7e1f1f58263d /Doc/faq | |
| parent | 8cb15bf6ff32b6d9faee29efaae43334fe019360 (diff) | |
| parent | 44ea77bd817c0b50e01344b7e8758995aaeebb63 (diff) | |
| download | cpython-1bab7134a8d2e431ccca11a45ba4acb4203db495.zip cpython-1bab7134a8d2e431ccca11a45ba4acb4203db495.tar.gz cpython-1bab7134a8d2e431ccca11a45ba4acb4203db495.tar.bz2 | |
Merge with 3.3.
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/extending.rst | 4 | ||||
| -rw-r--r-- | Doc/faq/general.rst | 5 | ||||
| -rw-r--r-- | Doc/faq/gui.rst | 4 | ||||
| -rw-r--r-- | Doc/faq/library.rst | 4 | ||||
| -rw-r--r-- | Doc/faq/programming.rst | 4 | ||||
| -rw-r--r-- | Doc/faq/windows.rst | 4 |
6 files changed, 19 insertions, 6 deletions
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst index 4afb510..a9a234b 100644 --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -2,7 +2,9 @@ Extending/Embedding FAQ ======================= -.. contents:: +.. only:: html + + .. contents:: .. highlight:: c diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 9f26dc9..9a893ec 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -4,7 +4,10 @@ General Python FAQ ================== -.. contents:: +.. only:: html + + .. contents:: + General Information =================== diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst index f697cd3..5827f28 100644 --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -4,7 +4,9 @@ Graphic User Interface FAQ ========================== -.. contents:: +.. only:: html + + .. contents:: .. XXX need review for Python 3. diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst index 6a2682f..8bd774b 100644 --- a/Doc/faq/library.rst +++ b/Doc/faq/library.rst @@ -4,7 +4,9 @@ Library and Extension FAQ ========================= -.. contents:: +.. only:: html + + .. contents:: General Library Questions ========================= diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 32123de..0f4d148 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -4,7 +4,9 @@ Programming FAQ =============== -.. contents:: +.. only:: html + + .. contents:: General Questions ================= diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst index 0a85a40..651ba22 100644 --- a/Doc/faq/windows.rst +++ b/Doc/faq/windows.rst @@ -6,7 +6,9 @@ Python on Windows FAQ ===================== -.. contents:: +.. only:: html + + .. contents:: .. XXX need review for Python 3. XXX need review for Windows Vista/Seven? |