Commit d13a6032e687fb5d4b3eec37f16db7792c72d070

Authored by Jay Berkenbilt
1 parent 0fdbb957

Replace <replaceable> with {...}

All occurrences are in :file: or :samp: now.
Showing 2 changed files with 82 additions and 83 deletions
@@ -37,7 +37,6 @@ Make sure the information from &lt;book&gt; is in there @@ -37,7 +37,6 @@ Make sure the information from &lt;book&gt; is in there
37 Correct placement of comment: <!-- This section is referenced in QPDFObjectHandle.hh --> 37 Correct placement of comment: <!-- This section is referenced in QPDFObjectHandle.hh -->
38 38
39 <firstterm> -> just use literal 39 <firstterm> -> just use literal
40 -<replaceable> -> use {}  
41 40
42 Additional cleanup: 41 Additional cleanup:
43 42
manual/index.rst
@@ -226,22 +226,22 @@ available crypto providers, and to use an external provider as the @@ -226,22 +226,22 @@ available crypto providers, and to use an external provider as the
226 default over the native one. This behavior can be changed with the 226 default over the native one. This behavior can be changed with the
227 following flags to :command:`./configure`: 227 following flags to :command:`./configure`:
228 228
229 -- :samp:`--enable-crypto-@3@replaceable@3@x@4@replaceable@4@`  
230 - (where :samp:`@1@replaceable@1@x@2@replaceable@2@` is a supported crypto  
231 - provider): enable the :samp:`@1@replaceable@1@x@2@replaceable@2@` crypto 229 +- :samp:`--enable-crypto-{x}`
  230 + (where :samp:`{x}` is a supported crypto
  231 + provider): enable the :samp:`{x}` crypto
232 provider, requiring any external dependencies it needs 232 provider, requiring any external dependencies it needs
233 233
234 -- :samp:`--disable-crypto-@3@replaceable@3@x@4@replaceable@4@`:  
235 - disable the :samp:`@1@replaceable@1@x@2@replaceable@2@` provider, and do not 234 +- :samp:`--disable-crypto-{x}`:
  235 + disable the :samp:`{x}` provider, and do not
236 link against its dependencies even if they are available 236 link against its dependencies even if they are available
237 237
238 -- :samp:`--with-default-crypto=@3@replaceable@3@x@4@replaceable@4@`:  
239 - make :samp:`@1@replaceable@1@x@2@replaceable@2@` the default provider even if 238 +- :samp:`--with-default-crypto={x}`:
  239 + make :samp:`{x}` the default provider even if
