--- MERGE: merged r4566 to maintenance branch; original log message:

    fixed docstring of publish_from_doctree;
see http://thread.gmane.org/gmane.text.docutils.user/2852

git-svn-id: http://svn.code.sf.net/p/docutils/code/branches/docutils-0.4@4606 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 3 insertions, 3 deletions

diff --git a/docutils/core.py b/docutils/core.py
index 598ec8e68..7aaa29abe 100644
--- a/docutils/core.py
+++ b/docutils/core.py
@@ -468,9 +468,9 @@ def publish_from_doctree(document, destination_path=None,
                          settings_overrides=None, config_section=None,
                          enable_exit_status=None):
     """
-    Set up & run a `Publisher` to render from an existing document tree data
-    structure, for programmatic use with string I/O.  Return a pair of encoded
-    string output and document parts.
+    Set up & run a `Publisher` to render from an existing document
+    tree data structure, for programmatic use with string I/O.  Return
+    the encoded string output.
 
     Note that document.settings is overridden; if you want to use the settings
     of the original `document`, pass settings=document.settings.