Merged revisions 65532,65546-65547,65550-65551 via svnmerge from

svn+ssh://pythondev@svn.python.org/doctools/branches/0.4.x

........
  r65532 | georg.brandl | 2008-08-04 22:35:07 +0000 (Mon, 04 Aug 2008) | 2 lines

  Add a test file for misc. markup and fix a doc bug.
........
  r65546 | georg.brandl | 2008-08-05 09:55:20 +0000 (Tue, 05 Aug 2008) | 2 lines

  Show an indication while downloading the search index.
........
  r65547 | georg.brandl | 2008-08-05 10:07:50 +0000 (Tue, 05 Aug 2008) | 2 lines

  Fix an indentation problem in production lists. #3477.
........
  r65550 | georg.brandl | 2008-08-05 16:21:34 +0000 (Tue, 05 Aug 2008) | 2 lines

  Remove unused interface.js.
........
  r65551 | georg.brandl | 2008-08-06 08:48:21 +0000 (Wed, 06 Aug 2008) | 2 lines

  Don't try to remove a nonexisting static dir.
........

2 files changed, 102 insertions, 0 deletions

diff --git a/tests/root/contents.txt b/tests/root/contents.txt
index 346878b5..f890f172 100644
--- a/tests/root/contents.txt
+++ b/tests/root/contents.txt
@@ -12,6 +12,7 @@ Contents:
 
    images
    includes
+   markup
 
 Indices and tables
 ==================
diff --git a/tests/root/markup.txt b/tests/root/markup.txt
new file mode 100644
index 00000000..98a98fc2
--- /dev/null
+++ b/tests/root/markup.txt
@@ -0,0 +1,101 @@
+:tocdepth: 2
+
+Testing various markup
+======================
+
+.. sectionauthor:: Georg Brandl
+
+.. contents:: TOC
+
+
+Admonitions
+-----------
+
+.. note:: Note
+   Note text.
+
+.. warning:: Warning
+
+   Warning text.
+
+.. tip:
+   Tip text.
+
+
+Tables
+------
+
+.. tabularcolumns:: |L|L|R|
+
++----+----------------+----+
+| 1  | * Block elems  |  x |
+|    | * In table     |    |
++----+----------------+----+
+| 2  | Empty cells:   |    |
++----+----------------+----+
+
+
+Version markup
+--------------
+
+.. versionadded:: 0.5
+   Some funny **stuff**.
+
+.. versionchanged:: 0.5
+   Even more funny stuff. [#]_
+
+.. deprecated:: 0.4
+   Boring stuff.
+
+
+Misc stuff
+----------
+
+.. seealso::
+
+   `Google <http://www.google.com>`_
+       For everything.
+
+.. rubric:: Side note
+
+This is a side note.
+
+.. centered:: LICENSE AGREEMENT
+
+.. acks::
+
+   * Terry Pratchett
+   * J. R. R. Tolkien
+   * Monty Python
+
+.. glossary::
+
+   boson
+      Particle with integer spin.
+
+   fermion
+      Particle with half-integer spin.
+
+.. productionlist::
+   try_stmt: try1_stmt | try2_stmt
+   try1_stmt: "try" ":" `suite`
+            : ("except" [`expression` ["," `target`]] ":" `suite`)+
+            : ["else" ":" `suite`]
+            : ["finally" ":" `suite`]
+   try2_stmt: "try" ":" `suite`
+            : "finally" ":" `suite`
+
+
+Index markup
+------------
+
+.. index::
+   single: entry
+   pair: entry; pair
+   triple: index; entry; triple
+
+
+
+.. rubric:: Footnotes
+
+.. [#] Like footnotes.