240 a higher priority one is available 240 a higher priority one is available
241 241
242 - :samp:`--disable-implicit-crypto`: only build crypto 242 - :samp:`--disable-implicit-crypto`: only build crypto
243 providers that are explicitly requested with an 243 providers that are explicitly requested with an
244 - :samp:`--enable-crypto-@3@replaceable@3@x@4@replaceable@4@` 244 + :samp:`--enable-crypto-{x}`
245 option 245 option
246 246
247 For example, if you want to guarantee that the gnutls crypto provider is 247 For example, if you want to guarantee that the gnutls crypto provider is
@@ -557,7 +557,7 @@ needed transformations. @@ -557,7 +557,7 @@ needed transformations.
557 Output a completion command you can eval to enable shell completion 557 Output a completion command you can eval to enable shell completion
558 from zsh. 558 from zsh.
559 559
560 -:samp:`--password=@3@replaceable@3@password@4@replaceable@4@` 560 +:samp:`--password={password}`
561 Specifies a password for accessing encrypted files. To read the 561 Specifies a password for accessing encrypted files. To read the
562 password from a file or standard input, you can use 562 password from a file or standard input, you can use
563 :samp:`--password-file`, added in qpdf 10.2. Note 563 :samp:`--password-file`, added in qpdf 10.2. Note
@@ -565,16 +565,16 @@ needed transformations. @@ -565,16 +565,16 @@ needed transformations.
565 :samp:`@-` as described above to put the password in 565 :samp:`@-` as described above to put the password in
566 a file or pass it via standard input, but you would do so by 566 a file or pass it via standard input, but you would do so by
567 specifying the entire 567 specifying the entire
568 - :samp:`--password=@3@replaceable@3@password@4@replaceable@4@` 568 + :samp:`--password={password}`
569 option in the file. Syntax such as 569 option in the file. Syntax such as
570 :samp:`--password=@filename` won't work since 570 :samp:`--password=@filename` won't work since
571 :samp:`@filename` is not recognized in the middle of 571 :samp:`@filename` is not recognized in the middle of
572 an argument. 572 an argument.
573 573
574 -:samp:`--password-file=@3@replaceable@3@filename@4@replaceable@4@` 574 +:samp:`--password-file={filename}`
575 Reads the first line from the specified file and uses it as the 575 Reads the first line from the specified file and uses it as the
576 password for accessing encrypted files. 576 password for accessing encrypted files.
577 - :samp:`@3@replaceable@3@filename@4@replaceable@4@` 577 + :samp:`{filename}`
578 may be ``-`` to read the password from standard input. Note that, in 578 may be ``-`` to read the password from standard input. Note that, in
579 this case, the password is echoed and there is no prompt, so use with 579 this case, the password is echoed and there is no prompt, so use with
580 caution. 580 caution.
@@ -625,10 +625,10 @@ needed transformations. @@ -625,10 +625,10 @@ needed transformations.
625 If specified, the output file name should be omitted. This option 625 If specified, the output file name should be omitted. This option
626 tells qpdf to replace the input file with the output. It does this by 626 tells qpdf to replace the input file with the output. It does this by
627 writing to 627 writing to
628 - :file:`@3@replaceable@3@infilename@4@replaceable@4@.~qpdf-temp#` 628 + :file:`{infilename}.~qpdf-temp#`
629 and, when done, overwriting the input file with the temporary file. 629 and, when done, overwriting the input file with the temporary file.
630 If there were any warnings, the original input is saved as 630 If there were any warnings, the original input is saved as
631 - :file:`@3@replaceable@3@infilename@4@replaceable@4@.~qpdf-orig`. 631 + :file:`{infilename}.~qpdf-orig`.
632 632
633 :samp:`--copy-encryption=file` 633 :samp:`--copy-encryption=file`
634 Encrypt the file using the same encryption parameters, including user 634 Encrypt the file using the same encryption parameters, including user
@@ -692,7 +692,7 @@ needed transformations. @@ -692,7 +692,7 @@ needed transformations.
692 this option. See `Unicode Passwords <#ref.unicode-passwords>`__ for a 692 this option. See `Unicode Passwords <#ref.unicode-passwords>`__ for a
693 discussion 693 discussion
694 694
695 -:samp:`--password-mode=@3@replaceable@3@mode@4@replaceable@4@` 695 +:samp:`--password-mode={mode}`
696 This option can be used to fine-tune how qpdf interprets Unicode 696 This option can be used to fine-tune how qpdf interprets Unicode
697 (non-ASCII) password strings passed on the command line. With the 697 (non-ASCII) password strings passed on the command line. With the
698 exception of the :samp:`hex-bytes` mode, these only 698 exception of the :samp:`hex-bytes` mode, these only
@@ -757,7 +757,7 @@ needed transformations. @@ -757,7 +757,7 @@ needed transformations.
757 out.pdf --rotate=+180` would rotate all pages by 180 757 out.pdf --rotate=+180` would rotate all pages by 180
758 degrees. 758 degrees.
759 759
760 -:samp:`--keep-files-open=@3@replaceable@3@[yn]@4@replaceable@4@` 760 +:samp:`--keep-files-open={[yn]}`
761 This option controls whether qpdf keeps individual files open while 761 This option controls whether qpdf keeps individual files open while
762 merging. Prior to version 8.1.0, qpdf always kept all files open, but 762 merging. Prior to version 8.1.0, qpdf always kept all files open, but
763 this meant that the number of files that could be merged was limited 763 this meant that the number of files that could be merged was limited
@@ -782,7 +782,7 @@ needed transformations. @@ -782,7 +782,7 @@ needed transformations.
782 switching may be changed from the default 200 with the 782 switching may be changed from the default 200 with the
783 :samp:`--keep-files-open-threshold` option. 783 :samp:`--keep-files-open-threshold` option.
784 784
785 -:samp:`--keep-files-open-threshold=@3@replaceable@3@count@4@replaceable@4@` 785 +:samp:`--keep-files-open-threshold={count}`
786 If specified, overrides the default value of 200 used as the 786 If specified, overrides the default value of 200 used as the
787 threshold for qpdf deciding whether or not to keep files open. See 787 threshold for qpdf deciding whether or not to keep files open. See
788 :samp:`--keep-files-open` for details. 788 :samp:`--keep-files-open` for details.
@@ -792,10 +792,10 @@ needed transformations. @@ -792,10 +792,10 @@ needed transformations.
792 Selection Options <#ref.page-selection>`__ for details on how to do 792 Selection Options <#ref.page-selection>`__ for details on how to do
793 page selection (splitting and merging). 793 page selection (splitting and merging).
794 794
795 -:samp:`--collate=@3@replaceable@3@n@4@replaceable@4@` 795 +:samp:`--collate={n}`
796 When specified, collate rather than concatenate pages from files 796 When specified, collate rather than concatenate pages from files
797 specified with :samp:`--pages`. With a numeric 797 specified with :samp:`--pages`. With a numeric
798 - argument, collate in groups of :samp:`@1@replaceable@1@n@2@replaceable@2@`. 798 + argument, collate in groups of :samp:`{n}`.
799 The default is 1. See `Page Selection 799 The default is 1. See `Page Selection
800 Options <#ref.page-selection>`__ for additional details. 800 Options <#ref.page-selection>`__ for additional details.
801 801
@@ -906,12 +906,12 @@ you want to create such files, specify the encryption option @@ -906,12 +906,12 @@ you want to create such files, specify the encryption option
906 :samp:`--allow-insecure`, as described below. 906 :samp:`--allow-insecure`, as described below.
907 907
908 The value for 908 The value for
909 -:samp:`@3@replaceable@3@key-length@4@replaceable@4@` may 909 +:samp:`{key-length}` may
910 be 40, 128, or 256. The restriction flags are dependent upon key length. 910 be 40, 128, or 256. The restriction flags are dependent upon key length.
911 When no additional restrictions are given, the default is to be fully 911 When no additional restrictions are given, the default is to be fully
912 permissive. 912 permissive.
913 913
914 -If :samp:`@3@replaceable@3@key-length@4@replaceable@4@` 914 +If :samp:`{key-length}`
915 is 40, the following restriction options are available: 915 is 40, the following restriction options are available:
916 916
917 :samp:`--print=[yn]` 917 :samp:`--print=[yn]`
@@ -927,7 +927,7 @@ is 40, the following restriction options are available: @@ -927,7 +927,7 @@ is 40, the following restriction options are available:
927 Determines whether or not to allow comments and form fill-in and 927 Determines whether or not to allow comments and form fill-in and
928 signing. 928 signing.
929 929
930 -If :samp:`@3@replaceable@3@key-length@4@replaceable@4@` 930 +If :samp:`{key-length}`
931 is 128, the following restriction options are available: 931 is 128, the following restriction options are available:
932 932
933 :samp:`--accessibility=[yn]` 933 :samp:`--accessibility=[yn]`
@@ -960,9 +960,9 @@ is 128, the following restriction options are available: @@ -960,9 +960,9 @@ is 128, the following restriction options are available:
960 :samp:`--annotate`, and 960 :samp:`--annotate`, and
961 :samp:`--form` options. 961 :samp:`--form` options.
962 962
963 -:samp:`--print=@3@replaceable@3@print-opt@4@replaceable@4@` 963 +:samp:`--print={print-opt}`
964 Controls printing access. 964 Controls printing access.
965 - :samp:`@3@replaceable@3@print-opt@4@replaceable@4@` 965 + :samp:`{print-opt}`
966 may be one of the following: 966 may be one of the following:
967 967
968 - :samp:`full`: allow full printing 968 - :samp:`full`: allow full printing
@@ -971,10 +971,10 @@ is 128, the following restriction options are available: @@ -971,10 +971,10 @@ is 128, the following restriction options are available:
971 971
972 - :samp:`none`: disallow printing 972 - :samp:`none`: disallow printing
973 973
974 -:samp:`--modify=@3@replaceable@3@modify-opt@4@replaceable@4@` 974 +:samp:`--modify={modify-opt}`
975 Controls modify access. This way of controlling modify access has 975 Controls modify access. This way of controlling modify access has
976 less granularity than new options added in qpdf 8.4. 976 less granularity than new options added in qpdf 8.4.
977 - :samp:`@3@replaceable@3@modify-opt@4@replaceable@4@` 977 + :samp:`{modify-opt}`
978 may be one of the following: 978 may be one of the following:
979 979
980 - :samp:`all`: allow full document modification 980 - :samp:`all`: allow full document modification
@@ -1022,7 +1022,7 @@ is 128, the following restriction options are available: @@ -1022,7 +1022,7 @@ is 128, the following restriction options are available:
1022 ever use this option. It exists primarily for use in testing qpdf 1022 ever use this option. It exists primarily for use in testing qpdf
1023 itself. This option also forces the PDF version to be at least 1.5. 1023 itself. This option also forces the PDF version to be at least 1.5.
1024 1024
1025 -If :samp:`@3@replaceable@3@key-length@4@replaceable@4@` 1025 +If :samp:`{key-length}`
1026 is 256, the minimum PDF version is 1.7 with extension level 8, and the 1026 is 256, the minimum PDF version is 1.7 with extension level 8, and the
1027 AES-based encryption format used is the PDF 2.0 encryption method 1027 AES-based encryption format used is the PDF 2.0 encryption method
1028 supported by Acrobat X. the same options are available as with 128 bits 1028 supported by Acrobat X. the same options are available as with 128 bits
@@ -1154,8 +1154,8 @@ following pages in this order: @@ -1154,8 +1154,8 @@ following pages in this order:
1154 1154
1155 Starting in qpdf version 10.2, you may specify a numeric argument to 1155 Starting in qpdf version 10.2, you may specify a numeric argument to
1156 :samp:`--collate`. With 1156 :samp:`--collate`. With
1157 -:samp:`--collate=@3@replaceable@3@n@4@replaceable@4@`,  
1158 -pull groups of :samp:`@1@replaceable@1@n@2@replaceable@2@` pages from each file, 1157 +:samp:`--collate={n}`,
  1158 +pull groups of :samp:`{n}` pages from each file,
