* README, doc/webpage.ms: Updated.

* tmac/www.tmac (HTML, HTML-TAG): Minor clean-ups.

5 files changed, 65 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index ea21662eb..f4d5f19be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-15  Werner LEMBERG  <wl@gnu.org>
+
+	* README, doc/webpage.ms: Updated.
+
+	* tmac/www.tmac (HTML, HTML-TAG): Minor clean-ups.
+
 2004-10-30  Gaius Mulley  <gaius@glam.ac.uk>
 
 	* src/include/printer.h (printer): Remove virtual function
diff --git a/NEWS b/NEWS
index 269c2d863..5dbfb1ddf 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,11 @@ Xtotroff
 o This program to create font definition files for xditview isn't new but
   hasn't been installed previously.
 
+Groffer
+-------
+
+o A security problem (reported as CAN-2004-0969) has been fixed.
+
 Macro packages
 --------------
 
diff --git a/README b/README
index edd8136f5..363411bca 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ is given in the file VERSION.
 Included in this release are implementations of troff, pic, eqn, tbl,
 grn, refer, -man, -mdoc, -mom, and -ms macros, and drivers for PostScript,
 TeX dvi format, HP LaserJet 4 printers, Canon CAPSL printers, HTML format
-(still alpha), and typewriter-like devices.  Also included is a modified
+(beta status), and typewriter-like devices.  Also included is a modified
 version of the Berkeley -me macros, an enhanced version of the X11
 xditview previewer, and an implementation of the -mm macros contributed
 by Joergen Haegg (jh@axis.se).
@@ -22,29 +22,30 @@ in compiling, installing, and running groff.
 The most recent released version of groff is always available by
 anonymous ftp from ftp.gnu.org in the directory pub/gnu/groff.
 
