4 files changed, 24 insertions, 7 deletions
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index c083b7b4..ffabcc64 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -728,6 +728,18 @@ make
       </listitem>
      </varlistentry>
      <varlistentry>
+      <term><option>--static-aes-iv</option></term>
+      <listitem>
+       <para>
+        Causes use of a static initialization vector for AES-CBC.
+        This is intended for testing only so that output files can be
+        reproducible.  Never use it for production files.  This option
+        in particular is not secure since it significantly weakens the
+        encryption.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
       <term><option>--no-original-object-ids</option></term>
       <listitem>
        <para>
diff --git a/manual/qpdf.1.in b/manual/qpdf.1.in
index 83fad225..3ecec565 100644
--- a/manual/qpdf.1.in
+++ b/manual/qpdf.1.in
@@ -5,7 +5,7 @@
 qpdf \- PDF transformation software
 .SH SYNOPSIS
 .B qpdf
-[ \fIoptions \fR] \fIinfilename outfilename\fR
+[ \fIoptions \fR] \fIinfilename [ outfilename ]\fR
 .SH DESCRIPTION
 The qpdf program is used to convert one PDF file to another equivalent
 PDF file.  It is capable of performing a variety of transformations
diff --git a/manual/zlib-flate.1.in b/manual/zlib-flate.1.in
index 133dce7b..bc04fc55 100644
--- a/manual/zlib-flate.1.in
+++ b/manual/zlib-flate.1.in
@@ -4,18 +4,23 @@
 .SH NAME
 zlib-flate \- raw zlib compression program
 .SH SYNOPSIS
-.B qpdf
+.B zlib-flate
 \fI-compress | -uncompress\fR
 .SH DESCRIPTION
 The zlib-flate program is part of the qpdf package.
 .PP
-The zlib-flate program standard from input and writes to standard
-output either compressing or compressing its input using raw zlib
-compression.  This program is provided primarily as a debugging tool.
-It can be used to uncompress or compress raw PDF streams.
+The zlib-flate program reads from standard input and writes to
+standard output either compressing or compressing its input using raw
+zlib compression.  It can be used to uncompress or compress raw PDF
+streams or other data that is compressed with raw zlib compression.
+This program is provided primarily as a debugging tool, though it
+could be used for other purposes, such as being called from a script
+that creates simple PDF files.
 .PP
 This program should not be used as a general purpose compression
 tool.  Use something like gzip(1) instead.
 .PP
 For details about qpdf, please see the qpdf manual, which can be found
 in @docdir@/qpdf-manual.html or @docdir@/qpdf-manual.pdf.
+.SH "SEE ALSO"
+qpdf(1), gzip(1)
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index de611697..0788388b 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -29,7 +29,7 @@ static char const* whoami = 0;
 
 static char const* help = "\
 \n\
-Usage: qpdf [ options ] infilename outfilename\n\
+Usage: qpdf [ options ] infilename [ outfilename ]\n\
 \n\
 An option summary appears below.  Please see the documentation for details.\n\
 \n\