1159 again, stopping when there are no more pages. For example, if you ran 1159 again, stopping when there are no more pages. For example, if you ran
1160 :command:`qpdf --collate=2 --empty --pages a.pdf 1-5 b.pdf 6-4 c.pdf 1160 :command:`qpdf --collate=2 --empty --pages a.pdf 1-5 b.pdf 6-4 c.pdf
1161 r1 -- out.pdf`, you would get the following pages in this 1161 r1 -- out.pdf`, you would get the following pages in this
@@ -1330,44 +1330,44 @@ from the command line. The following options are available: @@ -1330,44 +1330,44 @@ from the command line. The following options are available:
1330 The key is usually but not always equal to the file name, and is 1330 The key is usually but not always equal to the file name, and is
1331 needed by some of the other options. 1331 needed by some of the other options.
1332 1332
1333 -:samp:`--show-attachment=@3@replaceable@3@key@4@replaceable@4@` 1333 +:samp:`--show-attachment={key}`
1334 Write the contents of the specified attachment to standard output as 1334 Write the contents of the specified attachment to standard output as
1335 binary data. The key should match one of the keys shown by 1335 binary data. The key should match one of the keys shown by
1336 :samp:`--list-attachments`. If specified multiple 1336 :samp:`--list-attachments`. If specified multiple
1337 times, only the last attachment will be shown. 1337 times, only the last attachment will be shown.
1338 1338
1339 -:samp:`--add-attachment @3@replaceable@3@file@4@replaceable@4@ @3@replaceable@3@options@4@replaceable@4@ --` 1339 +:samp:`--add-attachment {file} {options} --`
1340 Add or replace an attachment with the contents of 1340 Add or replace an attachment with the contents of
1341 - :samp:`@1@replaceable@1@file@2@replaceable@2@`. This may be specified more 1341 + :samp:`{file}`. This may be specified more
1342 than once. The following additional options may appear before the 1342 than once. The following additional options may appear before the
1343 ``--`` that ends this option: 1343 ``--`` that ends this option:
1344 1344
1345 - :samp:`--key=@3@replaceable@3@key@4@replaceable@4@` 1345 + :samp:`--key={key}`
1346 The key to use to register the attachment in the embedded files 1346 The key to use to register the attachment in the embedded files
1347 table. Defaults to the last path element of 1347 table. Defaults to the last path element of
1348 - :samp:`@1@replaceable@1@file@2@replaceable@2@`. 1348 + :samp:`{file}`.
1349 1349
1350 - :samp:`--filename=@3@replaceable@3@name@4@replaceable@4@` 1350 + :samp:`--filename={name}`
1351 The file name to be used for the attachment. This is what is 1351 The file name to be used for the attachment. This is what is
1352 usually displayed to the user and is the name most graphical PDF 1352 usually displayed to the user and is the name most graphical PDF
1353 viewers will use when saving a file. It defaults to the last path 1353 viewers will use when saving a file. It defaults to the last path
1354 - element of :samp:`@1@replaceable@1@file@2@replaceable@2@`. 1354 + element of :samp:`{file}`.
1355 1355
1356 - :samp:`--creationdate=@3@replaceable@3@date@4@replaceable@4@` 1356 + :samp:`--creationdate={date}`
1357 The attachment's creation date in PDF format; defaults to the 1357 The attachment's creation date in PDF format; defaults to the
1358 current time. The date format is explained below. 1358 current time. The date format is explained below.
1359 1359
1360 - :samp:`--moddate=@3@replaceable@3@date@4@replaceable@4@` 1360 + :samp:`--moddate={date}`
1361 The attachment's modification date in PDF format; defaults to the 1361 The attachment's modification date in PDF format; defaults to the
1362 current time. The date format is explained below. 1362 current time. The date format is explained below.
1363 1363
1364 - :samp:`--mimetype=@3@replaceable@3@type/subtype@4@replaceable@4@` 1364 + :samp:`--mimetype={type/subtype}`
1365 The mime type for the attachment, e.g. ``text/plain`` or 1365 The mime type for the attachment, e.g. ``text/plain`` or
1366 ``application/pdf``. Note that the mimetype appears in a field 1366 ``application/pdf``. Note that the mimetype appears in a field
1367 called ``/Subtype`` in the PDF but actually includes the full type 1367 called ``/Subtype`` in the PDF but actually includes the full type
1368 and subtype of the mime type. 1368 and subtype of the mime type.
1369 1369
1370 - :samp:`--description=@3@replaceable@3@"text"@4@replaceable@4@` 1370 + :samp:`--description={"text"}`
1371 Descriptive text for the attachment, displayed by some PDF 1371 Descriptive text for the attachment, displayed by some PDF
1372 viewers. 1372 viewers.
1373 1373
@@ -1377,7 +1377,7 @@ from the command line. The following options are available: @@ -1377,7 +1377,7 @@ from the command line. The following options are available:
1377 :command:`qpdf` gives an error if an attachment 1377 :command:`qpdf` gives an error if an attachment
1378 with that key is already present. 1378 with that key is already present.
1379 1379
1380 -:samp:`--remove-attachment=@3@replaceable@3@key@4@replaceable@4@` 1380 +:samp:`--remove-attachment={key}`
1381 Remove the specified attachment. This doesn't only remove the 1381 Remove the specified attachment. This doesn't only remove the
1382 attachment from the embedded files table but also clears out the file 1382 attachment from the embedded files table but also clears out the file
1383 specification. That means that any potential internal links to the 1383 specification. That means that any potential internal links to the
@@ -1385,16 +1385,16 @@ from the command line. The following options are available: @@ -1385,16 +1385,16 @@ from the command line. The following options are available:
1385 times. Run with :samp:`--verbose` to see status of 1385 times. Run with :samp:`--verbose` to see status of
1386 the removal. 1386 the removal.
1387 1387
1388 -:samp:`--copy-attachments-from @3@replaceable@3@file@4@replaceable@4@ @3@replaceable@3@options@4@replaceable@4@ --` 1388 +:samp:`--copy-attachments-from {file} {options} --`
1389 Copy attachments from another file. This may be specified more than 1389 Copy attachments from another file. This may be specified more than
1390 once. The following additional options may appear before the ``--`` 1390 once. The following additional options may appear before the ``--``
1391 that ends this option: 1391 that ends this option:
1392 1392
1393 - :samp:`--password=@3@replaceable@3@password@4@replaceable@4@` 1393 + :samp:`--password={password}`
1394 If required, the password needed to open 1394 If required, the password needed to open
1395 - :samp:`@1@replaceable@1@file@2@replaceable@2@` 1395 + :samp:`{file}`
1396 1396
1397 - :samp:`--prefix=@3@replaceable@3@prefix@4@replaceable@4@` 1397 + :samp:`--prefix={prefix}`
1398 Only required if the file from which attachments are being copied 1398 Only required if the file from which attachments are being copied
1399 has attachments with keys that conflict with attachments already 1399 has attachments with keys that conflict with attachments already
1400 in the file. In this case, the specified prefix will be prepended 1400 in the file. In this case, the specified prefix will be prepended
@@ -1404,10 +1404,10 @@ from the command line. The following options are available: @@ -1404,10 +1404,10 @@ from the command line. The following options are available:
1404 1404
1405 When a date is required, the date should conform to the PDF date format 1405 When a date is required, the date should conform to the PDF date format
1406 specification, which is 1406 specification, which is
1407 -``D:``\ :samp:`@1@replaceable@1@yyyymmddhhmmss<z>@2@replaceable@2@`, where  
1408 -:samp:`@1@replaceable@1@<z>@2@replaceable@2@` is either ``Z`` for UTC or a  
1409 -timezone offset in the form :samp:`@1@replaceable@1@-hh'mm'@2@replaceable@2@` or  
1410 -:samp:`@1@replaceable@1@+hh'mm'@2@replaceable@2@`. Examples: 1407 +``D:``\ :samp:`{yyyymmddhhmmss<z>}`, where
  1408 +:samp:`{<z>}` is either ``Z`` for UTC or a
  1409 +timezone offset in the form :samp:`{-hh'mm'}` or
  1410 +:samp:`{+hh'mm'}`. Examples:
