[WEB] TWILL has a third file argument, too.

git-svn-id: svn://tug.org/texlive/trunk@62898 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 30 insertions, 26 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 23c5ee70b3e..6012fd54cbd 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-27  Andreas Scherer  <https://ascherer.github.io>
+
+	* help.h: TWILL has a third file argument.
+
 2022-03-21  Karl Berry  <karl@tug.org>
 
 	* TL'22 release.
diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h
index 821b00899d9..ce384d77939 100644
--- a/Build/source/texk/web2c/help.h
+++ b/Build/source/texk/web2c/help.h
@@ -645,10 +645,12 @@ const_string WEAVEHELP[] = {
 
 #ifdef TWILL
 const_string TWILLHELP[] = {
-    "Usage: twill [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
+    "Usage: twill [OPTION] WEBFILE[.web] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]",
     "  Weave WEBFILE with CHANGEFILE into a TeX document with mini-indexes.",
     "  Default CHANGEFILE is " DEV_NULL ";",
-    "  TeX output goes to the basename of WEBFILE extended with `.tex'.",
+    "  TeX output goes to the basename of WEBFILE extended with `.tex',",
+    "  unless otherwise specified by OUTFILE;",
+    "  in this case, '-' specifies a null CHANGEFILE.",
     "",
     "-x          omit cross-reference information",
     "-help       display this help and exit",
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index 17615bcff81..9453f6cca14 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,8 @@
+2022-03-27  Andreas Scherer  <https://ascherer.github.io>
+
+	* tangle.man,
+	* weave.man: Improved SYNOPSIS formatting.
+
 2022-03-21  Karl Berry  <karl@tug.org>
 
 	* TL'22 release.
diff --git a/Build/source/texk/web2c/man/tangle.man b/Build/source/texk/web2c/man/tangle.man
index d35e1c3eaa5..63ce8b4af42 100644
--- a/Build/source/texk/web2c/man/tangle.man
+++ b/Build/source/texk/web2c/man/tangle.man
@@ -18,15 +18,11 @@
 .SH NAME
 tangle \- translate WEB to Pascal
 .SH SYNOPSIS
-.B tangle
-.RI [ options ]
-.IR webfile [ \fB.web\fP ]
-[ {
-.IR changefile [ \fB.ch\fP ]
-|\-}
-[
-.IR outfile [ \fB.p\fP ]
-] ]
+.PP
+\f[B]tangle\f[R] [\f[I]options\f[R]]
+\f[I]webfile\f[R][\f[B].web\f[R]]
+[{\f[I]changefile\f[R][\f[B].ch\f[R]]|\f[B]-\f[R]}
+[\f[I]outfile\f[R][\f[B].p\f[R]]]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete
diff --git a/Build/source/texk/web2c/man/twill.man b/Build/source/texk/web2c/man/twill.man
index a6420fb9d71..4b58b490efc 100644
--- a/Build/source/texk/web2c/man/twill.man
+++ b/Build/source/texk/web2c/man/twill.man
@@ -1,4 +1,4 @@
-.TH WEAVE 1 "09 January 2022" "Web2C @VERSION@"
+.TH WEAVE 1 "02 April 2022" "Web2C @VERSION@"
 .\"=====================================================================
 .if n .ds MF Metafont
 .if t .ds MF Metafont
@@ -18,10 +18,11 @@
 .SH NAME
 twill \- translate WEB to TeX
 .SH SYNOPSIS
-.B twill
-.RB [ \-x ]
-.IR webfile [ \fB.web\fP ]
-.RI [ changefile [ \fB.ch\fP ]]
+.PP
+\f[B]twill\f[R] [\f[B]-x\f[R]]
+\f[I]webfile\f[R][\f[B].web\f[R]]
+[{\f[I]changefile\f[R][\f[B].ch\f[R]]|\f[B]-\f[R]}
+[\f[I]outfile\f[R][\f[B].tex\f[R]]]]
 .\"=====================================================================
 .SH DESCRIPTION
 The
@@ -41,7 +42,7 @@ says to omit the indexes, module name list, and table of contents pages.
 .I CONTENTS.tex
 file will still be written when the \*(TX file is processed,
 however, unless some macros in
-.I webmac.tex
+.I twimac-web.tex
 are redefined.)
 .PP
 The output \*(TX file name is formed by adding
diff --git a/Build/source/texk/web2c/man/weave.man b/Build/source/texk/web2c/man/weave.man
index 295a78581e9..2680ff9515f 100644
--- a/Build/source/texk/web2c/man/weave.man
+++ b/Build/source/texk/web2c/man/weave.man
@@ -18,15 +18,11 @@
 .SH NAME
 weave \- translate WEB to TeX
 .SH SYNOPSIS
-.B weave
-.RB [ \-x ]
-.IR webfile [ \fB.web\fP ]
-[ {
-.IR changefile [ \fB.ch\fP ]
-|\-}
-[
-.IR outfile [ \fB.tex\fP ]
-] ]
+.PP
+\f[B]weave\f[R] [\f[B]-x\f[R]]
+\f[I]webfile\f[R][\f[B].web\f[R]]
+[{\f[I]changefile\f[R][\f[B].ch\f[R]]|\f[B]-\f[R]}
+[\f[I]outfile\f[R][\f[B].tex\f[R]]]]
 .\"=====================================================================
 .SH DESCRIPTION
 This manual page is not meant to be exhaustive.  The complete