diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 99a19852..64665f17 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -1911,134 +1911,131 @@ You can browse it interactively with \[lq]info groff\[rq].
 .
 .
 .P
-Due to its complex structure, the
 .I groff
-system has many man pages.
+has many man pages besides this one.
 .
-They can be read with
-.BR man (1)
-or
-.BR \%groffer (@MAN1EXT@).
-.
-.P
-But there are special sections of
-.IR "man pages" .
-.
-.I groff
-has man pages in sections
-.BR 1 , " 5" , and " 7" .
-.
-When there are several
-.I man pages
-with the same name in the same
-.I man
-section, the one with the lowest section is should as first.
-.
-The other man pages can be shown anyway by adding the section number
-as argument before the man page name.
-.
-Reading the man page about the
-.I groff
-language is done by one of
-.RS
-.nf
-.nh
-.EX
-.B man 7 groff
-.B groffer 7 groff
-.EE
-.hy
-.fi
-.RE
 .
 .ad l
 .TP
-Introduction, history and further readings:
-.BR roff (@MAN7EXT@).
+Introduction, history, and further reading:
+.BR roff (@MAN7EXT@),
+.BR ditroff (@MAN7EXT@)
+.
 .
 .TP
-Viewer for groff files:
+Viewers for groff documents:
 .BR \%groffer (@MAN1EXT@),
-.BR \%gxditview (@MAN1EXT@),
-.BR \%xditview (1x).
+.BR gxditview (@MAN1EXT@)
 .
-.TP
-Wrapper programs for formatters:
-.BR \%groff (@MAN1EXT@),
-.BR \%grog (@MAN1EXT@).
 .
 .TP
