merge with trunk

This commit is contained in:
Georg Brandl
2009-12-31 18:40:58 +01:00
25 changed files with 1143 additions and 13 deletions

View File

@@ -227,6 +227,7 @@ Index markup
.. index::
single: entry
pair: entry; pair
double: entry; double
triple: index; entry; triple
keyword: with