1411 ``D:20210207161528-05'00'``, ``D:20210207211528Z``. 1411 ``D:20210207161528-05'00'``, ``D:20210207211528Z``.
1412 1412
1413 .. _ref.advanced-parsing: 1413 .. _ref.advanced-parsing:
@@ -1456,14 +1456,14 @@ output file. Mostly these are of use only to people who are very @@ -1456,14 +1456,14 @@ output file. Mostly these are of use only to people who are very
1456 familiar with the PDF file format or who are PDF developers. The 1456 familiar with the PDF file format or who are PDF developers. The
1457 following options are available: 1457 following options are available:
1458 1458
1459 -:samp:`--compress-streams=@3@replaceable@3@[yn]@4@replaceable@4@` 1459 +:samp:`--compress-streams={[yn]}`
1460 By default, or with :samp:`--compress-streams=y`, 1460 By default, or with :samp:`--compress-streams=y`,
1461 qpdf will compress any stream with no other filters applied to it 1461 qpdf will compress any stream with no other filters applied to it
1462 with the ``/FlateDecode`` filter when it writes it. To suppress this 1462 with the ``/FlateDecode`` filter when it writes it. To suppress this
1463 behavior and preserve uncompressed streams as uncompressed, use 1463 behavior and preserve uncompressed streams as uncompressed, use
1464 :samp:`--compress-streams=n`. 1464 :samp:`--compress-streams=n`.
1465 1465
1466 -:samp:`--decode-level=@3@replaceable@3@option@4@replaceable@4@` 1466 +:samp:`--decode-level={option}`
1467 Controls which streams qpdf tries to decode. The default is 1467 Controls which streams qpdf tries to decode. The default is
1468 :samp:`generalized`. The following options are 1468 :samp:`generalized`. The following options are
1469 available: 1469 available:
@@ -1487,12 +1487,12 @@ following options are available: @@ -1487,12 +1487,12 @@ following options are available:
1487 specialized, decode streams with supported lossy filters; 1487 specialized, decode streams with supported lossy filters;
1488 currently this is just ``/DCTDecode`` (JPEG) 1488 currently this is just ``/DCTDecode`` (JPEG)
1489 1489
1490 -:samp:`--stream-data=@3@replaceable@3@option@4@replaceable@4@` 1490 +:samp:`--stream-data={option}`
1491 Controls transformation of stream data. This option predates the 1491 Controls transformation of stream data. This option predates the
1492 :samp:`--compress-streams` and 1492 :samp:`--compress-streams` and
1493 :samp:`--decode-level` options. Those options can be 1493 :samp:`--decode-level` options. Those options can be
1494 used to achieve the same affect with more control. The value of 1494 used to achieve the same affect with more control. The value of
1495 - :samp:`@3@replaceable@3@option@4@replaceable@4@` may 1495 + :samp:`{option}` may
1496 be one of the following: 1496 be one of the following:
1497 1497
1498 - :samp:`compress`: recompress stream data when 1498 - :samp:`compress`: recompress stream data when
@@ -1519,7 +1519,7 @@ following options are available: @@ -1519,7 +1519,7 @@ following options are available:
1519 want to use it if you specify 1519 want to use it if you specify
1520 :samp:`--compression-level`. 1520 :samp:`--compression-level`.
1521 1521
1522 -:samp:`--compression-level=@3@replaceable@3@level@4@replaceable@4@` 1522 +:samp:`--compression-level={level}`
1523 When writing new streams that are compressed with ``/FlateDecode``, 1523 When writing new streams that are compressed with ``/FlateDecode``,
1524 use the specified compression level. The value of 1524 use the specified compression level. The value of
1525 :samp:`level` should be a number from 1 to 9 and is 1525 :samp:`level` should be a number from 1 to 9 and is
@@ -1535,9 +1535,9 @@ following options are available: @@ -1535,9 +1535,9 @@ following options are available:
1535 normalization is enabled by default in QDF mode. Please see `QDF 1535 normalization is enabled by default in QDF mode. Please see `QDF
1536 Mode <#ref.qdf>`__ for additional discussion of QDF mode. 1536 Mode <#ref.qdf>`__ for additional discussion of QDF mode.
1537 1537
1538 -:samp:`--object-streams=@3@replaceable@3@mode@4@replaceable@4@` 1538 +:samp:`--object-streams={mode}`
1539 Controls handling of object streams. The value of 1539 Controls handling of object streams. The value of
1540 - :samp:`@3@replaceable@3@mode@4@replaceable@4@` may be 1540 + :samp:`{mode}` may be
1541 one of the following: 1541 one of the following:
1542 1542
1543 - :samp:`preserve`: preserve original object streams 1543 - :samp:`preserve`: preserve original object streams
@@ -1565,8 +1565,8 @@ following options are available: @@ -1565,8 +1565,8 @@ following options are available:
1565 See also :samp:`--preserve-unreferenced-resources`, 1565 See also :samp:`--preserve-unreferenced-resources`,
1566 which does something completely different. 1566 which does something completely different.
1567 1567
1568 -:samp:`--remove-unreferenced-resources=@3@replaceable@3@option@4@replaceable@4@`  
1569 - The :samp:`@1@replaceable@1@option@2@replaceable@2@` may be ``auto``, 1568 +:samp:`--remove-unreferenced-resources={option}`
  1569 + The :samp:`{option}` may be ``auto``,
