[groff] 01/01: tmac/groff_www.7.man: Do not use .URL, .MTO, and .FTP.

[Ingo Schwarze]

schwarze pushed a commit to branch master
in repository groff.

commit 14aef0ff06468750ede2e373cbf1e23d88251edb
Author: Ingo Schwarze <address@hidden>
Date:   Mon Aug 27 01:53:43 2018 +0200

    tmac/groff_www.7.man: Do not use .URL, .MTO, and .FTP.
    
    A manual page about a macro set must not use its own macro set,
    but rather use man(7) or mdoc(7), or it is not portable.
    It is trivial to fix that here because the groff_man(7) GNU
    extensions offer identical functionality with .UR/.UE and .MT/.ME.
    
    While here, also delete the duplicate FTP line from the macro list.
    
    OK gbranden@
---
 ChangeLog            |  4 ++++
 tmac/groff_www.7.man | 47 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c8ade6..fbbf7d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-27  Ingo Schwarze  <address@hidden>
+
+       * tmac/groff_www.7.man: Do not use .URL, .MTO, .FTP.
+
 2018-08-21  Ingo Schwarze  <address@hidden>
 
        Improve terminal rendering for a few special characters:
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index 565a4dd..96f16fa 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -92,7 +92,6 @@ l l.
 \&address@hidden a URL using two parameters
 \&address@hidden an FTP reference
 \&address@hidden an HTML email address
-\&address@hidden an FTP reference
 \&address@hidden an HTML name
 \&address@hidden an image file
 \&address@hidden PNG image
@@ -213,7 +212,9 @@ explicit breakpoints should be inserted with the
 escape.
 .
 Here is how to encode
-.URL http://\:foo.\:org/ "foo" :
+.UR http://\:foo.\:org/
+foo
+.UE :
 .RS
 .IP
 .B .URL http://\[rs]:foo.\[rs]:org/ "foo" :
@@ -232,7 +233,9 @@ foo \[la]\f[CR]http://foo.org\f[]\[ra]:
 .
 .IP
 The URL macro can be of any type; for example we can reference
-.URL pic.html "Eric Raymond's pic guide"
+.UR pic.html
+Eric Raymond's pic guide
+.UE
 by:
 .RS
 .IP
@@ -256,8 +259,10 @@ An optional third argument is stuff printed immediately 
afterwards.
 Hyphenation is disabled while printing the actual email address.
 .
 For example,
-.MTO address@hidden "Joe User"
-was achieved by the following macro:
+.MT address@hidden
+Joe User
+.ME
+can be achieved by the following macro:
 .RS
 .IP
 .B .MTO address@hidden \[dq]Joe User\[dq]
@@ -290,10 +295,12 @@ The second and the third parameter are optional.
 .
 Hyphenation is disabled while printing the actual URL.
 .
-As an example, here the location of the
-.FTP ftp://\:ftp.gnu.org/ "GNU FTP server" .
+As an example, here is the location of the
+.UR ftp://\:ftp.gnu.org/
+GNU FTP server
+.UE .
 .
-The macro example above was specified by:
+The macro example above can be specified as:
 .RS
 .IP
 .B .FTP ftp://\[rs]:ftp.gnu.org/ \[dq]GNU FTP server\[dq] .
@@ -304,7 +311,9 @@ The macro example above was specified by:
 Generates an HTML name tag from its argument.
 .
 This can then be referenced using the
-.URL #URL URL
+.UR #URL
+URL
+.UE
 macro.
 .
 As you can see, you must precede the tag name with
@@ -659,7 +668,9 @@ generates links to all section headings and places these at 
the top of the
 HTML document.
 .
 (See
-.URL #LK LINKS
+.UR #LK
+LINKS
+.UE
 for details of how to switch this off or alter the position).
 .
 .
@@ -683,7 +694,9 @@ information is currently rendered as a PNG image.
 .\" ====================================================================
 .
 Report bugs to the
-.MTO address@hidden:gnu.org "Groff Bug Mailing List" .
+.MT address@hidden:gnu.org
+Groff Bug Mailing List
+.ME .
 .
 Include a complete, self-contained example that will allow the bug to
 be reproduced, and say which version of groff you are using.
@@ -696,11 +709,17 @@ The
 .I www
 macro package
 was written by
-.MTO address@hidden:glam.ac.uk "Gaius Mulley" ,
+.MT address@hidden:glam.ac.uk
+Gaius Mulley ,
+.ME ,
 with additions by
-.MTO address@hidden:gnu.org "Werner Lemberg"
+.MT address@hidden:gnu.org
+Werner Lemberg
+.ME
 and
-.MTO address@hidden:web.de "Bernd Warken" .
+.MT address@hidden:web.de
+Bernd Warken
+.ME .
 .
 .
 .\" ====================================================================