Commit a5cab082fa7eca06cf80324e4536b5b707ed2eaf

Authored by m-holger
Committed by GitHub
2 parents 756b5e30 e793abe3

Merge pull request #1348 from m-holger/pr1347

jidanni cli.rst update
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 aef902a501f7b940d5c182e800d1a4bc2b62f07be898124dc7d6ca9f286b93e9
  12 +libqpdf/qpdf/auto_job_help.hh 9628a4b3f57ed8ecda3c7b8761b4daa48eaf9da0a6a0fc68bf417c467bd737eb
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 8050662bf161e8b568b5db6bb9fab2d6dacc1eb060d39b27bf460dbfe52f0db4
19   -manual/qpdf.1 d98b0de595ee931aeeb455c14c71210f0ebb689464d982af58cd126c6f689ac8
  18 +manual/cli.rst 45629c81bb407e7a1d2302ff1a9ef87f706565904aa5c21e64adefb34eee575c
  19 +manual/qpdf.1 e058bd97a2bbc1e39282c709fb3beb1c3f8d3e2372b2974e11a849fd0bfb3505
20 20 manual/qpdf.1.in 436ecc85d45c4c9e2dbd1725fb7f0177fb627179469f114561adf3cb6cbb677b
... ...
libqpdf/qpdf/auto_job_help.hh
... ... @@ -357,12 +357,12 @@ for multi-page groups.
357 357 )");
358 358 ap.addOptionHelp("--overlay", "modification", "begin overlay options", R"(--overlay file [options] --
359 359  
360   -Overlay pages from another file on the output.
  360 +Overlay pages from another PDF file on the output.
361 361 Run qpdf --help=overlay-underlay for details.
362 362 )");
363 363 ap.addOptionHelp("--underlay", "modification", "begin underlay options", R"(--underlay file [options] --
364 364  
365   -Underlay pages from another file on the output.
  365 +Underlay pages from another PDF file on the output.
366 366 Run qpdf --help=overlay-underlay for details.
367 367 )");
368 368 ap.addOptionHelp("--flatten-rotation", "modification", "remove rotation from page dictionary", R"(For each page that is rotated using the /Rotate key in the
... ... @@ -706,7 +706,7 @@ Examples:
706 706  
707 707 More examples are in the manual.
708 708 )");
709   -ap.addHelpTopic("overlay-underlay", "overlay/underlay pages from other files", R"(These options allow pages from another file to be overlaid or
  709 +ap.addHelpTopic("overlay-underlay", "overlay/underlay pages from other PDF files", R"(These options allow pages from another PDF file to be overlaid or
710 710 underlaid on the primary output. Overlaid pages are drawn on top of
711 711 the destination page and may obscure the page. Underlaid pages are
712 712 drawn below the destination page. Usage:
... ...
manual/cli.rst
... ... @@ -1522,10 +1522,10 @@ Related Options
1522 1522  
1523 1523 .. help: begin overlay options
1524 1524  
1525   - Overlay pages from another file on the output.
  1525 + Overlay pages from another PDF file on the output.
1526 1526 Run qpdf --help=overlay-underlay for details.
1527 1527  
1528   - Overlay pages from another file on the output.
  1528 + Overlay pages from another PDF file on the output.
1529 1529  
1530 1530 See :ref:`overlay-underlay` for details.
1531 1531  
... ... @@ -1533,10 +1533,10 @@ Related Options
1533 1533  
1534 1534 .. help: begin underlay options
1535 1535  
1536   - Underlay pages from another file on the output.
  1536 + Underlay pages from another PDF file on the output.
1537 1537 Run qpdf --help=overlay-underlay for details.
1538 1538  
1539   - Underlay pages from another file on the output.
  1539 + Underlay pages from another PDF file on the output.
1540 1540  
1541 1541 See :ref:`overlay-underlay` for details.
1542 1542  
... ... @@ -2822,9 +2822,9 @@ else the page references.
2822 2822 Overlay and Underlay
2823 2823 --------------------
2824 2824  
2825   -.. help-topic overlay-underlay: overlay/underlay pages from other files
  2825 +.. help-topic overlay-underlay: overlay/underlay pages from other PDF files
2826 2826  
2827   - These options allow pages from another file to be overlaid or
  2827 + These options allow pages from another PDF file to be overlaid or
2828 2828 underlaid on the primary output. Overlaid pages are drawn on top of
2829 2829 the destination page and may obscure the page. Underlaid pages are
2830 2830 drawn below the destination page. Usage:
... ...
manual/qpdf.1
... ... @@ -463,13 +463,13 @@ for multi-page groups.
463 463 .B --overlay \-\- begin overlay options
464 464 --overlay file [options] --
465 465  
466   -Overlay pages from another file on the output.
  466 +Overlay pages from another PDF file on the output.
467 467 Run qpdf --help=overlay-underlay for details.
468 468 .TP
469 469 .B --underlay \-\- begin underlay options
470 470 --underlay file [options] --
471 471  
472   -Underlay pages from another file on the output.
  472 +Underlay pages from another PDF file on the output.
473 473 Run qpdf --help=overlay-underlay for details.
474 474 .TP
475 475 .B --flatten-rotation \-\- remove rotation from page dictionary
... ... @@ -843,8 +843,8 @@ to out.pdf. Use password "x" to open b.pdf:
843 843 qpdf --empty --pages a.pdf b.pdf --password=x z-1 c.pdf 3,6
844 844  
845 845 More examples are in the manual.
846   -.SH OVERLAY-UNDERLAY (overlay/underlay pages from other files)
847   -These options allow pages from another file to be overlaid or
  846 +.SH OVERLAY-UNDERLAY (overlay/underlay pages from other PDF files)
  847 +These options allow pages from another PDF file to be overlaid or
848 848 underlaid on the primary output. Overlaid pages are drawn on top of
849 849 the destination page and may obscure the page. Underlaid pages are
850 850 drawn below the destination page. Usage:
... ...