From c6c2b63086a98c91d039b29c6b7da93e8f792b98 Mon Sep 17 00:00:00 2001 From: Steffen Rehberg Date: Tue, 19 Nov 2024 17:10:32 +0100 Subject: [PATCH 1/2] DOC: Fix some typos in cli.rst --- manual/cli.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manual/cli.rst b/manual/cli.rst index fee79454..ccbab0cf 100644 --- a/manual/cli.rst +++ b/manual/cli.rst @@ -1948,11 +1948,11 @@ Encryption --encrypt user-password owner-password key-length [options] -- The first form, with flags for the passwords and bit length, was - introduced in qpdf 11.7.0. Only the --bits option is is mandatory. + introduced in qpdf 11.7.0. Only the --bits option is mandatory. This form allows you to use any text as the password. If passwords are specified, they must be given before the --bits option. - The second form has been in qpdf since the beginning and wil + The second form has been in qpdf since the beginning and will continue to be supported. Either or both of user-password and owner-password may be empty strings. @@ -1967,7 +1967,7 @@ Encryption 40-bit encryption is insecure, as is 128-bit encryption without AES. Use 256-bit encryption unless you have a specific reason to use an insecure format, such as testing or compatibility with very - old viewers. You must use the --allow-weak-crypto to create + old viewers. You must use the --allow-weak-crypto flag to create encrypted files that use insecure cryptographic algorithms. The --allow-weak-crypto flag appears outside of --encrypt ... -- (before --encrypt or after --). @@ -2037,12 +2037,12 @@ OR --encrypt user-password owner-password key-length [options] -- The first form, with flags for the passwords and bit length, was -introduced in qpdf 11.7.0. Only the :qpdf:ref:`--bits` option is is +introduced in qpdf 11.7.0. Only the :qpdf:ref:`--bits` option is mandatory. This form allows you to use any text as the password. If passwords are specified, they must be given before the :qpdf:ref:`--bits` option. -The second form has been in qpdf since the beginning and wil +The second form has been in qpdf since the beginning and will continue to be supported. Either or both of user-password and owner-password may be empty strings. @@ -2206,7 +2206,7 @@ Related Options Set the owner password of the encrypted file. Set the owner password of the encrypted file. Conforming readers - apply allow security restrictions to be changed or overridden when + allow security restrictions to be changed or overridden when files are opened with the owner password. .. qpdf:option:: --bits={48|128|256} From e5714789012d795c0da709723e8d92dd7b88dae3 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Tue, 28 Jan 2025 06:52:51 -0500 Subject: [PATCH 2/2] Run generate_auto_jobs with doc typo fixes --- job.sums | 6 +++--- libqpdf/qpdf/auto_job_help.hh | 6 +++--- manual/qpdf.1 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/job.sums b/job.sums index 7b151fac..7d055d2b 100644 --- a/job.sums +++ b/job.sums @@ -9,12 +9,12 @@ include/qpdf/auto_job_c_pages.hh 09ca15649cc94fdaf6d9bdae28a20723f2a66616bf15aa8 include/qpdf/auto_job_c_uo.hh 9c2f98a355858dd54d0bba444b73177a59c9e56833e02fa6406f429c07f39e62 job.yml 31935064eca625af7657b23f2f12c614d14751ec0b12702482b1768a04905d22 libqpdf/qpdf/auto_job_decl.hh 20d6affe1e260f5a1af4f1d82a820b933835440ff03020e877382da2e8dac6c6 -libqpdf/qpdf/auto_job_help.hh 1e9181f4729a22ff91ab54e2b4a82e6af0c57a8327efb222a4196adb609c1ade +libqpdf/qpdf/auto_job_help.hh aef902a501f7b940d5c182e800d1a4bc2b62f07be898124dc7d6ca9f286b93e9 libqpdf/qpdf/auto_job_init.hh e2a6bb87870c5522a01b15461c9fe909e360f5c7fed06e41acf13a125bd1d03e libqpdf/qpdf/auto_job_json_decl.hh 843892c8e8652a86b7eb573893ef24050b7f36fe313f7251874be5cd4cdbe3fd libqpdf/qpdf/auto_job_json_init.hh 344c2fb473f88fe829c93b1efe6c70a0e4796537b8eb35e421d955fff481ba7d libqpdf/qpdf/auto_job_schema.hh 6d3eef5137b8828eaa301a1b3cf75cb7bb812aa6e2d8301de865b42d238d7a7c manual/_ext/qpdf.py 6add6321666031d55ed4aedf7c00e5662bba856dfcd66ccb526563bffefbb580 -manual/cli.rst b7f37995f13346518ae7b2ea84836fba13b4da4e1f55be5f2a861f20dea0ccdb -manual/qpdf.1 59c26635017cba5d142ec3fcc4aebcb91e0cf1355d51365db84f48b21585ad8d +manual/cli.rst 8050662bf161e8b568b5db6bb9fab2d6dacc1eb060d39b27bf460dbfe52f0db4 +manual/qpdf.1 d98b0de595ee931aeeb455c14c71210f0ebb689464d982af58cd126c6f689ac8 manual/qpdf.1.in 436ecc85d45c4c9e2dbd1725fb7f0177fb627179469f114561adf3cb6cbb677b diff --git a/libqpdf/qpdf/auto_job_help.hh b/libqpdf/qpdf/auto_job_help.hh index a7207a63..83ed04a7 100644 --- a/libqpdf/qpdf/auto_job_help.hh +++ b/libqpdf/qpdf/auto_job_help.hh @@ -479,11 +479,11 @@ OR --encrypt user-password owner-password key-length [options] -- The first form, with flags for the passwords and bit length, was -introduced in qpdf 11.7.0. Only the --bits option is is mandatory. +introduced in qpdf 11.7.0. Only the --bits option is mandatory. This form allows you to use any text as the password. If passwords are specified, they must be given before the --bits option. -The second form has been in qpdf since the beginning and wil +The second form has been in qpdf since the beginning and will continue to be supported. Either or both of user-password and owner-password may be empty strings. @@ -498,7 +498,7 @@ Encryption options are terminated by "--" by itself. 40-bit encryption is insecure, as is 128-bit encryption without AES. Use 256-bit encryption unless you have a specific reason to use an insecure format, such as testing or compatibility with very -old viewers. You must use the --allow-weak-crypto to create +old viewers. You must use the --allow-weak-crypto flag to create encrypted files that use insecure cryptographic algorithms. The --allow-weak-crypto flag appears outside of --encrypt ... -- (before --encrypt or after --). diff --git a/manual/qpdf.1 b/manual/qpdf.1 index 95c23be6..b355346d 100644 --- a/manual/qpdf.1 +++ b/manual/qpdf.1 @@ -600,11 +600,11 @@ OR --encrypt user-password owner-password key-length [options] -- The first form, with flags for the passwords and bit length, was -introduced in qpdf 11.7.0. Only the --bits option is is mandatory. +introduced in qpdf 11.7.0. Only the --bits option is mandatory. This form allows you to use any text as the password. If passwords are specified, they must be given before the --bits option. -The second form has been in qpdf since the beginning and wil +The second form has been in qpdf since the beginning and will continue to be supported. Either or both of user-password and owner-password may be empty strings. @@ -619,7 +619,7 @@ Encryption options are terminated by "--" by itself. 40-bit encryption is insecure, as is 128-bit encryption without AES. Use 256-bit encryption unless you have a specific reason to use an insecure format, such as testing or compatibility with very -old viewers. You must use the --allow-weak-crypto to create +old viewers. You must use the --allow-weak-crypto flag to create encrypted files that use insecure cryptographic algorithms. The --allow-weak-crypto flag appears outside of --encrypt ... -- (before --encrypt or after --).