Mention PDF before PostScript everywhere, partly because PDF is the

dominant format for print-oriented documents, but mostly because it's
hard to mention pdfmark without having mentioned PDF already.

Also mention pdfmark.

[originally from svn r6975]

3 files changed, 32 insertions, 30 deletions

diff --git a/doc/intro.but b/doc/intro.but
index 616b6ad..2898d17 100644
--- a/doc/intro.but
+++ b/doc/intro.but
@@ -25,10 +25,10 @@ Currently Halibut supports the following output formats:
 
 \b GNU \c{info} format.
 
-\b PostScript.
-
 \b PDF.
 
+\b PostScript.
+
 \H{intro-features} Features supported by Halibut
 
 Here's a list of Halibut's notable features.
diff --git a/doc/manpage.but b/doc/manpage.but
index de6783a..78f211c 100644
--- a/doc/manpage.but
+++ b/doc/manpage.but
@@ -85,14 +85,6 @@ you specify; the subsidiary files will have suffixes \c{-1}, \c{-2}
 etc.
 }
 
-\dt \cw{--ps}[\cw{=}\e{filename}]
-
-\dd Makes Halibut generate an output file in PostScript format. If
-the optional \e{filename} parameter is supplied, the PostScript
-output file will be given that name. Otherwise, the name of
-the output PostScript file will be as specified in the input files,
-or \c{output.ps} if none is specified at all.
-
 \dt \cw{--pdf}[\cw{=}\e{filename}]
 
 \dd Makes Halibut generate an output file in PDF format. If
@@ -101,6 +93,14 @@ output file will be given that name. Otherwise, the name of
 the output PDF file will be as specified in the input files,
 or \c{output.pdf} if none is specified at all.
 
+\dt \cw{--ps}[\cw{=}\e{filename}]
+
+\dd Makes Halibut generate an output file in PostScript format. If
+the optional \e{filename} parameter is supplied, the PostScript
+output file will be given that name. Otherwise, the name of
+the output PostScript file will be as specified in the input files,
+or \c{output.ps} if none is specified at all.
+
 \dt \cw{-C}\e{word}\cw{:}\e{word}[\cw{:}\e{word}...]
 
 \dd Adds a configuration directive to the input processed by
diff --git a/doc/output.but b/doc/output.but
index 0bd6393..a0e7378 100644
--- a/doc/output.but
+++ b/doc/output.but
@@ -1350,28 +1350,10 @@ and no \cw{\\cfg\{info-dir-entry\}} directives.
 These output formats (currently PostScript and PDF) generate printable
 manuals. As such, they share a number of configuration directives.
 
-\S{output-ps} \i{PostScript}
-
-This output format generates a printable manual in PostScript format.
-
-There is one configuration option specific to PostScript:
-
-\dt \I{\cw{\\cfg\{ps-filename\}}}\cw{\\cfg\{ps-filename\}\{}\e{filename}\cw{\}}
-
-\dd Sets the \i{output file name} in which to store the PostScript
-file. This directive is implicitly generated if you provide a file
-name parameter after the command-line option \i\c{--ps} (see
-\k{running-options}).
-
-The \i{default settings} for the PostScript output format are:
-
-\c \cfg{ps-filename}{output.ps}
-
 \S{output-pdf} \i{PDF}
 
-This output format generates a printable manual in PDF format. This
-should look exactly identical to the PostScript output (see
-\k{output-ps}), but also uses some PDF interactive features to
+This output format generates a printable manual in PDF format. In
+addition, it uses some PDF interactive features to
 provide an outline of all the document's sections and clickable
 cross-references between sections.
 
@@ -1388,6 +1370,26 @@ The \i{default settings} for the PDF output format are:
 
 \c \cfg{pdf-filename}{output.pdf}
 
+\S{output-ps} \i{PostScript}
+
+This output format generates a printable manual in PostScript format.
+This should look exactly identical to the PDF output (see
+\k{output-ps}), and uses \i\c{pdfmark} to arrange that if converted
+to PDF it will contain the same interactive features.
+
+There is one configuration option specific to PostScript:
+
+\dt \I{\cw{\\cfg\{ps-filename\}}}\cw{\\cfg\{ps-filename\}\{}\e{filename}\cw{\}}
+
+\dd Sets the \i{output file name} in which to store the PostScript
+file. This directive is implicitly generated if you provide a file
+name parameter after the command-line option \i\c{--ps} (see
+\k{running-options}).
+
+The \i{default settings} for the PostScript output format are:
+
+\c \cfg{ps-filename}{output.ps}
+
 \S{output-paper-dimensions} Configuring layout and \i{measurements}
 
 All measurements are in PostScript \i{points} (72 points to the inch).