1570 ``yes``, or ``no``. The default is ``auto``. 1570 ``yes``, or ``no``. The default is ``auto``.
1571 1571
1572 Starting with qpdf 8.1, when splitting pages, qpdf is able to attempt 1572 Starting with qpdf 8.1, when splitting pages, qpdf is able to attempt
@@ -1608,7 +1608,7 @@ following options are available: @@ -1608,7 +1608,7 @@ following options are available:
1608 at least prevents it from removing compliance on already compliant 1608 at least prevents it from removing compliance on already compliant
1609 files. 1609 files.
1610 1610
1611 -:samp:`--linearize-pass1=@3@replaceable@3@file@4@replaceable@4@` 1611 +:samp:`--linearize-pass1={file}`
1612 Write the first pass of linearization to the named file. The 1612 Write the first pass of linearization to the named file. The
1613 resulting file is not a valid PDF file. This option is useful only 1613 resulting file is not a valid PDF file. This option is useful only
1614 for debugging ``QPDFWriter``'s linearization code. When qpdf 1614 for debugging ``QPDFWriter``'s linearization code. When qpdf
@@ -1625,7 +1625,7 @@ following options are available: @@ -1625,7 +1625,7 @@ following options are available:
1625 with QDF mode or content normalization to make it easier to look at 1625 with QDF mode or content normalization to make it easier to look at
1626 all of a page's contents at once. 1626 all of a page's contents at once.
1627 1627
1628 -:samp:`--flatten-annotations=@3@replaceable@3@option@4@replaceable@4@` 1628 +:samp:`--flatten-annotations={option}`
1629 This option collapses annotations into the pages' contents with 1629 This option collapses annotations into the pages' contents with
1630 special handling for form fields. Ordinarily, an annotation is 1630 special handling for form fields. Ordinarily, an annotation is
1631 rendered separately and on top of the page. Combining annotations 1631 rendered separately and on top of the page. Combining annotations
@@ -1634,7 +1634,7 @@ following options are available: @@ -1634,7 +1634,7 @@ following options are available:
1634 transformations. The library functionality backing this option was 1634 transformations. The library functionality backing this option was
1635 added for the benefit of programs that want to create *n-up* page 1635 added for the benefit of programs that want to create *n-up* page
1636 layouts and other similar things that don't work well with 1636 layouts and other similar things that don't work well with
1637 - annotations. The :samp:`@1@replaceable@1@option@2@replaceable@2@` parameter 1637 + annotations. The :samp:`{option}` parameter
1638 may be any of the following: 1638 may be any of the following:
1639 1639
1640 - :samp:`all`: include all annotations that are not 1640 - :samp:`all`: include all annotations that are not
@@ -1704,15 +1704,15 @@ following options are available: @@ -1704,15 +1704,15 @@ following options are available:
1704 optimized as well. Use :samp:`--keep-inline-images` 1704 optimized as well. Use :samp:`--keep-inline-images`
1705 to prevent inline images from being included. 1705 to prevent inline images from being included.
1706 1706
1707 -:samp:`--oi-min-width=@3@replaceable@3@width@4@replaceable@4@` 1707 +:samp:`--oi-min-width={width}`
1708 Avoid optimizing images whose width is below the specified amount. If 1708 Avoid optimizing images whose width is below the specified amount. If
1709 omitted, the default is 128 pixels. Use 0 for no minimum. 1709 omitted, the default is 128 pixels. Use 0 for no minimum.
1710 1710
1711 -:samp:`--oi-min-height=@3@replaceable@3@height@4@replaceable@4@` 1711 +:samp:`--oi-min-height={height}`
1712 Avoid optimizing images whose height is below the specified amount. 1712 Avoid optimizing images whose height is below the specified amount.
1713 If omitted, the default is 128 pixels. Use 0 for no minimum. 1713 If omitted, the default is 128 pixels. Use 0 for no minimum.
1714 1714
1715 -:samp:`--oi-min-area=@3@replaceable@3@area-in-pixels@4@replaceable@4@` 1715 +:samp:`--oi-min-area={area-in-pixels}`
1716 Avoid optimizing images whose pixel count (widthย ร—ย height) is below 1716 Avoid optimizing images whose pixel count (widthย ร—ย height) is below
1717 the specified amount. If omitted, the default is 16,384 pixels. Use 0 1717 the specified amount. If omitted, the default is 16,384 pixels. Use 0
1718 for no minimum. 1718 for no minimum.
@@ -1726,7 +1726,7 @@ following options are available: @@ -1726,7 +1726,7 @@ following options are available:
1726 :samp:`--keep-inline-images` to exclude inline images 1726 :samp:`--keep-inline-images` to exclude inline images
1727 from image optimization. 1727 from image optimization.
1728 1728
1729 -:samp:`--ii-min-bytes=@3@replaceable@3@bytes@4@replaceable@4@` 1729 +:samp:`--ii-min-bytes={bytes}`
1730 Avoid converting inline images whose size is below the specified 1730 Avoid converting inline images whose size is below the specified
1731 minimum size to regular images. If omitted, the default is 1,024 1731 minimum size to regular images. If omitted, the default is 1,024
1732 bytes. Use 0 for no minimum. 1732 bytes. Use 0 for no minimum.
@@ -1744,9 +1744,9 @@ following options are available: @@ -1744,9 +1744,9 @@ following options are available:
1744 Mode <#ref.qdf>`__. Note that :samp:`--linearize` 1744 Mode <#ref.qdf>`__. Note that :samp:`--linearize`
1745 disables QDF mode. 1745 disables QDF mode.
1746 1746
1747 -:samp:`--min-version=@3@replaceable@3@version@4@replaceable@4@` 1747 +:samp:`--min-version={version}`
1748 Forces the PDF version of the output file to be at least 1748 Forces the PDF version of the output file to be at least
1749 - :samp:`@1@replaceable@1@version@2@replaceable@2@`. In other words, if the 1749 + :samp:`{version}`. In other words, if the
1750 input file has a lower version than the specified version, the 1750 input file has a lower version than the specified version, the
1751 specified version will be used. If the input file has a higher 1751 specified version will be used. If the input file has a higher
1752 version, the input file's original version will be used. It is seldom 1752 version, the input file's original version will be used. It is seldom
@@ -1755,14 +1755,14 @@ following options are available: @@ -1755,14 +1755,14 @@ following options are available:
1755 readers. 1755 readers.
1756 1756
1757 The version number may be expressed in the form 1757 The version number may be expressed in the form
1758 - :samp:`@1@replaceable@1@major.minor.extension-level@2@replaceable@2@`, in 1758 + :samp:`{major.minor.extension-level}`, in
1759 which case the version is interpreted as 1759 which case the version is interpreted as
1760 - :samp:`@1@replaceable@1@major.minor@2@replaceable@2@` at extension level  
1761 - :samp:`@1@replaceable@1@extension-level@2@replaceable@2@`. For example, 1760 + :samp:`{major.minor}` at extension level
  1761 + :samp:`{extension-level}`. For example,
