* m4/groff.m4: Renamed from aclocal.m4.

* m4/codeset.m4: New file, from gnulib.
* m4/iconv.m4: New file, from gnulib.
* m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: New files, from
gnulib.
* config.rpath: New file, from gnulib.
* config.guess, config.sub: New files, from gnulib.
* Makefile.sub (M4MACROS): New variable.
(configure): Fix typo.
(aclocal.m4): New rule.
(stamp-h.in): Depend on aclocal.m4.
* configure.ac: Invoke AM_ICONV and AM_LANGINFO_CODESET.
* Makefile.in (LIBICONV): New variable.
(MDEFINES): Pass it to recursive makes.
* src/preproc/preconv/preconv.cpp: Use HAVE_LANGINFO_CODESET and
HAVE_ICONV instead of I18N macro.
* src/preproc/preconv/Makefile.sub (EXTRA_LDFLAGS): New variable.

* aclocal.m4, configure, src/include/config.hin: (Re)generated.


* doc/Makefile.in (webpage.html): Simplify.
* doc/Makefile.sub (webpage.html): Synchronize with doc/Makefile.in.
* doc/webpage.ms, tmac/groff_www.man, tmac/www.tmac: Minor updates.

1 files changed, 22 insertions, 21 deletions

diff --git a/tmac/groff_www.man b/tmac/groff_www.man
index efc07e3e..3f6f2e96 100644
--- a/tmac/groff_www.man
+++ b/tmac/groff_www.man
@@ -1,5 +1,5 @@
 .TH GROFF_WWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.\" Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+.\" Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
 .\" Free Software Foundation, Inc.
 .\"      Written by Gaius Mulley (gaius@glam.ac.uk)
 .\"
@@ -52,7 +52,7 @@ The manual page is very a basic guide, and the html device driver
 has been completely rewritten but still remains as in an alpha state.
 It has been included into the distribution so that a lot of people have a
 chance to test it.
-Note that this macro file will be automatically called (via the
+Note that this macro file is automatically called (via the
 .B troffrc
 file) if you use
 .BR \-Thtml .
@@ -99,9 +99,9 @@ Here is a summary of the functions found in this macro set.
 \&.CDE	code example end
 \&.ALN	place links on left of
 	main text.
-\&.LNS	start a new two column
+\&.LNS	start a new two-column
 	table with links in the left.
-\&.LNE	end the two column table.
+\&.LNE	end the two-column table.
 .fi
 .PP
 Output of the
@@ -142,7 +142,7 @@ Whereas
 .fi
 .RE
 .IP
-will tell
+tells
 .B \%grohtml
 that no heading links should be created at all.
 Another method for turning automatic headings off is by issuing the
@@ -487,30 +487,31 @@ End code display
 .
 .TP
 .B ".ALN [color] [percentage]"
-Place section heading links automatically to the left of the main
-text. The color argument is optional and if present indicates which
-HTML background color is to be used under the links.
+Place section heading links automatically to the left of the main text.
+The color argument is optional and if present indicates which HTML
+background color is to be used under the links.
 The optional percentage indicates the amount of width to devote to
-displaying the links. The default values are #eeeeee and 30
-for color and percentage width respectively.
+displaying the links.
+The default values are #eeeeee and 30 for color and percentage width,
+respectively.
 This macro should only be called once at the beginning of the document.
-Once this macro has been called each section heading will emit an
-HTML table consisting of the links in the left and the section text
-on the right.
+After calling this macro each section heading emits an HTML table consisting
+of the links in the left and the section text on the right.
 .
 .TP
 .B ".LNS"
-Start a new two column table with links in the left column.
-This can be called if the document has text before the first .SH
-and if .ALN is used. Typically this is called just before the
-first paragraph and after the main title as it indicates that
-text after this point should be positioned to the right of
-the left hand navigational links.
+Start a new two-column table with links in the left column.
+This can be called if the document has text before the first .SH and if .ALN
+is used.
+Typically this is called just before the first paragraph and after the main
+title as it indicates that text after this point should be positioned to the
+right of the left-hand navigational links.
 .
 .TP
 .B ".LNE"
-End a two column table. This should be called at the end of the
-document if .ALN was used.
+End a two-column table.
+This should be called at the end of the document if .ALN was used.
+.
 .
 .SH SECTION HEADING LINKS
 By default