-Roff preprocessors:
-.BR address@hidden@eqn (@MAN1EXT@),
-.BR address@hidden@grn (@MAN1EXT@),
-.BR address@hidden@pic (@MAN1EXT@),
-.BR address@hidden@chem (@MAN1EXT@),
+Preprocessors:
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR glilypond (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
 .BR \%preconv (@MAN1EXT@),
+.BR gperl (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR gpinyin (@MAN1EXT@),
 .BR address@hidden@refer (@MAN1EXT@),
 .BR address@hidden@soelim (@MAN1EXT@),
-.BR address@hidden@tbl (@MAN1EXT@),
-.BR grap (1).
+.BR address@hidden@tbl (@MAN1EXT@)
+.
 .
 .TP
-Roff language with the groff extensions:
-.BR \%groff (@MAN7EXT@),
-.BR \%groff_char (@MAN7EXT@),
-.BR \%groff_diff (@MAN7EXT@),
-.BR \%groff_font (@MAN5EXT@).
+Macro packages and macro-specific utilities:
+.BR \%groff_hdtbl (@MAN7EXT@),
+.BR \%groff_man (@MAN7EXT@),
+.BR \%groff_mdoc (@MAN7EXT@),
+.BR \%groff_me (@MAN7EXT@),
+.BR \%groff_mm (@MAN7EXT@),
+.BR \%groff_mmse (@MAN7EXT@),
+.BR \%mmroff (@MAN1EXT@)
+.BR \%groff_mmse (@MAN7EXT@),
+.BR \%groff_mom (@MAN7EXT@),
+.BR \%pdfmom (@MAN1EXT@),
+.BR \%groff_ms (@MAN7EXT@),
+.BR \%groff_www (@MAN7EXT@),
+.BR \%groff_trace (@MAN7EXT@)
+.
+.
+.TP
+Bibliographic and index tools:
+.BR address@hidden@indxbib (@MAN1EXT@),
+.BR \%lkbib (@MAN1EXT@),
+.BR address@hidden@lookbib (@MAN1EXT@)
+.
 .
 .TP
-Roff formatter programs:
+Language, conventions, and GNU extensions:
+.BR groff (@MAN7EXT@),
+.BR groff_char (@MAN7EXT@),
+.BR groff_diff (@MAN7EXT@),
+.BR groff_filenames (@MAN5EXT@),
+.BR groff_font (@MAN5EXT@),
+.BR groff_tmac (@MAN5EXT@)
+.
+.
+.TP
+Formatter programs:
 .BR address@hidden@nroff (@MAN1EXT@),
-.BR address@hidden@troff (@MAN1EXT@),
-.BR ditroff (@MAN7EXT@).
+.BR @address@hidden (@MAN1EXT@)
+.
 .
 .TP
-The intermediate output language:
-.BR \%groff_out (@MAN7EXT@).
+Intermediate output language:
+.BR groff_out (@MAN7EXT@)
+.
 .
 .TP
-Postprocessors for the output devices:
+Postprocessors for output devices:
 .BR \%grodvi (@MAN1EXT@),
 .BR \%grohtml (@MAN1EXT@),
-.BR \%grolbp (@MAN1EXT@),
-.BR \%grolj4 (@MAN1EXT@),
-.BR \%lj4_font (@MAN5EXT@),
-.BR \%grops (@MAN1EXT@),
-.BR \%gropdf (@MAN1EXT@),
-.BR \%grotty (@MAN1EXT@).
+.BR grolbp (@MAN1EXT@),
+.BR grolj4 (@MAN1EXT@),
+.BR lj4_font (@MAN5EXT@),
+.BR gropdf (@MAN1EXT@),
+.BR grops (@MAN1EXT@),
+.BR \%grotty (@MAN1EXT@)
 .
-.TP
-Groff macro packages and macro-specific utilities:
-.BR \%groff_tmac (@MAN5EXT@),
-.BR \%groff_man (@MAN7EXT@),
-.BR \%groff_mdoc (@MAN7EXT@),
-.BR \%groff_me (@MAN7EXT@),
-.BR \%groff_mm (@MAN7EXT@),
-.BR \%groff_mmse (@MAN7EXT@),
-.BR \%groff_mom (@MAN7EXT@),
-.BR \%groff_ms (@MAN7EXT@),
-.BR \%groff_www (@MAN7EXT@),
-.BR \%groff_trace (@MAN7EXT@),
-.BR \%mmroff (@MAN7EXT@).
 .
 .TP
-The following utilities are available:
+Font support utilities:
 .BR \%addftinfo (@MAN1EXT@),
 .BR \%afmtodit (@MAN1EXT@),
-.BR \%eqn2graph (@MAN1EXT@),
-.BR \%gdiffmk (@MAN1EXT@),
-.BR \%grap2graph (@MAN1EXT@),
-.BR \%groffer (@MAN1EXT@),
-.BR \%gxditview (@MAN1EXT@),
 .BR \%hpftodit (@MAN1EXT@),
-.BR address@hidden@indxbib (@MAN1EXT@),
-.BR \%lkbib (@MAN1EXT@),
-.BR address@hidden@lookbib (@MAN1EXT@),
-.BR \%pdfroff (@MAN1EXT@),
 .BR \%pfbtops (@MAN1EXT@),
-.BR \%pic2graph (@MAN1EXT@),
 .BR \%tfmtodit (@MAN1EXT@),
-.BR \%xtotroff (@MAN1EXT@).
+.BR xtotroff (@MAN1EXT@)
+.
+.
+.TP
+Graphics conversion utilities:
+.BR eqn2graph (@MAN1EXT@),
+.BR grap2graph (@MAN1EXT@),
+.BR pic2graph (@MAN1EXT@)
+.
+.
+.TP
+Output document format conversion utilities:
+.BR roff2dvi (@MAN1EXT@),
+.BR roff2html (@MAN1EXT@),
+.BR roff2pdf (@MAN1EXT@),
+.BR roff2ps (@MAN1EXT@),
+.BR roff2text (@MAN1EXT@),
+.BR roff2x (@MAN1EXT@)
+.
+.
+.TP
+Difference-marking utility:
+.BR \%gdiffmk (@MAN1EXT@)
+.
+.
+.TP
+\[lq]groff guess\[rq] utility:
+.BR grog (@MAN1EXT@)
 .
 .
 .\" Restore compatibility mode (for, e.g., Solaris 10/11).