From 4ca185fd96dfd3c7a8d89d3afd8093a26acf178b Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 24 Dec 2023 07:12:32 -0500
Subject: Remove --disable-signatures; incorporate into --remove-restrictions

Rather than adding yet another flag that is almost never useful on its
own, just have --remove-restrictions disable digital signatures. The
operations are still separate in the API.
---
 manual/cli.rst           | 36 ++++++++++--------------------------
 manual/qpdf.1            | 14 ++++----------
 manual/release-notes.rst | 10 ++++++----
 3 files changed, 20 insertions(+), 40 deletions(-)

(limited to 'manual')

diff --git a/manual/cli.rst b/manual/cli.rst
index 411fbdf1..457796e3 100644
--- a/manual/cli.rst
+++ b/manual/cli.rst
@@ -736,40 +736,24 @@ Related Options
    whatever encryption was present on the input file. This
    functionality is not intended to be used for bypassing copyright
    restrictions or other restrictions placed on files by their
-   producers. See also :qpdf:ref:`--copy-encryption`,
-   :qpdf:ref:`--remove-restrictions`, and
-   :qpdf:ref:`--disable-signatures`.
+   producers. See also :qpdf:ref:`--copy-encryption` and
+   :qpdf:ref:`--remove-restrictions`.
 
 .. qpdf:option:: --remove-restrictions
 
    .. help: remove security restrictions from input file
 
       Remove restrictions associated with digitally signed PDF files.
-      This may be combined with --decrypt and --disable-signatures to
-      allow free editing of previously signed/encrypted files. This
-      option invalidates the signature but leaves its visual
-      appearance intact. See also --disable-signatures.
+      This may be combined with --decrypt to allow free editing of
+      previously signed/encrypted files. This option invalidates and
+      disables any digital signatures but leaves their visual
+      appearances intact.
 
    Remove security restrictions associated with digitally signed PDF
-   files. This may be combined with :qpdf:ref:`--decrypt` and
-   :qpdf:ref:`--disable-signatures` to allow free editing of
-   previously signed/encrypted files. This option invalidates the
-   signature but leaves its visual appearance intact. See also
-   :qpdf:ref:`--disable-signatures`.
-
-.. qpdf:option:: --disable-signatures
-
-   .. help: disable digital signature fields
-
-      Remove all digital signature fields from a file. The appearance
-      of the digital signature, if any, will remain on the page, but
-      it will no longer be a signature field. See also
-      --remove-restrictions.
-
-   Remove all digital signature fields from a file. The appearance
-   of the digital signature, if any, will remain on the page, but
-   it will no longer be a signature field. See also
-   :qpdf:ref:`--remove-restrictions`.
+   files. This may be combined with :qpdf:ref:`--decrypt` to allow
+   free editing of previously signed/encrypted files. This option
+   invalidates and disables any digital signatures but leaves their
+   visual appearances intact.
 
 .. qpdf:option:: --copy-encryption=file
 
diff --git a/manual/qpdf.1 b/manual/qpdf.1
index 9ab0fbd5..2ef91031 100644
--- a/manual/qpdf.1
+++ b/manual/qpdf.1
@@ -221,16 +221,10 @@ present on the input file. This option overrides that behavior.
 .TP
 .B --remove-restrictions \-\- remove security restrictions from input file
 Remove restrictions associated with digitally signed PDF files.
-This may be combined with --decrypt and --disable-signatures to
-allow free editing of previously signed/encrypted files. This
-option invalidates the signature but leaves its visual
-appearance intact. See also --disable-signatures.
-.TP
-.B --disable-signatures \-\- disable digital signature fields
-Remove all digital signature fields from a file. The appearance
-of the digital signature, if any, will remain on the page, but
-it will no longer be a signature field. See also
---remove-restrictions.
+This may be combined with --decrypt to allow free editing of
+previously signed/encrypted files. This option invalidates and
+disables any digital signatures but leaves their visual
+appearances intact.
 .TP
 .B --copy-encryption \-\- copy another file's encryption details
 --copy-encryption=file
diff --git a/manual/release-notes.rst b/manual/release-notes.rst
index 61626fb1..963f02b0 100644
--- a/manual/release-notes.rst
+++ b/manual/release-notes.rst
@@ -71,10 +71,8 @@ Planned changes for future 12.x (subject to change):
       shell completion and allows creation of passwords that start
       with ``-``.
 
-    - Add ``QPDFAcroFormDocumentHelper::disableDigitalSignatures`` and
-      the :qpdf:ref:`--disable-signatures` command-line argument. This
-      disables any digital signature fields, leaving their visual
-      representations intact.
+    - :qpdf:ref:`--remove-restrictions` flag now also disables
+      digital signatures in the file.
 
   - Build Enhancements:
 
@@ -102,6 +100,10 @@ Planned changes for future 12.x (subject to change):
     - Add methods to ``Buffer`` to work more easily and efficiently
       with ``std::string``.
 
+    - Add ``QPDFAcroFormDocumentHelper::disableDigitalSignatures``,
+      which disables any digital signature fields, leaving their
+      visual representations intact.
+
 11.6.4: December 10, 2023
   - Bug fixes:
 
-- 
cgit v1.2.3-54-g00ecf