Commit 622592fed2f36ae7e9e70214dfebeba41afca796

Authored by Jay Berkenbilt
Committed by GitHub
2 parents ef891178 e5714789

Merge pull request #1339 from jberkenbilt/stefre-doc-patches

Stefre doc patches
job.sums
... ... @@ -9,12 +9,12 @@ include/qpdf/auto_job_c_pages.hh 09ca15649cc94fdaf6d9bdae28a20723f2a66616bf15aa8
9 9 include/qpdf/auto_job_c_uo.hh 9c2f98a355858dd54d0bba444b73177a59c9e56833e02fa6406f429c07f39e62
10 10 job.yml 31935064eca625af7657b23f2f12c614d14751ec0b12702482b1768a04905d22
11 11 libqpdf/qpdf/auto_job_decl.hh 20d6affe1e260f5a1af4f1d82a820b933835440ff03020e877382da2e8dac6c6
12   -libqpdf/qpdf/auto_job_help.hh 1e9181f4729a22ff91ab54e2b4a82e6af0c57a8327efb222a4196adb609c1ade
  12 +libqpdf/qpdf/auto_job_help.hh aef902a501f7b940d5c182e800d1a4bc2b62f07be898124dc7d6ca9f286b93e9
13 13 libqpdf/qpdf/auto_job_init.hh e2a6bb87870c5522a01b15461c9fe909e360f5c7fed06e41acf13a125bd1d03e
14 14 libqpdf/qpdf/auto_job_json_decl.hh 843892c8e8652a86b7eb573893ef24050b7f36fe313f7251874be5cd4cdbe3fd
15 15 libqpdf/qpdf/auto_job_json_init.hh 344c2fb473f88fe829c93b1efe6c70a0e4796537b8eb35e421d955fff481ba7d
16 16 libqpdf/qpdf/auto_job_schema.hh 6d3eef5137b8828eaa301a1b3cf75cb7bb812aa6e2d8301de865b42d238d7a7c
17 17 manual/_ext/qpdf.py 6add6321666031d55ed4aedf7c00e5662bba856dfcd66ccb526563bffefbb580
18   -manual/cli.rst b7f37995f13346518ae7b2ea84836fba13b4da4e1f55be5f2a861f20dea0ccdb
19   -manual/qpdf.1 59c26635017cba5d142ec3fcc4aebcb91e0cf1355d51365db84f48b21585ad8d
  18 +manual/cli.rst 8050662bf161e8b568b5db6bb9fab2d6dacc1eb060d39b27bf460dbfe52f0db4
  19 +manual/qpdf.1 d98b0de595ee931aeeb455c14c71210f0ebb689464d982af58cd126c6f689ac8
20 20 manual/qpdf.1.in 436ecc85d45c4c9e2dbd1725fb7f0177fb627179469f114561adf3cb6cbb677b
... ...
libqpdf/qpdf/auto_job_help.hh
... ... @@ -479,11 +479,11 @@ OR
479 479 --encrypt user-password owner-password key-length [options] --
480 480  
481 481 The first form, with flags for the passwords and bit length, was
482   -introduced in qpdf 11.7.0. Only the --bits option is is mandatory.
  482 +introduced in qpdf 11.7.0. Only the --bits option is mandatory.
483 483 This form allows you to use any text as the password. If passwords
484 484 are specified, they must be given before the --bits option.
485 485  
486   -The second form has been in qpdf since the beginning and wil
  486 +The second form has been in qpdf since the beginning and will
487 487 continue to be supported. Either or both of user-password and
488 488 owner-password may be empty strings.
489 489  
... ... @@ -498,7 +498,7 @@ Encryption options are terminated by "--" by itself.
498 498 40-bit encryption is insecure, as is 128-bit encryption without
499 499 AES. Use 256-bit encryption unless you have a specific reason to
500 500 use an insecure format, such as testing or compatibility with very
501   -old viewers. You must use the --allow-weak-crypto to create
  501 +old viewers. You must use the --allow-weak-crypto flag to create