1762 version ``1.7.8`` represents version 1.7 at extension level 8. Note 1762 version ``1.7.8`` represents version 1.7 at extension level 8. Note
1763 that minimal syntax checking is done on the command line. 1763 that minimal syntax checking is done on the command line.
1764 1764
1765 -:samp:`--force-version=@3@replaceable@3@version@4@replaceable@4@` 1765 +:samp:`--force-version={version}`
1766 This option forces the PDF version to be the exact version specified 1766 This option forces the PDF version to be the exact version specified
1767 *even when the file may have content that is not supported in that 1767 *even when the file may have content that is not supported in that
1768 version*. The version number is interpreted in the same way as with 1768 version*. The version number is interpreted in the same way as with
@@ -3121,7 +3121,7 @@ works. Look at the code in ``QPDFWriter`` for exact details. @@ -3121,7 +3121,7 @@ works. Look at the code in ``QPDFWriter`` for exact details.
3121 3121
3122 - Store current offset into xref table. 3122 - Store current offset into xref table.
3123 3123
3124 - - Write ``:samp:`@1@replaceable@1@n@2@replaceable@2@` 0 obj``. 3124 + - Write ``:samp:`{n}` 0 obj``.
3125 3125
3126 - If object is null, whether direct or indirect, write out null, 3126 - If object is null, whether direct or indirect, write out null,
3127 thus eliminating unresolvable indirect object references. 3127 thus eliminating unresolvable indirect object references.
@@ -3561,11 +3561,11 @@ which are these: @@ -3561,11 +3561,11 @@ which are these:
3561 ``/Size`` in the trailer dictionary) 3561 ``/Size`` in the trailer dictionary)
3562 3562
3563 - ``/Index`` (optional): value 3563 - ``/Index`` (optional): value
3564 - ``[:samp:`@1@replaceable@1@n count@2@replaceable@2@` ...]`` used to determine 3564 + ``[:samp:`{n count}` ...]`` used to determine
3565 which objects' information is stored in this stream. The default is 3565 which objects' information is stored in this stream. The default is
3566 ``[0 /Size]``. 3566 ``[0 /Size]``.
3567 3567
3568 -- ``/Prev``: value :samp:`@1@replaceable@1@offset@2@replaceable@2@`: byte 3568 +- ``/Prev``: value :samp:`{offset}`: byte
3569 offset of previous xref stream (same as ``/Prev`` in the trailer 3569 offset of previous xref stream (same as ``/Prev`` in the trailer
3570 dictionary) 3570 dictionary)
3571 3571
@@ -3877,7 +3877,7 @@ For a detailed list of changes, please see the file @@ -3877,7 +3877,7 @@ For a detailed list of changes, please see the file
3877 that is out of spec but that works in most viewers anyway). 3877 that is out of spec but that works in most viewers anyway).
3878 3878
3879 - The option 3879 - The option
3880 - :samp:`--password-file=@3@replaceable@3@filename@4@replaceable@4@` 3880 + :samp:`--password-file={filename}`
3881 can now be used to read the decryption password from a file. 3881 can now be used to read the decryption password from a file.
3882 You can use ``-`` as the file name to read the password from 3882 You can use ``-`` as the file name to read the password from
3883 standard input. This is an easier/more obvious way to read 3883 standard input. This is an easier/more obvious way to read
@@ -3894,9 +3894,9 @@ For a detailed list of changes, please see the file @@ -3894,9 +3894,9 @@ For a detailed list of changes, please see the file
3894 obtained by following the reference to the file spec object. 3894 obtained by following the reference to the file spec object.
3895 3895
3896 - Add numeric option to :samp:`--collate`. If 3896 - Add numeric option to :samp:`--collate`. If
3897 - :samp:`--collate=@3@replaceable@3@n@4@replaceable@4@` 3897 + :samp:`--collate={n}`
3898 is given, take pages in groups of 3898 is given, take pages in groups of
3899 - :samp:`@1@replaceable@1@n@2@replaceable@2@` from the given files. 3899 + :samp:`{n}` from the given files.
3900 3900
3901 - It is now valid to provide :samp:`--rotate=0` 3901 - It is now valid to provide :samp:`--rotate=0`
3902 to clear rotation from a page. 3902 to clear rotation from a page.
@@ -4517,7 +4517,7 @@ For a detailed list of changes, please see the file @@ -4517,7 +4517,7 @@ For a detailed list of changes, please see the file
4517 :samp:`--compression-level`. 4517 :samp:`--compression-level`.
4518 4518
4519 - The 4519 - The
4520 - :samp:`--compression-level=@3@replaceable@3@level@4@replaceable@4@` 4520 + :samp:`--compression-level={level}`
4521 sets the zlib compression level used for any streams compressed 4521 sets the zlib compression level used for any streams compressed
4522 by ``/FlateDecode``. Most effective when combined with 4522 by ``/FlateDecode``. Most effective when combined with
4523 :samp:`--recompress-flate`. 4523 :samp:`--recompress-flate`.
@@ -4687,7 +4687,7 @@ For a detailed list of changes, please see the file @@ -4687,7 +4687,7 @@ For a detailed list of changes, please see the file
4687 get it again. 4687 get it again.
4688 4688
4689 - New option 4689 - New option
4690 - :samp:`--keep-files-open-threshold=@3@replaceable@3@count@4@replaceable@4@` 4690 + :samp:`--keep-files-open-threshold={count}`
4691 can be used to override number of files that qpdf will use to 4691 can be used to override number of files that qpdf will use to
4692 trigger the behavior of not keeping all files open when merging 4692 trigger the behavior of not keeping all files open when merging
4693 files. This may be necessary if your system allows fewer than 4693 files. This may be necessary if your system allows fewer than
@@ -5148,7 +5148,7 @@ For a detailed list of changes, please see the file @@ -5148,7 +5148,7 @@ For a detailed list of changes, please see the file
5148 - Command-line Enhancements 5148 - Command-line Enhancements
5149 5149
5150 - Add 5150 - Add
5151 - :samp:`--keep-files-open=@3@replaceable@3@[yn]@4@replaceable@4@` 5151 + :samp:`--keep-files-open={[yn]}`
5152 to override default determination of whether to keep files open 5152 to override default determination of whether to keep files open
5153 when merging. Please see the discussion of 5153 when merging. Please see the discussion of
5154 :samp:`--keep-files-open` in `Basic 5154 :samp:`--keep-files-open` in `Basic
@@ -5228,7 +5228,7 @@ For a detailed list of changes, please see the file @@ -5228,7 +5228,7 @@ For a detailed list of changes, please see the file
5228 5228
5229 - The :samp:`--rotate` option's syntax has been 5229 - The :samp:`--rotate` option's syntax has been
5230 extended to make the page range optional. If you specify 5230 extended to make the page range optional. If you specify
5231 - :samp:`--rotate=@3@replaceable@3@angle@4@replaceable@4@` 5231 + :samp:`--rotate={angle}`
5232 without specifying a page range, the rotation will be applied 5232 without specifying a page range, the rotation will be applied
5233 to all pages. This can be especially useful for adjusting a PDF 5233 to all pages. This can be especially useful for adjusting a PDF
5234 created from a multi-page document that was scanned upside 5234 created from a multi-page document that was scanned upside
@@ -5352,7 +5352,7 @@ For a detailed list of changes, please see the file @@ -5352,7 +5352,7 @@ For a detailed list of changes, please see the file
5352 `Running QPDF <#ref.using>`__. 5352 `Running QPDF <#ref.using>`__.
5353 5353
5354 - The option 5354 - The option
5355 - :samp:`--linearize-pass1=@3@replaceable@3@file@4@replaceable@4@` 5355 + :samp:`--linearize-pass1={file}`
5356 has been added for debugging qpdf's linearization code. 5356 has been added for debugging qpdf's linearization code.
5357 5357
5358 - The option :samp:`--coalesce-contents` can be 5358 - The option :samp:`--coalesce-contents` can be