First few fixes in the new trees.

Doc-26/TODO

@@ -14,5 +14,4 @@ To do after conversion
 * write "About these documents"
 * finish "Documenting Python"
 * extend copyright.rst
-* fix the "quadruple" index term
-* fix :file: and |version| in install
+* fix :file: and |version| in install

Doc-26/library/datatypes.rst

@@ -9,6 +9,12 @@ The modules described in this chapter provide a variety of specialized data
 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:
 
 

Doc-26/library/stdtypes.rst

@@ -1307,7 +1307,6 @@ defined on mutable sequence types (where *x* is an arbitrary object):
 +------------------------------+--------------------------------+---------------------+
 
 .. index::
-   quadruple: operations on; mutable; sequence; types
    triple: operations on; sequence; types
    triple: operations on; list; type
    pair: subscript; assignment

Doc-26/library/strings.rst

@@ -6,7 +6,13 @@ String Services
 ***************
 
 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 @@ manipulation operations.  Here's an overview:
    unicodedata.rst
    stringprep.rst
    fpformat.rst
-Information on the methods of string objects can be found in section
-:ref:`string-methods`, "String Methods."
 

Doc-3k/library/datatypes.rst

@@ -9,6 +9,11 @@ The modules described in this chapter provide a variety of specialized data
 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:
 
 

Doc-3k/library/index.rst

@@ -29,11 +29,11 @@ documented in the Reference Manual.
    :maxdepth: 2
 
    intro.rst
-   constants.rst
-   exceptions.rst
    functions.rst
+   constants.rst
    objects.rst
    stdtypes.rst
+   exceptions.rst
 
    strings.rst
    datatypes.rst

Doc-3k/library/stdtypes.rst

@@ -1299,7 +1299,6 @@ defined on mutable sequence types (where *x* is an arbitrary object):
 +------------------------------+--------------------------------+---------------------+
 
 .. index::
-   quadruple: operations on; mutable; sequence; types
    triple: operations on; sequence; types
    triple: operations on; list; type
    pair: subscript; assignment

Doc-3k/library/strings.rst

@@ -6,7 +6,13 @@ String Services
 ***************
 
 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 @@ manipulation operations.  Here's an overview:
    unicodedata.rst
    stringprep.rst
    fpformat.rst
-Information on the methods of string objects can be found in section
-:ref:`string-methods`, "String Methods."
 

sphinx/templates/modindex.html

@@ -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 %}