-A CVS repository is available, containing the current development
-version of groff.  You can access it with the commands
+A CVS repository is available (http://savannah.gnu.org/cvs/?group=groff),
+containing the current development version of groff.  You can access it
+with the commands
 
-  export CVSROOT=:pserver:anoncvs@anoncvs.ffii.org:/var/cvs
-  cvs login
+  export CVSROOT=:ext:anoncvs@savannah.gnu.org:/cvsroot/groff
+  export CVS_RSH=ssh
   cvs -z9 co groff
 
-(if the prompt for the password appears, just press the enter key).
-After a successful login you no longer need the first two commands; an
-update of a checked out repository should be done with
+Note that you need an SSH client for security reasons.
 
-  cvs -z9 update -dP
+An update of a checked out repository should be done with
+
+  CVS_RSH=ssh cvs -z9 update -dP
 
 Please read the info pages of cvs for further details.
 
 Alternatively, you can download snapshots (which are updated twice a
 day) from
 
-  ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz
+  http://groff.ffii.org/groff/groff-current.tar.gz
 
 or a diff file relative to the latest official groff release as
 
-  ftp://ftp.ffii.org/pub/groff/devel/groff-<version>-current.diff.gz
+  http://groff.ffii.org/groff/groff-<version>-current.diff.gz
 
 Assuming that groff-<version>.tar.gz and
 groff-<version>-current.diff.gz are in the same directory, do the
@@ -57,7 +58,7 @@ following to apply the diff file:
 Finally, it is possible to access the CVS with a browser by pointing it
 to
 
-  http://www.ffii.org/cgi-bin/viewcvs.cgi/groff
+  http://savannah.gnu.org/cvs/?group=groff
 
 Please report bugs using the form in the file BUG-REPORT; the idea of
 this is to make sure that FSF has all the information it needs to fix
@@ -69,19 +70,18 @@ enable us to determine whether it really is a bug or not.
 Three mailing lists are available:
 
   bug-groff@gnu.org          for reporting bugs
-  groff@ffii.org             for general discussion of groff
-  groff-commit@ffii.org      a read-only list showing logs of
-                             commitments to the CVS repository
+  groff@gnu.org              for general discussion of groff
+  groff-commit@gnu.org       a read-only list showing commitments
+                             to the CVS repository
 
-Note that groff@gnu.org is an alias for groff@ffii.org; you must be
-subscribed to the `groff' list to send mails.
+You must be subscribed to the `groff' list to send mails.
 
 To subscribe, send a mail to <list>-request@<domain> (example:
-groff-request@ffii.org) with the word `subscribe' in either the subject
+groff-request@gnu.org) with the word `subscribe' in either the subject
 or body of the email (don't include the quotes) or have a look at the
 groff mailing list web page at
 
-  http://ffii.org/mailman/listinfo/groff
+  http://list.gnu.org/mailman/listinfo/groff
 
 GNU groff was written by James Clark <jjc@jclark.com>.  It is now
 maintained by Ted Harding <ted.harding@nessie.mcc.ac.uk> and Werner
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 3cd70b425..0a900deff 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -46,13 +46,11 @@ Home of Groff (GNU Troff).
 .
 .HnS 1
 .HR
-GNU Troff
-.URL http://\:groff.ffii.org/ (Groff)
+GNU Troff (\c
+.URL http://\:groff.ffii.org/ Groff )
 \[em] a
 .URL http://\:www.gnu.org/ GNU
 project.
-Hosted by
-.URL http://\:ffii.org/ FFII .
 .HR
 .HnE
 .LK
@@ -70,18 +68,18 @@ Download
 
 The source code of the currently released versions of groff is
 available at the 
-.URL "ftp://\:groff.ffii.org/\:pub/\:groff/" "FFII host (Germany)" ,
+.URL "http://\:groff.ffii.org/\:groff/" "FFII host (Germany)" ,
 .URL "ftp://\:ftp.gnu.org/\:gnu/\:groff/" "GNU host (USA)" ,
 and its mirrors.
 .
-The USA site also contains more old, obsolete versions.
+The USA site also contains older, obsolete versions.
 
 The most actual pre-release, development version is available from a
 CVS repository, see below.
 .
 Development snapshots (produced twice a day from the CVS repository)
-can be downloaded with FTP from
-.URL "ftp://\:groff.ffii.org/\:pub/\:groff/devel" here .
+can be downloaded from
+.URL "http://\:groff.ffii.org/\:groff/\:devel" here .
 
 For a special version of groff on the Microsoft operating systems, see
 .URL "http://\:gnuwin32.sf.net/\:packages/\:groffl.htm" "Groff for Windows" .
@@ -90,10 +88,10 @@ GNU troff is released under the
 .URL http://\:www.gnu.org/\:copyleft/\:gpl.html "GNU Copyright License" .
 
 User issues lead:
-.MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding"
+.MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding" .
 .br
 Technical issues lead:
-.MTO wl@\:gnu.org "Werner Lemberg"
+.MTO wl@\:gnu.org "Werner Lemberg" .
 .
 .
 .SH
@@ -104,8 +102,8 @@ The version number is given in the file VERSION.
 
 Included in this release are implementations of troff, pic, eqn, tbl,
 grn, refer, \-man, \-mdoc, and \-ms macros, and drivers for PostScript,
-TeX dvi format, HP LaserJet 4 printers, Canon CAPSL printers, HTML format
-(still alpha), and typewriter-like devices.
+TeX dvi format, HP LaserJet\~4 printers, Canon CAPSL printers, HTML format
+(beta status), and typewriter-like devices.
 Also included is a modified version of the Berkeley \-me macros, an enhanced
 version of the X11 xditview previewer, and an implementation of the \-mm
 macros contributed by
@@ -125,27 +123,28 @@ compiling, installing, and running groff.
 The most recent released version of groff is always available by anonymous
 ftp from ftp.gnu.org in the directory pub/\:gnu/\:groff.
 
-A CVS repository is available, containing the current development
-version of groff.
+A
+.URL "http://\:savannah.gnu.org/\:cvs/\:?group=groff" "CVS repository"
+is available, containing the current development version of groff.
 You can access it with the commands
 
 .in 2m
 .nf
 .ft C
-export CVSROOT=:pserver:anoncvs@anoncvs.ffii.org:/var/cvs
-cvs login
+export CVSROOT=:ext:anoncvs@savannah.gnu.org:/cvsroot/groff
+export CVS_RSH=ssh
 cvs -z9 co groff
 .ft P
 .fi
 .in
 
-(if the prompt for the password appears, just press the enter key).
-After a successful login you no longer need the first two commands; an
-update of a checked out repository should be done with
+Note that you need an SSH client for security reasons.    
+
+An update of a checked out repository should be done with
 
 .in 2m
 .ft C
-cvs -z9 update -dP
+CVS_RSH=ssh cvs -z9 update -dP
 .ft P
 .in
 
@@ -153,12 +152,12 @@ Please read the info pages of cvs for further details.
 
 Alternatively, you can download snapshots (which are updated twice a day)
 from
-.URL ftp://\:ftp.ffii.org/\:pub/\:groff/\:devel/\:groff-current.tar.gz here
+.URL http://\:groff.ffii.org/\:groff/\:devel/\:groff-current.tar.gz here
 or a diff file relative to the latest official groff release as
 
 .in 2m
 .ft C
-ftp://ftp.ffii.org/pub/groff/devel/groff-\[la]version\[ra]-current.diff.gz
+http://groff.ffii.org/groff/devel/groff-\[la]version\[ra]-current.diff.gz
 .ft P
 .in
 
@@ -180,8 +179,8 @@ Finally, it is possible to access the CVS with a browser by pointing it
 to
 
 .in 2m
-.URL http://www.ffii.org/cgi-bin/viewcvs.cgi/groff \
-     http://www.ffii.org/cgi-bin/viewcvs.cgi/groff
+.URL http://savannah.gnu.org/cvs/?group=groff \
+     http://savannah.gnu.org/cvs/?group=groff
 .in
 
 Please report bugs using the form in the file BUG-REPORT; the idea of this
@@ -200,25 +199,23 @@ Three mailing lists are available:
 for reporting bugs
 
 .LI
-.MTO groff@ffii.org groff@ffii.org
+.MTO groff@gnu.org groff@gnu.org
 for general discussion of groff
 
 .LI
-.MTO groff-commit@ffii.org groff-commit@ffii.org
-a read-only list showing logs of commitments to the CVS repository
+.MTO groff-commit@gnu.org groff-commit@gnu.org
+a read-only list showing commitments to the CVS repository
 .ULE
 
-Note that groff@gnu.org is an alias for
-.MTO groff@\:ffii.org groff@\:ffii.org ;
-you must be subscribed to the `groff' list to send mails.
+You must be subscribed to the `groff' list to send mails.
 
 To subscribe, send e-mail to \[la]list\[ra]-request@\[la]domain\[ra]
 (example:
-.MTO groff-request@\:ffii.org groff-request@\:ffii.org )
+.MTO groff-request@\:gnu.org groff-request@\:gnu.org )
 with the word `subscribe' in either the
 subject or body of the e-mail (don't include the quotes) or have a look
 at the
-.URL http://\:ffii.org/\:mailman/\:listinfo/\:groff/ \
+.URL http://\:lists.gnu.org/\:mailman/\:listinfo/\:groff/ \
      "groff mailing list webpage" .
 
 GNU groff was written by
diff --git a/tmac/www.tmac b/tmac/www.tmac
index 0dd387af4..5f1d491df 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -256,15 +256,14 @@ www functionality.  It should work with any macro set.
 .\" --------------------------------------------------------------------
 .
 .\" --------------------------------------------------------------------
-.\" HTML (<address> <description> [<punctuation>])
+.\" HTML
 .\"
 .\" the main auxiliary macro for the HTML interface
 .\"
 .de HTML
 .  if \\n[www-html] \{\
-.    \" the following line makes the vertical mode leave, so to say
-.    nop \&
-.    nop \X^html:\\$*^
+.    \" the `\&' makes the vertical mode leave, so to say
+.    nop \&\X^html:\\$*^
 .  \}
 ..
 .\"
@@ -413,9 +412,8 @@ www functionality.  It should work with any macro set.
 .\"
 .de HTML-TAG
 .  if \\n[www-html] \{\
-.    \" the following line makes the vertical mode leave, so to say
-.    nop \&
-.    nop \X^html-tag:\\$*^
+.    \" the `\&' makes the vertical mode leave, so to say
+.    nop \&\X^html-tag:\\$*^
 .  \}
 ..
 .\" --------------------------------------------------------------------
@@ -711,7 +709,7 @@ www functionality.  It should work with any macro set.
 .\" HTL
 .\"
 .\"   Generate an HTML title only.  This differs from the -ms .TL macro
-.\"   which generates both an HTML title and a H1 heading.
+.\"   which generates both an HTML title and an H1 heading.
 .\"
 .\"   This is useful when an author wishes to use a HTML title as search
 .\"   engine fodder but a graphic title in the document.