[Python-checkins] r56663 - in doctools/trunk: Doc-26/TODO Doc-26/library/datatypes.rst Doc-26/library/stdtypes.rst Doc-26/library/strings.rst Doc-3k/library/datatypes.rst Doc-3k/library/index.rst Doc-3k/library/stdtypes.rst Doc-3k/library/strings.rst sphinx/templates/modindex.html
georg.brandl
python-checkins at python.org
Thu Aug 2 11:16:37 CEST 2007
Author: georg.brandl
Date: Thu Aug 2 11:16:36 2007
New Revision: 56663
Modified:
doctools/trunk/Doc-26/TODO
doctools/trunk/Doc-26/library/datatypes.rst
doctools/trunk/Doc-26/library/stdtypes.rst
doctools/trunk/Doc-26/library/strings.rst
doctools/trunk/Doc-3k/library/datatypes.rst
doctools/trunk/Doc-3k/library/index.rst
doctools/trunk/Doc-3k/library/stdtypes.rst
doctools/trunk/Doc-3k/library/strings.rst
doctools/trunk/sphinx/templates/modindex.html
Log:
First few fixes in the new trees.
Modified: doctools/trunk/Doc-26/TODO
==============================================================================
--- doctools/trunk/Doc-26/TODO (original)
+++ doctools/trunk/Doc-26/TODO Thu Aug 2 11:16:36 2007
@@ -14,5 +14,4 @@
* write "About these documents"
* finish "Documenting Python"
* extend copyright.rst
-* fix the "quadruple" index term
-* fix :file: and |version| in install
\ No newline at end of file
+* fix :file: and |version| in install
Modified: doctools/trunk/Doc-26/library/datatypes.rst
==============================================================================
--- doctools/trunk/Doc-26/library/datatypes.rst (original)
+++ doctools/trunk/Doc-26/library/datatypes.rst Thu Aug 2 11:16:36 2007
@@ -9,6 +9,12 @@
types such as dates and times, fixed-type arrays, heap queues, synchronized
queues, and sets.
+Python also provides some built-in data types, in particular,
+:class:`dict`, :class:`list`, :class:`set` (which along with
+:class:`frozenset`, replaces the deprecated :mod:`sets` module), and
+:class:`tuple`. The :class:`str` class can be used to handle binary data
+and 8-bit text, and the :class:`unicode` class to handle Unicode text.
+
The following modules are documented in this chapter:
Modified: doctools/trunk/Doc-26/library/stdtypes.rst
==============================================================================
--- doctools/trunk/Doc-26/library/stdtypes.rst (original)
+++ doctools/trunk/Doc-26/library/stdtypes.rst Thu Aug 2 11:16:36 2007
@@ -1307,7 +1307,6 @@
+------------------------------+--------------------------------+---------------------+
.. index::
- quadruple: operations on; mutable; sequence; types
triple: operations on; sequence; types
triple: operations on; list; type
pair: subscript; assignment
Modified: doctools/trunk/Doc-26/library/strings.rst
==============================================================================
--- doctools/trunk/Doc-26/library/strings.rst (original)
+++ doctools/trunk/Doc-26/library/strings.rst Thu Aug 2 11:16:36 2007
@@ -6,7 +6,13 @@
***************
The modules described in this chapter provide a wide range of string
-manipulation operations. Here's an overview:
+manipulation operations.
+
+In addition, Python's built-in string classes support the sequence type
+methods described in the :ref:`typesseq` section, and also the
+string-specific methods described in the :ref:`string-methods` section.
+To output formatted strings use template strings or the ``%`` operator
+described in the :ref:`typesseq-strings` section.
.. toctree::
@@ -21,6 +27,4 @@
unicodedata.rst
stringprep.rst
fpformat.rst
-Information on the methods of string objects can be found in section
-:ref:`string-methods`, "String Methods."
Modified: doctools/trunk/Doc-3k/library/datatypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/datatypes.rst (original)
+++ doctools/trunk/Doc-3k/library/datatypes.rst Thu Aug 2 11:16:36 2007
@@ -9,6 +9,11 @@
types such as dates and times, fixed-type arrays, heap queues, synchronized
queues, and sets.
+Python also provides some built-in data types, in particular,
+:class:`dict`, :class:`list`, :class:`set` and :class:`frozenset`, and
+:class:`tuple`. The :class:`str` class can be used to handle binary data
+and 8-bit text, and the :class:`unicode` class to handle Unicode text.
+
The following modules are documented in this chapter:
Modified: doctools/trunk/Doc-3k/library/index.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/index.rst (original)
+++ doctools/trunk/Doc-3k/library/index.rst Thu Aug 2 11:16:36 2007
@@ -29,11 +29,11 @@
:maxdepth: 2
intro.rst
- constants.rst
- exceptions.rst
functions.rst
+ constants.rst
objects.rst
stdtypes.rst
+ exceptions.rst
strings.rst
datatypes.rst
Modified: doctools/trunk/Doc-3k/library/stdtypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/stdtypes.rst (original)
+++ doctools/trunk/Doc-3k/library/stdtypes.rst Thu Aug 2 11:16:36 2007
@@ -1299,7 +1299,6 @@
+------------------------------+--------------------------------+---------------------+
.. index::
- quadruple: operations on; mutable; sequence; types
triple: operations on; sequence; types
triple: operations on; list; type
pair: subscript; assignment
Modified: doctools/trunk/Doc-3k/library/strings.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/strings.rst (original)
+++ doctools/trunk/Doc-3k/library/strings.rst Thu Aug 2 11:16:36 2007
@@ -6,7 +6,13 @@
***************
The modules described in this chapter provide a wide range of string
-manipulation operations. Here's an overview:
+manipulation operations.
+
+In addition, Python's built-in string classes support the sequence type
+methods described in the :ref:`typesseq` section, and also the
+string-specific methods described in the :ref:`string-methods` section.
+To output formatted strings use template strings or the ``%`` operator
+described in the :ref:`typesseq-strings` section.
.. toctree::
@@ -21,6 +27,4 @@
unicodedata.rst
stringprep.rst
fpformat.rst
-Information on the methods of string objects can be found in section
-:ref:`string-methods`, "String Methods."
Modified: doctools/trunk/sphinx/templates/modindex.html
==============================================================================
--- doctools/trunk/sphinx/templates/modindex.html (original)
+++ doctools/trunk/sphinx/templates/modindex.html Thu Aug 2 11:16:36 2007
@@ -11,6 +11,7 @@
{%- endfor %}
</div>
{% endif %}
+{% if builder == 'web' %}
<form class="pfform" action="" method="get">
Show modules only available on these platforms:<br>
{% for pl in platforms -%}
@@ -20,6 +21,7 @@
{% endfor %}
<input type="submit" value="Apply">
</form>
+{% endif %}
<table width="100%" class="indextable" cellspacing="0" cellpadding="2">
{%- for modname, collapse, cgroup, indent, fname, synops, pform in modindexentries %}
More information about the Python-checkins
mailing list