From 48b2b5725738c41a95c793647e6834f51d4a71ee Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Fri, 1 Oct 2010 11:05:10 +0000
Subject: update doc

git-svn-id: svn+q:///qpdf/trunk@1036 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 TODO                   | 20 --------------------
 manual/qpdf-manual.xml | 16 ++++++++--------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/TODO b/TODO
index 1542fbe7..fe45f513 100644
--- a/TODO
+++ b/TODO
@@ -1,26 +1,6 @@
-2.2.1
-=====
-
- * Remove cerr and cout from QPDF*.cc
-
- * QPDF::checkLinearization writes things to std::cout, which makes it
-   hard for GUIs that want to display the result.  Go through all
-   library code and get rid of use of std::cout and std::cerr,
-   replacing them with some better mechanism.  To avoid changing the
-   ABI, add two new methods: one that takes a std::ostream& and one
-   that takes a reference to a std::vector<std::string>.  The real
-   code should append to the vector.  The ostream version should
-   remember to catch exceptions, output the vector elements, and
-   rethrow if needed.  The old version should call the ostream version
-   with std::cout.
-
-
 General
 =======
 
- * In general, take a fresh look at private methods to see which, if
-   any, should be protected.
-
  * Look at page splitting.  Subramanyam provided a test file; see
    ../misc/article-threads.pdf.  Email Q-Count: 431864 from
    2009-11-03.  See also "Splitting by Pages" below.
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 773a918e..ab9891fb 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -2080,14 +2080,7 @@ print "\n";
      <itemizedlist>
       <listitem>
        <para>
-        Add new method <classname>QPDF::processMemoryFile</classname>
-        for operating on PDF files that are loaded into memory rather
-        than in a file on disk.
-       </para>
-      </listitem>
-      <listitem>
-       <para>
-        Add new method <classname>QPDF::setOutputStreams</classname>
+        Add new method <function>QPDF::setOutputStreams</function>
         to replace <varname>std::cout</varname> and
         <varname>std::cerr</varname> with other streams for generation
         of diagnostic messages and error messages.  This can be useful
@@ -2102,6 +2095,13 @@ print "\n";
         <literal>setSuppressWarnings(true)</literal> is called.
        </para>
       </listitem>
+      <listitem>
+       <para>
+        Add new method <function>QPDF::processMemoryFile</function>
+        for operating on PDF files that are loaded into memory rather
+        than in a file on disk.
+       </para>
+      </listitem>
       <listitem>
        <para>
         Give a warning but otherwise ignore empty PDF objects by
-- 
cgit v1.2.3-54-g00ecf