From b76af9242faa0b7ff892d44cc0cf0e4304536024 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Mon, 11 Nov 2019 14:09:00 -0500
Subject: Clean up documentation around gnutls and C++-11

---
 manual/qpdf-manual.xml | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

(limited to 'manual/qpdf-manual.xml')

diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 24747159..9e0d6533 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -116,6 +116,11 @@
     The qpdf package has few external dependencies. In order to build
     qpdf, the following packages are required:
     <itemizedlist>
+     <listitem>
+      <para>
+       A C++ compiler that supports C++-11.
+      </para>
+     </listitem>
      <listitem>
       <para>
        zlib: <ulink url="http://www.zlib.net/">http://www.zlib.net/</ulink>
@@ -129,6 +134,13 @@
        url="https://libjpeg-turbo.org/">https://libjpeg-turbo.org/</ulink>
       </para>
      </listitem>
+     <listitem>
+      <para>
+       <emphasis>Recommended but not required:</emphasis> gnutls:
+       <ulink url="https://www.gnutls.org/">https://www.gnutls.org/</ulink>
+       to be able to use the gnutls crypto provider
+      </para>
+     </listitem>
      <listitem>
       <para>
        gnu make 3.81 or newer: <ulink url="http://www.gnu.org/software/make">http://www.gnu.org/software/make</ulink>
@@ -151,13 +163,6 @@
        -u</command>.
       </para>
      </listitem>
-     <listitem>
-      <para>
-       A C++ compiler that works well with STL and has the <type>long
-       long</type> type. Most modern C++ compilers should fit the bill
-       fine. QPDF is tested with gcc, clang, and Microsoft Visual C++.
-      </para>
-     </listitem>
     </itemizedlist>
    </para>
    <para>
@@ -4623,6 +4628,27 @@ print "\n";
     <term>9.1.rc1: November 9, 2019</term>
     <listitem>
      <itemizedlist>
+      <listitem>
+       <para>
+        Build Changes
+       </para>
+       <itemizedlist>
+        <listitem>
+         <para>
+          A C++-11 compiler is now required to build qpdf.
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          A new crypto provider that uses gnutls for crypto functions
+          is now available and can be enabled at build time. See <xref
+          linkend="ref.crypto"/> for more information about crypto
+          providers and <xref linkend="ref.crypto.build"/> for
+          specific information about the build.
+         </para>
+        </listitem>
+       </itemizedlist>
+      </listitem>
       <listitem>
        <para>
         Library Enhancements
-- 
cgit v1.2.3-54-g00ecf