Some cleanup in the docs.
diff --git a/Doc/tutorial/appetite.rst b/Doc/tutorial/appetite.rst
index f1c80e9..120955e 100644
--- a/Doc/tutorial/appetite.rst
+++ b/Doc/tutorial/appetite.rst
@@ -75,8 +75,6 @@
more detail. Since the best way to learn a language is to use it, the tutorial
invites you to play with the Python interpreter as you read.
-.. % \section{Where From Here \label{where}}
-
In the next chapter, the mechanics of using the interpreter are explained. This
is rather mundane information, but essential for trying out the examples shown
later.
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index e4e8451..7761095 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -341,7 +341,7 @@
Random Remarks
==============
-.. % [These should perhaps be placed more carefully...]
+.. These should perhaps be placed more carefully...
Data attributes override method attributes with the same name; to avoid
accidental name conflicts, which may cause hard-to-find bugs in large programs,
@@ -457,7 +457,7 @@
have no special privileges when calling other methods of the same object, a
method of a base class that calls another method defined in the same base class
may end up calling a method of a derived class that overrides it. (For C++
-programmers: all methods in Python are effectively :keyword:`virtual`.)
+programmers: all methods in Python are effectively ``virtual``.)
An overriding method in a derived class may in fact want to extend rather than
simply replace the base class method of the same name. There is a simple way to
@@ -574,12 +574,10 @@
can define a class with methods :meth:`read` and :meth:`readline` that get the
data from a string buffer instead, and pass it as an argument.
-.. % (Unfortunately, this
-.. % technique has its limitations: a class can't define operations that
-.. % are accessed by special syntax such as sequence subscripting or
-.. % arithmetic operators, and assigning such a ``pseudo-file'' to
-.. % \code{sys.stdin} will not cause the interpreter to read further input
-.. % from it.)
+.. (Unfortunately, this technique has its limitations: a class can't define
+ operations that are accessed by special syntax such as sequence subscripting
+ or arithmetic operators, and assigning such a "pseudo-file" to sys.stdin will
+ not cause the interpreter to read further input from it.)
Instance method objects have attributes, too: ``m.im_self`` is the instance
object with the method :meth:`m`, and ``m.im_func`` is the function object
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 0f72d3d..4869496 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -31,11 +31,8 @@
There can be zero or more :keyword:`elif` parts, and the :keyword:`else` part is
optional. The keyword ':keyword:`elif`' is short for 'else if', and is useful
to avoid excessive indentation. An :keyword:`if` ... :keyword:`elif` ...
-:keyword:`elif` ... sequence is a substitute for the :keyword:`switch` or
-:keyword:`case` statements found in other languages.
-
-.. % Weird spacings happen here if the wrapping of the source text
-.. % gets changed in the wrong way.
+:keyword:`elif` ... sequence is a substitute for the ``switch`` or
+``case`` statements found in other languages.
.. _tut-for:
@@ -54,8 +51,8 @@
iterates over the items of any sequence (a list or a string), in the order that
they appear in the sequence. For example (no pun intended):
-.. % One suggestion was to give a real C example here, but that may only
-.. % serve to confuse non-C programmers.
+.. One suggestion was to give a real C example here, but that may only serve to
+ confuse non-C programmers.
::
diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
index c243fe3..9f3320f 100644
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -400,7 +400,7 @@
There is a small bit of asymmetry here: packing multiple values always creates
a tuple, and unpacking works for any sequence.
-.. % XXX Add a bit on the difference between tuples and lists.
+.. XXX Add a bit on the difference between tuples and lists.
.. _tut-sets:
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index beca1be..d3b912a 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -178,11 +178,9 @@
:func:`open` returns a file object, and is most commonly used with two
arguments: ``open(filename, mode)``.
-.. % Opening files
-
::
- >>> f=open('/tmp/workfile', 'w')
+ >>> f = open('/tmp/workfile', 'w')
>>> print f
<open file '/tmp/workfile', mode 'w' at 80a0960>
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
index 987835b..1ba14d9 100644
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -219,8 +219,8 @@
file containing your start-up commands. This is similar to the :file:`.profile`
feature of the Unix shells.
-.. % XXX This should probably be dumped in an appendix, since most people
-.. % don't use Python interactively in non-trivial ways.
+.. XXX This should probably be dumped in an appendix, since most people
+ don't use Python interactively in non-trivial ways.
This file is only read in interactive sessions, not when Python reads commands
from a script, and not when :file:`/dev/tty` is given as the explicit source of
diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
index 7b663cc..3bbe53a 100644
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -11,18 +11,11 @@
line by itself in an example means you must type a blank line; this is used to
end a multi-line command.
-.. %
-.. % \footnote{
-.. % I'd prefer to use different fonts to distinguish input
-.. % from output, but the amount of LaTeX hacking that would require
-.. % is currently beyond my ability.
-.. % }
-
Many of the examples in this manual, even those entered at the interactive
prompt, include comments. Comments in Python start with the hash character,
-``'#'``, and extend to the end of the physical line. A comment may appear at
+``#``, and extend to the end of the physical line. A comment may appear at
the start of a line or following whitespace or code, but not within a string
-literal. A hash character within a string literal is just a hash character.
+literal. A hash character within a string literal is just a hash character.
Some examples::
@@ -642,5 +635,3 @@
Note that the interpreter inserts a newline before it prints the next prompt if
the last line was not completed.
-
-
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index fbe931e..6e45f64 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -218,8 +218,6 @@
* The module :mod:`compileall` can create :file:`.pyc` files (or :file:`.pyo`
files when :option:`-O` is used) for all modules in a directory.
- .. %
-
.. _tut-standardmodules:
@@ -238,11 +236,7 @@
provided on Windows systems. One particular module deserves some attention:
:mod:`sys`, which is built into every Python interpreter. The variables
``sys.ps1`` and ``sys.ps2`` define the strings used as primary and secondary
-prompts:
-
-.. %
-
-::
+prompts::
>>> import sys
>>> sys.ps1
@@ -451,8 +445,6 @@
file names with a capitalized first letter.) The DOS 8+3 filename restriction
adds another interesting problem for long module names.
-.. % The \code{__all__} Attribute
-
The only solution is for the package author to provide an explicit index of the
package. The import statement uses the following convention: if a package's
:file:`__init__.py` code defines a list named ``__all__``, it is taken to be the
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
index 599fcbd..5f332ae 100644
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -61,8 +61,8 @@
many of the questions that come up again and again, and may already contain the
solution for your problem.
-.. % Postings figure based on average of last six months activity as
-.. % reported by www.egroups.com; Jan. 2000 - June 2000: 21272 msgs / 182
-.. % days = 116.9 msgs / day and steadily increasing.
+.. Postings figure based on average of last six months activity as
+ reported by www.egroups.com; Jan. 2000 - June 2000: 21272 msgs / 182
+ days = 116.9 msgs / day and steadily increasing. (XXX up to date figures?)