502 502 encrypted files that use insecure cryptographic algorithms. The
503 503 --allow-weak-crypto flag appears outside of --encrypt ... --
504 504 (before --encrypt or after --).
... ...
manual/cli.rst
... ... @@ -1948,11 +1948,11 @@ Encryption
1948 1948 --encrypt user-password owner-password key-length [options] --
1949 1949  
1950 1950 The first form, with flags for the passwords and bit length, was
1951   - introduced in qpdf 11.7.0. Only the --bits option is is mandatory.
  1951 + introduced in qpdf 11.7.0. Only the --bits option is mandatory.
1952 1952 This form allows you to use any text as the password. If passwords
1953 1953 are specified, they must be given before the --bits option.
1954 1954  
1955   - The second form has been in qpdf since the beginning and wil
  1955 + The second form has been in qpdf since the beginning and will
1956 1956 continue to be supported. Either or both of user-password and
1957 1957 owner-password may be empty strings.
1958 1958  
... ... @@ -1967,7 +1967,7 @@ Encryption
1967 1967 40-bit encryption is insecure, as is 128-bit encryption without
1968 1968 AES. Use 256-bit encryption unless you have a specific reason to
1969 1969 use an insecure format, such as testing or compatibility with very
1970   - old viewers. You must use the --allow-weak-crypto to create
  1970 + old viewers. You must use the --allow-weak-crypto flag to create
1971 1971 encrypted files that use insecure cryptographic algorithms. The
1972 1972 --allow-weak-crypto flag appears outside of --encrypt ... --
1973 1973 (before --encrypt or after --).
... ... @@ -2037,12 +2037,12 @@ OR
2037 2037 --encrypt user-password owner-password key-length [options] --
2038 2038  
2039 2039 The first form, with flags for the passwords and bit length, was
2040   -introduced in qpdf 11.7.0. Only the :qpdf:ref:`--bits` option is is
  2040 +introduced in qpdf 11.7.0. Only the :qpdf:ref:`--bits` option is
2041 2041 mandatory. This form allows you to use any text as the password. If
2042 2042 passwords are specified, they must be given before the
2043 2043 :qpdf:ref:`--bits` option.
2044 2044  
2045   -The second form has been in qpdf since the beginning and wil
  2045 +The second form has been in qpdf since the beginning and will
2046 2046 continue to be supported. Either or both of user-password and
2047 2047 owner-password may be empty strings.
2048 2048  
... ... @@ -2206,7 +2206,7 @@ Related Options
2206 2206 Set the owner password of the encrypted file.
2207 2207  
2208 2208 Set the owner password of the encrypted file. Conforming readers
2209   - apply allow security restrictions to be changed or overridden when
  2209 + allow security restrictions to be changed or overridden when
2210 2210 files are opened with the owner password.
2211 2211  
2212 2212 .. qpdf:option:: --bits={48|128|256}
... ...
manual/qpdf.1
... ... @@ -600,11 +600,11 @@ OR
600 600 --encrypt user-password owner-password key-length [options] --
601 601  
602 602 The first form, with flags for the passwords and bit length, was
603   -introduced in qpdf 11.7.0. Only the --bits option is is mandatory.
  603 +introduced in qpdf 11.7.0. Only the --bits option is mandatory.
604 604 This form allows you to use any text as the password. If passwords
605 605 are specified, they must be given before the --bits option.
606 606  
607   -The second form has been in qpdf since the beginning and wil
  607 +The second form has been in qpdf since the beginning and will
608 608 continue to be supported. Either or both of user-password and
609 609 owner-password may be empty strings.
610 610  
... ... @@ -619,7 +619,7 @@ Encryption options are terminated by "--" by itself.
619 619 40-bit encryption is insecure, as is 128-bit encryption without
620 620 AES. Use 256-bit encryption unless you have a specific reason to
621 621 use an insecure format, such as testing or compatibility with very
622   -old viewers. You must use the --allow-weak-crypto to create
  622 +old viewers. You must use the --allow-weak-crypto flag to create
623 623 encrypted files that use insecure cryptographic algorithms. The
624 624 --allow-weak-crypto flag appears outside of --encrypt ... --
625 625 (before --encrypt or after --).
... ...