merge with 0.5

1 files changed, 21 insertions, 0 deletions

diff --git a/doc/markup/para.rst b/doc/markup/para.rst
index c60eb258..b071e46c 100644
--- a/doc/markup/para.rst
+++ b/doc/markup/para.rst
@@ -100,6 +100,27 @@ units as well as normal text:
       .. centered:: LICENSE AGREEMENT
 
 
+.. directive:: hlist
+
+   This directive must contain a bullet list.  It will transform it into a more
+   compact list by either distributing more than one item horizontally, or
+   reducing spacing between items, depending on the builder.
+
+   For builders that support the horizontal distribution, there is a ``columns``
+   option that specifies the number of columns; it defaults to 2.  Example::
+
+      .. hlist::
+         :columns: 3
+
+         * A list of
+         * short items
+         * that should be
+         * displayed
+         * horizontally
+
+   .. versionadded:: 0.6
+
+
 Table-of-contents markup
 ------------------------