Correct man page section number references (e.g. don't use the

old 1M, 3X and 3S section numbers) and make some minor formatting
changes to silence manck.

40 files changed, 421 insertions, 433 deletions

diff --git a/lib/libncurses/curs_addch.3 b/lib/libncurses/curs_addch.3
index 0fc3cfa..22e5755 100644
--- a/lib/libncurses/curs_addch.3
+++ b/lib/libncurses/curs_addch.3
@@ -1,8 +1,8 @@
-.TH curs_addch 3X ""
+.TH curs_addch 3 ""
 .SH NAME
-\fBcurs_addch\fR: \fBaddch\fR, \fBwaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR,
-\fBechochar\fR, \fBwechochar\fR - add a character (with attributes) to a
-\fBncurses\fR window, then advance the cursor
+\fBaddch\fR, \fBwaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR,
+\fBechochar\fR, 
+\fBwechochar\fR - add a character (with attributes) to a \fBncurses\fR window, then advance the cursor
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -40,7 +40,7 @@ Video attributes can be combined with a character by OR-ing them into the
 parameter.  This results in these attributes also being set.  (The intent here
 is that text, including attributes, can be copied from one place to another
 using \fBinch\fR and \fBaddch\fR.)  [see \fBstandout\fR, predefined video
-attribute constants, on the curs_attr(3X) page].
+attribute constants, on the curs_attr(3) page].
 
 The \fBechochar\fR and \fBwechochar\fR routines are functionally equivalent to
 a call to \fBaddch\fR followed by a call to \fBrefresh\fR, or a call to
@@ -102,9 +102,9 @@ however, will not typically produce the corresponding graphic;
 characters such as CR, NL, FF and TAB are typically interpreted by the console
 driver itself, and ESC will be interpreted as the leader of a control sequence.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_attr\fR(3X), \fBcurs_clear\fR(3X),
-\fBcurs_inch\fR(3X), \fBcurs_outopts\fR(3X), \fBcurs_refresh\fR(3X),
-\fBputc\fR(3S).
+\fBncurses\fR(3), \fBcurs_attr\fR(3), \fBcurs_clear\fR(3),
+\fBcurs_inch\fR(3), \fBcurs_outopts\fR(3), \fBcurs_refresh\fR(3),
+\fBputc\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_addchst.3 b/lib/libncurses/curs_addchst.3
index 50ed1a3..2991dcd 100644
--- a/lib/libncurses/curs_addchst.3
+++ b/lib/libncurses/curs_addchst.3
@@ -1,9 +1,8 @@
-.TH curs_addchstr 3X ""
+.TH curs_addchstr 3 ""
 .SH NAME
-\fBcurs_addchstr\fR: \fBaddchstr\fR, \fBaddchnstr\fR, \fBwaddchstr\fR,
+\fBaddchstr\fR, \fBaddchnstr\fR, \fBwaddchstr\fR,
 \fBwaddchnstr\fR, \fBmvaddchstr\fR, \fBmvaddchnstr\fR, \fBmvwaddchstr\fR,
-\fBmvwaddchnstr\fR - add string of characters (and attributes) to a
-\fBncurses\fR window
+\fBmvwaddchnstr\fR - add string of characters (and attributes) to a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -41,7 +40,7 @@ otherwise noted in the preceding routine descriptions.
 .SH NOTES
 Note that all routines except \fBwaddchnstr\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X).
+\fBncurses\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_addstr.3 b/lib/libncurses/curs_addstr.3
index ba60b12..c55c2f5 100644
--- a/lib/libncurses/curs_addstr.3
+++ b/lib/libncurses/curs_addstr.3
@@ -1,8 +1,8 @@
-.TH curs_addstr 3X ""
+.TH curs_addstr 3 ""
 .SH NAME
-\fBcurs_addstr\fR: \fBaddstr\fR, \fBaddnstr\fR, \fBwaddstr\fR, \fBwaddnstr\fR,
-\fBmvaddstr\fR, \fBmvaddnstr\fR, \fBmvwaddstr\fR, \fBmvwaddnstr\fR - add a
-string of characters to a \fBncurses\fR window and advance cursor
+\fBaddstr\fR, \fBaddnstr\fR, \fBwaddstr\fR, \fBwaddnstr\fR,
+\fBmvaddstr\fR, \fBmvaddnstr\fR, \fBmvwaddstr\fR, 
+\fBmvwaddnstr\fR - add a string of characters to a \fBncurses\fR window and advance cursor
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -35,7 +35,7 @@ other than \fBERR\fR upon successful completion.
 Note that all of these routines except \fBwaddstr\fR and \fBwaddnstr\fR may be
 macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_addch\fR(3X).
+\fBncurses\fR(3), \fBcurs_addch\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_attr.3 b/lib/libncurses/curs_attr.3
index eaadc28..a7a2b45 100644
--- a/lib/libncurses/curs_attr.3
+++ b/lib/libncurses/curs_attr.3
@@ -1,6 +1,6 @@
-.TH curs_attr 3X ""
+.TH curs_attr 3 ""
 .SH NAME
-\fBcurs_attr\fR: \fBattroff\fR, \fBwattroff\fR, \fBattron\fR, \fBwattron\fR,
+\fBattroff\fR, \fBwattroff\fR, \fBattron\fR, \fBwattron\fR,
 \fBattrset\fR, \fBwattrset\fR, \fBstandend\fR, \fBwstandend\fR, \fBstandout\fR,
 \fBwstandout\fR - \fBncurses\fR character and window attribute control routines
 .SH SYNOPSIS
@@ -74,8 +74,8 @@ manual page claims (falsely) that these routines always return \fB1\fR.
 Note that \fBattroff\fR, \fBwattroff\fR, \fBattron\fR, \fBwattron\fR,
 \fBattrset\fR, \fBwattrset\fR, \fBstandend\fR and \fBstandout\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_addch\fR(3X), \fBcurs_addstr\fR(3X),
-\fBcurs_printw\fR(3X)
+\fBncurses\fR(3), \fBcurs_addch\fR(3), \fBcurs_addstr\fR(3),
+\fBcurs_printw\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_beep.3 b/lib/libncurses/curs_beep.3
index 5909c51..b80fd52 100644
--- a/lib/libncurses/curs_beep.3
+++ b/lib/libncurses/curs_beep.3
@@ -1,6 +1,6 @@
-.TH curs_beep 3X ""
+.TH curs_beep 3 ""
 .SH NAME
-\fBcurs_beep\fR:  \fBbeep\fR, \fBflash\fR - \fBncurses\fR bell and screen flash routines
+\fBbeep\fR, \fBflash\fR - \fBncurses\fR bell and screen flash routines
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -20,7 +20,7 @@ These routines always return \fBOK\fR.
 .SH CAPABILITIES
 \fBbell\fR, \fBflash_screen\fR.
 .SH SEE ALSO
-\fBncurses\fR(3X)
+\fBncurses\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_bkgd.3 b/lib/libncurses/curs_bkgd.3
index 84dde05..7e360705 100644
--- a/lib/libncurses/curs_bkgd.3
+++ b/lib/libncurses/curs_bkgd.3
@@ -1,6 +1,6 @@
-.TH curs_bkgd 3X ""
+.TH curs_bkgd 3 ""
 .SH NAME
-\fBcurs_bkgd\fR: \fBbkgdset\fR, \fBwbkgdset\fR, \fBbkgd\fR,
+\fBbkgdset\fR, \fBwbkgdset\fR, \fBbkgd\fR,
 \fBwbkgd\fR - \fBncurses\fR window background manipulation routines
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
@@ -41,7 +41,7 @@ Note that \fBbkgdset\fR and \fBbkgd\fR may be macros.
 .SH BUGS
 \fBimmedok\fR is not yet implemented in ncurses 1.8.6.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_addch\fR(3X), \fBcurs_outopts\fR(3X)
+\fBncurses\fR(3), \fBcurs_addch\fR(3), \fBcurs_outopts\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_border.3 b/lib/libncurses/curs_border.3
index 619ba4c..874e9ea 100644
--- a/lib/libncurses/curs_border.3
+++ b/lib/libncurses/curs_border.3
@@ -1,8 +1,8 @@
-.TH curs_border 3X ""
+.TH curs_border 3 ""
 .SH NAME
-\fBcurs_border\fR: \fBborder\fR, \fBwborder\fR, \fBbox\fR,
-\fBhline\fR, \fBwhline\fR, \fBvline\fR, \fBwvline\fR - create
-\fBncurses\fR borders, horizontal and vertical lines
+\fBborder\fR, \fBwborder\fR, \fBbox\fR,
+\fBhline\fR, \fBwhline\fR, \fBvline\fR, 
+\fBwvline\fR - create \fBncurses\fR borders, horizontal and vertical lines
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 .br
@@ -58,7 +58,7 @@ Note that \fBborder\fR and \fBbox\fR may be macros.
 .SH BUGS
 The \fBimmedok\fR function is not yet implemented in ncurses 1.8.6.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_outopts\fR(3X).
+\fBncurses\fR(3), \fBcurs_outopts\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_clear.3 b/lib/libncurses/curs_clear.3
index 9aeac8d..60c637b 100644
--- a/lib/libncurses/curs_clear.3
+++ b/lib/libncurses/curs_clear.3
@@ -1,6 +1,6 @@
-.TH curs_clear 3X ""
+.TH curs_clear 3 ""
 .SH NAME
-\fBcurs_clear\fR: \fBerase\fR, \fBwerase\fR, \fBclear\fR,
+\fBerase\fR, \fBwerase\fR, \fBclear\fR,
 \fBwclear\fR, \fBclrtobot\fR, \fBwclrtobot\fR, \fBclrtoeol\fR,
 \fBwclrtoeol\fR - clear all or part of a \fBncurses\fR window
 .SH SYNOPSIS
@@ -44,7 +44,7 @@ All routines return the integer \fBOK\fR, or a non-negative integer if
 Note that \fBerase\fR, \fBwerase\fR, \fBclear\fR, \fBwclear\fR,
 \fBclrtobot\fR, and \fBclrtoeol\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_outopts\fR(3X), \fBcurs_refresh\fR(3X)
+\fBncurses\fR(3), \fBcurs_outopts\fR(3), \fBcurs_refresh\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_color.3 b/lib/libncurses/curs_color.3
index c1bb804..cd32cf3 100644
--- a/lib/libncurses/curs_color.3
+++ b/lib/libncurses/curs_color.3
@@ -1,9 +1,9 @@
-.TH curs_color 3X ""
+.TH curs_color 3 ""
 .SH NAME
-\fBcurs_color\fR: \fBstart_color\fR, \fBinit_pair\fR,
+\fBstart_color\fR, \fBinit_pair\fR,
 \fBinit_color\fR, \fBhas_colors\fR, \fBcan_change_color\fR,
-\fBcolor_content\fR, \fBpair_content\fR - \fBncurses\fR color
-manipulation routines
+\fBcolor_content\fR, 
+\fBpair_content\fR - \fBncurses\fR color manipulation routines
 .SH SYNOPSIS
 \fB# include <ncurses.h>\fR
 .br
@@ -130,7 +130,7 @@ Color RGB values are not settable.
 \fBsetf\fR, \fBsetb\fR, \fBsetaf\fR, \fBsetab\fR.  The ncurses library uses
 the second pair by preference, falling back to the first.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_attr\fR(3X)
+\fBncurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_attr\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_delch.3 b/lib/libncurses/curs_delch.3
index 0251445..441eaac 100644
--- a/lib/libncurses/curs_delch.3
+++ b/lib/libncurses/curs_delch.3
@@ -1,7 +1,7 @@
-.TH curs_delch 3X ""
+.TH curs_delch 3 ""
 .SH NAME
-\fBcurs_delch\fR:  \fBdelch\fR, \fBwdelch\fR, \fBmvdelch\fR, \fBmvwdelch\fR -
-delete character under the cursor in a \fBncurses\fR window
+\fBdelch\fR, \fBwdelch\fR, \fBmvdelch\fR, 
+\fBmvwdelch\fR - delete character under the cursor in a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -25,7 +25,7 @@ other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that \fBdelch\fR, \fBmvdelch\fR, and \fBmvwdelch\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X)
+\fBncurses\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_delln.3 b/lib/libncurses/curs_delln.3
index 9960554..6ae1025 100644
--- a/lib/libncurses/curs_delln.3
+++ b/lib/libncurses/curs_delln.3
@@ -1,8 +1,8 @@
-.TH curs_deleteln 3X ""
+.TH curs_deleteln 3 ""
 .SH NAME
-\fBcurs_deleteln\fR: \fBdeleteln\fR, \fBwdeleteln\fR, \fBinsdelln\fR,
-\fBwinsdelln\fR, \fBinsertln\fR, \fBwinsertln\fR - delete and insert
-lines in a \fBncurses\fR window
+\fBdeleteln\fR, \fBwdeleteln\fR, \fBinsdelln\fR,
+\fBwinsdelln\fR, \fBinsertln\fR, 
+\fBwinsertln\fR - delete and insert lines in a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -41,7 +41,7 @@ These routines do not require a hardware line delete or insert feature in the
 terminal.  In fact, they won't use hardware line delete/insert unless
 \fBidlok(..., TRUE)\fR has been set on the current window.
 .SH SEE ALSO
-\fBncurses\fR(3X)
+\fBncurses\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_getch.3 b/lib/libncurses/curs_getch.3
index 1b16502..8a5c9ae 100644
--- a/lib/libncurses/curs_getch.3
+++ b/lib/libncurses/curs_getch.3
@@ -1,8 +1,8 @@
-.TH curs_getch 3X ""
+.TH curs_getch 3 ""
 .SH NAME
-\fBcurs_getch\fR: \fBgetch\fR, \fBwgetch\fR, \fBmvgetch\fR,
-\fBmvwgetch\fR, \fBungetch\fR - get (or push back) characters from
-\fBncurses\fR terminal keyboard
+\fBgetch\fR, \fBwgetch\fR, \fBmvgetch\fR,
+\fBmvwgetch\fR, 
+\fBungetch\fR - get (or push back) characters from \fBncurses\fR terminal keyboard
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -178,8 +178,8 @@ is usually mapped to \fBKEY_IC\fR.
 .SH CAPABILITIES
 All of the key_* capabilities; also \fBkeypad_local\fR and \fBkeypad_xmit\fR.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_inopts\fR(3X), \fBcurs_move\fR(3X),
-\fBcurs_refresh\fR(3X).
+\fBncurses\fR(3), \fBcurs_inopts\fR(3), \fBcurs_move\fR(3),
+\fBcurs_refresh\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_getstr.3 b/lib/libncurses/curs_getstr.3
index 1151ae0..91d934b 100644
--- a/lib/libncurses/curs_getstr.3
+++ b/lib/libncurses/curs_getstr.3
@@ -1,8 +1,8 @@
-.TH curs_getstr 3X ""
+.TH curs_getstr 3 ""
 .SH NAME
-\fBcurs_getstr\fR: \fBgetstr\fR, \fBwgetstr\fR, \fBmvgetstr\fR,
-\fBmvwgetstr\fR, \fBwgetnstr\fR - accept character strings from
-\fBncurses\fR terminal keyboard
+\fBgetstr\fR, \fBwgetstr\fR, \fBmvgetstr\fR,
+\fBmvwgetstr\fR, 
+\fBwgetnstr\fR - accept character strings from \fBncurses\fR terminal keyboard
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -44,7 +44,7 @@ giving details.  It lies.  The actual behavior is like that of ncurses.
 .SH NOTES
 Note that \fBgetstr\fR, \fBmvgetstr\fR, and \fBmvwgetstr\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_getch\fR(3X).
+\fBncurses\fR(3), \fBcurs_getch\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_getyx.3 b/lib/libncurses/curs_getyx.3
index 42fb006..8d46126 100644
--- a/lib/libncurses/curs_getyx.3
+++ b/lib/libncurses/curs_getyx.3
@@ -1,6 +1,6 @@
-.TH curs_getyx 3X ""
+.TH curs_getyx 3 ""
 .SH NAME
-\fBcurs_getyx\fR: \fBgetyx\fR, \fBgetparyx\fR, \fBgetbegyx\fR,
+\fBgetyx\fR, \fBgetparyx\fR, \fBgetbegyx\fR,
 \fBgetmaxyx\fR - get \fBncurses\fR cursor and window coordinates
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
@@ -32,7 +32,7 @@ statements).
 All of these interfaces are macros and that "\fB&\fR" is not
 necessary before the variables \fIy\fR and \fIx\fR.
 .SH SEE ALSO
-\fBncurses\fR(3X)
+\fBncurses\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_inch.3 b/lib/libncurses/curs_inch.3
index 2026739..7e9e218 100644
--- a/lib/libncurses/curs_inch.3
+++ b/lib/libncurses/curs_inch.3
@@ -1,7 +1,7 @@
-.TH curs_inch 3X ""
+.TH curs_inch 3 ""
 .SH NAME
-\fBcurs_inch\fR: \fBinch\fR, \fBwinch\fR, \fBmvinch\fR, \fBmvwinch\fR
-- get a character and attributes from a \fBncurses\fR window
+\fBinch\fR, \fBwinch\fR, \fBmvinch\fR, 
+\fBmvwinch\fR - get a character and attributes from a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -31,7 +31,7 @@ The following bit-masks may be AND-ed with characters returned by \fBwinch\fR.
 .SH NOTES
 Note that all of these routines may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X).
+\fBncurses\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_inchstr.3 b/lib/libncurses/curs_inchstr.3
index 0ee8c1f..83e7ee7 100644
--- a/lib/libncurses/curs_inchstr.3
+++ b/lib/libncurses/curs_inchstr.3
@@ -1,9 +1,8 @@
-.TH curs_inchstr 3X ""
+.TH curs_inchstr 3 ""
 .SH NAME
-\fBcurs_inchstr\fR: \fBinchstr\fR, \fBinchnstr\fR, \fBwinchstr\fR,
+\fBinchstr\fR, \fBinchnstr\fR, \fBwinchstr\fR,
 \fBwinchnstr\fR, \fBmvinchstr\fR, \fBmvinchnstr\fR, \fBmvwinchstr\fR,
-\fBmvwinchnstr\fR - get a string of characters (and attributes) from a
-\fBncurses\fR window
+\fBmvwinchnstr\fR - get a string of characters (and attributes) from a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -30,14 +29,14 @@ right margin of the window.  The four functions with \fIn\fR as
 the last argument, return a leading substring at most \fIn\fR characters long.
 Constants defined in \fB<ncurses.h>\fR can be used with the \fB&\fR (logical
 AND) operator to extract the character or the attribute alone from any position
-in the \fIchstr\fR [see curs_inch(3X)].
+in the \fIchstr\fR [see curs_inch(3)].
 .SH RETURN VALUE
 All routines return the integer \fBERR\fR upon failure and an integer value
 other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that all routines except \fBwinchnstr\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_inch\fR(3X).
+\fBncurses\fR(3), \fBcurs_inch\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_initscr.3 b/lib/libncurses/curs_initscr.3
index 9badf74..20ee121 100644
--- a/lib/libncurses/curs_initscr.3
+++ b/lib/libncurses/curs_initscr.3
@@ -1,8 +1,8 @@
-.TH curs_initscr 3X ""
+.TH curs_initscr 3 ""
 .SH NAME
-\fBcurs_initscr\fR: \fBinitscr\fR, \fBnewterm\fR, \fBendwin\fR,
-\fBisendwin\fR, \fBset_term\fR, \fBdelscreen\fR - \fBncurses\fR screen
-initialization and manipulation routines
+\fBinitscr\fR, \fBnewterm\fR, \fBendwin\fR,
+\fBisendwin\fR, \fBset_term\fR, 
+\fBdelscreen\fR - \fBncurses\fR screen initialization and manipulation routines
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -74,8 +74,8 @@ Routines that return pointers always return \fBNULL\fR on error.
 .SH NOTES
 Note that \fBinitscr\fR and \fBnewterm\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_kernel\fR(3X), \fBcurs_refresh\fR(3X),
-\fBcurs_slk\fR(3X), \fBcurs_util\fR(3X)
+\fBncurses\fR(3), \fBcurs_kernel\fR(3), \fBcurs_refresh\fR(3),
+\fBcurs_slk\fR(3), \fBcurs_util\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_inopts.3 b/lib/libncurses/curs_inopts.3
index d50830d..cfa4085 100644
--- a/lib/libncurses/curs_inopts.3
+++ b/lib/libncurses/curs_inopts.3
@@ -1,6 +1,6 @@
-.TH curs_inopts 3X ""
+.TH curs_inopts 3 ""
 .SH NAME
-\fBcurs_inopts\fR: \fBcbreak\fR, \fBnocbreak\fR, \fBecho\fR,
+\fBcbreak\fR, \fBnocbreak\fR, \fBecho\fR,
 \fBnoecho\fR, \fBhalfdelay\fR, \fBintrflush\fR, \fBkeypad\fR,
 \fBmeta\fR, \fBnodelay\fR, \fBnotimeout\fR, \fBraw\fR, \fBnoraw\fR,
 \fBnoqiflush\fR, \fBqiflush\fR, \fBtimeout\fR, \fBwtimeout\fR,
@@ -53,7 +53,7 @@ mode.
 Initially the terminal may or may not be in \fBcbreak\fR mode, as the mode is
 inherited; therefore, a program should call \fBcbreak\fR or \fBnocbreak\fR
 explicitly.  Most interactive programs using \fBncurses\fR set the \fBcbreak\fR
-mode.  Note that \fBcbreak\fR overrides \fBraw\fR.  [See curs_getch(3X) for a
+mode.  Note that \fBcbreak\fR overrides \fBraw\fR.  [See curs_getch(3) for a
 discussion of how these routines interact with \fBecho\fR and \fBnoecho\fR.]
 
 The \fBecho\fR and \fBnoecho\fR routines control whether characters typed by
@@ -61,7 +61,7 @@ the user are echoed by \fBgetch\fR as they are typed.  Echoing by the tty
 driver is always disabled, but initially \fBgetch\fR is in echo mode, so
 characters typed are echoed.  Authors of most interactive programs prefer to do
 their own echoing in a controlled area of the screen, or not to echo at all, so
-they disable echoing by calling \fBnoecho\fR.  [See curs_getch(3X) for a
+they disable echoing by calling \fBnoecho\fR.  [See curs_getch(3) for a
 discussion of how these routines interact with \fBcbreak\fR and
 \fBnocbreak\fR.]
 
@@ -161,7 +161,7 @@ The entry points \fBintrflush\fR, \fBqiflush\fR, \fBnoqiflush\fR, and
 \fBtypeahead\fR are not yet implemented in ncurses 1.8.6.  The ncurses
 code does not do typeahead checking during input as SVr4 curses does.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_getch\fR(3X), \fBcurs_initscr\fR(3X), \fBtermio\fR(7)
+\fBncurses\fR(3), \fBcurs_getch\fR(3), \fBcurs_initscr\fR(3), \fBtermio\fR(7)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_insch.3 b/lib/libncurses/curs_insch.3
index a332230..a4ab456 100644
--- a/lib/libncurses/curs_insch.3
+++ b/lib/libncurses/curs_insch.3
@@ -1,7 +1,7 @@
-.TH curs_insch 3X ""
+.TH curs_insch 3 ""
 .SH NAME
-\fBcurs_insch\fR: \fBinsch\fR, \fBwinsch\fR, \fBmvinsch\fR, \fBmvwinsch\fR -
-insert a character before cursor in a \fBncurses\fR window
+\fBinsch\fR, \fBwinsch\fR, \fBmvinsch\fR, 
+\fBmvwinsch\fR - insert a character before cursor in a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -27,7 +27,7 @@ feature.
 
 Note that \fBinsch\fR, \fBmvinsch\fR, and \fBmvwinsch\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X).
+\fBncurses\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_insstr.3 b/lib/libncurses/curs_insstr.3
index 7a56ac0..7e9bb6f 100644
--- a/lib/libncurses/curs_insstr.3
+++ b/lib/libncurses/curs_insstr.3
@@ -1,8 +1,8 @@
-.TH curs_insstr 3X ""
+.TH curs_insstr 3 ""
 .SH NAME
-\fBcurs_instr\fR: \fBinsstr\fR, \fBinsnstr\fR, \fBwinsstr\fR, \fBwinsnstr\fR,
-\fBmvinsstr\fR, \fBmvinsnstr\fR, \fBmvwinsstr\fR, \fBmvwinsnstr\fR - insert
-string before cursor a \fBncurses\fR window
+\fBinsstr\fR, \fBinsnstr\fR, \fBwinsstr\fR, \fBwinsnstr\fR,
+\fBmvinsstr\fR, \fBmvinsnstr\fR, \fBmvwinsstr\fR, 
+\fBmvwinsnstr\fR - insert string before cursor a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 .br
@@ -48,7 +48,7 @@ implemented as of ncurses 1.8.6.
 .SH NOTES
 Note that all but \fBwinsnstr\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_clear\fR(3X), \fBcurs_inch\fR(3X).
+\fBncurses\fR(3), \fBcurs_clear\fR(3), \fBcurs_inch\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_instr.3 b/lib/libncurses/curs_instr.3
index f109afe..0aa539b 100644
--- a/lib/libncurses/curs_instr.3
+++ b/lib/libncurses/curs_instr.3
@@ -1,8 +1,8 @@
-.TH curs_instr 3X ""
+.TH curs_instr 3 ""
 .SH NAME
-\fBcurs_instr\fR: \fBinstr\fR, \fBinnstr\fR, \fBwinstr\fR, \fBwinnstr\fR,
-\fBmvinstr\fR, \fBmvinnstr\fR, \fBmvwinstr\fR, \fBmvwinnstr\fR - get a string
-of characters from a \fBncurses\fR window
+\fBinstr\fR, \fBinnstr\fR, \fBwinstr\fR, \fBwinnstr\fR,
+\fBmvinstr\fR, \fBmvinnstr\fR, \fBmvwinstr\fR, 
+\fBmvwinnstr\fR - get a string of characters from a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -34,7 +34,7 @@ other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that all routines except \fBwinnstr\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X).
+\fBncurses\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_kernel.3 b/lib/libncurses/curs_kernel.3
index 8a776fb..1eff4e1 100644
--- a/lib/libncurses/curs_kernel.3
+++ b/lib/libncurses/curs_kernel.3
@@ -1,6 +1,6 @@
-.TH curs_kernel 3X ""
+.TH curs_kernel 3 ""
 .SH NAME
-\fBcurs_kernel\fR: \fBdef_prog_mode\fR, \fBdef_shell_mode\fR,
+\fBdef_prog_mode\fR, \fBdef_shell_mode\fR,
 \fBreset_prog_mode\fR, \fBreset_shell_mode\fR, \fBresetty\fR,
 \fBsavetty\fR, \fBgetsyx\fR, \fBsetsyx\fR, \fBripoffline\fR,
 \fBcurs_set\fR, \fBnapms\fR - low-level \fBncurses\fR routines
@@ -69,7 +69,7 @@ at the beginning, do its manipulation of its own windows, do a
 \fBdoupdate\fR.
 
 The \fBripoffline\fR routine provides access to the same facility that
-\fBslk_init\fR [see curs_slk(3X)] uses to reduce the size of the
+\fBslk_init\fR [see curs_slk(3)] uses to reduce the size of the
 screen.  \fBripoffline\fR must be called before \fBinitscr\fR or
 \fBnewterm\fR is called.  If \fIline\fR is positive, a line is removed
 from the top of \fBstdscr\fR; if \fIline\fR is negative, a line is
@@ -105,8 +105,8 @@ The SVr4 man pages warn that the return value of \fBcurs_set\fR "is currently
 incorrect".  This implementation gets it right, but it may be unwise to count
 on the correctness of the return value anywhere else.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_outopts\fR(3X), \fBcurs_refresh\fR(3X),
-\fBcurs_scr_dump\fR(3X), \fBcurs_slk\fR(3X)
+\fBncurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_outopts\fR(3), \fBcurs_refresh\fR(3),
+\fBcurs_scr_dmp\fR(3), \fBcurs_slk\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_move.3 b/lib/libncurses/curs_move.3
index f7bdfd3..fcb36f3 100644
--- a/lib/libncurses/curs_move.3
+++ b/lib/libncurses/curs_move.3
@@ -1,6 +1,6 @@
-.TH curs_move 3X ""
+.TH curs_move 3 ""
 .SH NAME
-\fBcurs_move\fR:  \fBmove\fR, \fBwmove\fR - move \fBncurses\fR window cursor
+\fBmove\fR, \fBwmove\fR - move \fBncurses\fR window cursor
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -19,7 +19,7 @@ other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that \fBmove\fR may be a macro.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_refresh\fR(3X)
+\fBncurses\fR(3), \fBcurs_refresh\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_outopts.3 b/lib/libncurses/curs_outopts.3
index 2b46bb6..6c1f382 100644
--- a/lib/libncurses/curs_outopts.3
+++ b/lib/libncurses/curs_outopts.3
@@ -1,6 +1,6 @@
-.TH curs_outopts 3X ""
+.TH curs_outopts 3 ""
 .SH NAME
-\fBcurs_outopts\fR: \fBclearok\fR, \fBidlok\fR, \fBidcok immedok\fR,
+\fBclearok\fR, \fBidlok\fR, \fBidcok immedok\fR,
 \fBleaveok\fR, \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBscrollok\fR,
 \fBnl\fR, \fBnonl\fR - \fBncurses\fR output options
 .SH SYNOPSIS
@@ -105,8 +105,8 @@ Note that \fBclearok\fR, \fBleaveok\fR, \fBscrollok\fR, \fBidcok\fR, \fBnl\fR,
 The \fBimmedok\fR routine is useful for windows that are used as terminal
 emulators.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_addch\fR(3X), \fBcurs_clear\fR(3X),
-\fBcurs_initscr\fR(3X), \fBcurs_scroll\fR(3X), \fBcurs_refresh\fR(3X)
+\fBncurses\fR(3), \fBcurs_addch\fR(3), \fBcurs_clear\fR(3),
+\fBcurs_initscr\fR(3), \fBcurs_scroll\fR(3), \fBcurs_refresh\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_overlay.3 b/lib/libncurses/curs_overlay.3
index bc9723a3..302fa17 100644
--- a/lib/libncurses/curs_overlay.3
+++ b/lib/libncurses/curs_overlay.3
@@ -1,7 +1,7 @@
-.TH curs_overlay 3X ""
+.TH curs_overlay 3 ""
 .SH NAME
-\fBcurs_overlay\fR: \fBoverlay\fR, \fBoverwrite\fR, \fBcopywin\fR - overlay and
-manipulate overlapped \fBncurses\fR windows
+\fBoverlay\fR, \fBoverwrite\fR, 
+\fBcopywin\fR - overlay and manipulate overlapped \fBncurses\fR windows
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -32,7 +32,7 @@ value other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that \fBoverlay\fR and \fBoverwrite\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_pad\fR(3X), \fBcurs_refresh\fR(3X)
+\fBncurses\fR(3), \fBcurs_pad\fR(3), \fBcurs_refresh\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_pad.3 b/lib/libncurses/curs_pad.3
index 726630f..cba5e92 100644
--- a/lib/libncurses/curs_pad.3
+++ b/lib/libncurses/curs_pad.3
@@ -1,8 +1,7 @@
-.TH curs_pad 3X ""
+.TH curs_pad 3 ""
 .SH NAME
-\fBcurs_pad\fR: \fBnewpad\fR, \fBsubpad\fR, \fBprefresh\fR,
-\fBpnoutrefresh\fR, \fBpechochar\fR - create and display \fBncurses\fR
-pads
+\fBnewpad\fR, \fBsubpad\fR, \fBprefresh\fR,
+\fBpnoutrefresh\fR, \fBpechochar\fR - create and display \fBncurses\fR pads
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -66,7 +65,7 @@ Routines that return pointers return \fBNULL\fR on error.
 .SH NOTES
 Note that \fBpechochar\fR may be a macro.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_refresh\fR(3X), \fBcurs_touch\fR(3X), \fBcurs_addch\fR(3X).
+\fBncurses\fR(3), \fBcurs_refresh\fR(3), \fBcurs_touch\fR(3), \fBcurs_addch\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_printw.3 b/lib/libncurses/curs_printw.3
index b58dba4..d2f6688 100644
--- a/lib/libncurses/curs_printw.3
+++ b/lib/libncurses/curs_printw.3
@@ -1,8 +1,7 @@
-.TH curs_printw 3X ""
+.TH curs_printw 3 ""
 .SH NAME
-\fBcurs_printw\fR: \fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR,
-\fBmvwprintw\fR, \fBvwprintw\fR - print formatted output in
-\fBncurses\fR windows
+\fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR,
+\fBmvwprintw\fR, \fBvwprintw\fR - print formatted output in \fBncurses\fR windows
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -21,19 +20,19 @@
 .br
 .SH DESCRIPTION
 The \fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR and \fBmvwprintw\fR
-routines are analogous to \fBprintf\fR [see \fBprintf\fR(3S)].  In
+routines are analogous to \fBprintf\fR [see \fBprintf\fR(3)].  In
 effect, the string that would be output by \fBprintf\fR is output
 instead as though \fBwaddstr\fR were used on the given window.
 
 The \fBvwprintw\fR routine is analogous to \fBvprintf\fR [see
-\fBprintf\fR(3S)] and performs a \fBwprintw\fR using a variable
+\fBprintf\fR(3)] and performs a \fBwprintw\fR using a variable
 argument list.  The third argument is a \fBva_list\fR, a pointer to a
 list of arguments, as defined in \fB<varargs.h>\fR.
 .SH RETURN VALUE
 All routines return the integer \fBERR\fR upon failure and an integer value
 other than \fBERR\fR upon successful completion.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBprintf\fR(3S), \fBvprintf(3S)\fR
+\fBncurses\fR(3), \fBprintf\fR(3), \fBvprintf(3)\fR
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_refresh.3 b/lib/libncurses/curs_refresh.3
index 3445d75..3c204e2 100644
--- a/lib/libncurses/curs_refresh.3
+++ b/lib/libncurses/curs_refresh.3
@@ -1,8 +1,8 @@
-.TH curs_refresh 3X ""
+.TH curs_refresh 3 ""
 .SH NAME
-\fBcurs_refresh\fR: \fBrefresh\fR, \fBwrefresh\fR, \fBwnoutrefresh\fR,
-\fBdoupdate\fR, \fBredrawwin\fR, \fBwredrawln\fR - refresh
-\fBncurses\fR windows and lines
+\fBrefresh\fR, \fBwrefresh\fR, \fBwnoutrefresh\fR,
+\fBdoupdate\fR, \fBredrawwin\fR, 
+\fBwredrawln\fR - refresh \fBncurses\fR windows and lines
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -60,7 +60,7 @@ other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that \fBrefresh\fR and \fBredrawwin\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_outopts\fR(3X)
+\fBncurses\fR(3), \fBcurs_outopts\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_scanw.3 b/lib/libncurses/curs_scanw.3
index 15efca3..22a8b60 100644
--- a/lib/libncurses/curs_scanw.3
+++ b/lib/libncurses/curs_scanw.3
@@ -1,8 +1,7 @@
-.TH curs_scanw 3X ""
+.TH curs_scanw 3 ""
 .SH NAME
-\fBcurs_scanw\fR: \fBscanw\fR, \fBwscanw\fR, \fBmvscanw\fR,
-\fBmvwscanw\fR, \fBvwscanw\fR - convert formatted input from a
-\fBncurses\fR widow
+\fBscanw\fR, \fBwscanw\fR, \fBmvscanw\fR,
+\fBmvwscanw\fR, \fBvwscanw\fR - convert formatted input from a \fBncurses\fR widow
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -18,7 +17,7 @@
 \fBint vwscanw(WINDOW *win, char *fmt, va_list varglist);\fR
 .SH DESCRIPTION
 The \fBscanw\fR, \fBwscanw\fR and \fBmvscanw\fR routines are analogous to
-\fBscanf\fR [see \fBscanf\fR(3S)].  The effect of these routines is as though
+\fBscanf\fR [see \fBscanf\fR(3)].  The effect of these routines is as though
 \fBwgetstr\fR were called on the window, and the resulting line used as input
 for \fBsscanf\fR(3).  Fields which do not map to a variable in the \fIfmt\fR
 field are lost.
@@ -35,7 +34,7 @@ Applications may use the return value from the \fBscanw\fR, \fBwscanw\fR,
 \fBmvscanw\fR and \fBmvwscanw\fR routines to determine the number of fields
 which were mapped in the call.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_getstr\fR, \fBcurs_printw\fR, \fBscanf\fR(3S)
+\fBncurses\fR(3), \fBcurs_getstr\fR(3), \fBcurs_printw\fR(3), \fBscanf\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_scr_dmp.3 b/lib/libncurses/curs_scr_dmp.3
index d74456d..622b0f9 100644
--- a/lib/libncurses/curs_scr_dmp.3
+++ b/lib/libncurses/curs_scr_dmp.3
@@ -1,8 +1,8 @@
-.TH curs_scr_dump 3X ""
+.TH curs_scr_dump 3 ""
 .SH NAME
-\fBcurs_scr_dump\fR: \fBscr_dump\fR, \fBscr_restore\fR,
-\fBscr_init\fR, \fBscr_set\fR - read (write) a \fBncurses\fR screen
-from (to) a file
+\fBscr_dump\fR, \fBscr_restore\fR,
+\fBscr_init\fR, 
+\fBscr_set\fR - read (write) a \fBncurses\fR screen from (to) a file
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -39,17 +39,17 @@ what is currently on the screen, and also what the program wants on the screen.
 This can be thought of as a screen inheritance function.
 
 To read (write) a window from (to) a file, use the \fBgetwin\fR and
-\fBputwin\fR routines [see \fBcurs_util\fR(3X)].
+\fBputwin\fR routines [see \fBcurs_util\fR(3)].
 .SH RETURN VALUE
 All routines return the integer \fBERR\fR upon failure and \fBOK\fR
 upon success.
 .SH NOTES
 Note that \fBscr_init\fR, \fBscr_set\fR, and \fBscr_restore\fR may be macros.
 .BUGS
-The time-stamp and rmcup/nrrmc checks are not implemented in \fBncurses\fR(3X).
+The time-stamp and rmcup/nrrmc checks are not implemented in \fBncurses\fR(3).
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_refresh\fR(3X),
-\fBcurs_util\fR(3X), \fBsystem\fR(3S)
+\fBncurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_refresh\fR(3),
+\fBcurs_util\fR(3), \fBsystem\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_scroll.3 b/lib/libncurses/curs_scroll.3
index c77af98..a779a90 100644
--- a/lib/libncurses/curs_scroll.3
+++ b/lib/libncurses/curs_scroll.3
@@ -1,7 +1,6 @@
-.TH curs_scroll 3X ""
+.TH curs_scroll 3 ""
 .SH NAME
-\fBcurs_scroll\fR: \fBscroll\fR, \fBscrl\fR, \fBwscrl\fR - scroll a
-\fBncurses\fR window
+\fBscroll\fR, \fBscrl\fR, \fBwscrl\fR - scroll a \fBncurses\fR window
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -29,7 +28,7 @@ other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that \fBscrl\fR and \fBscroll\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_outopts\fR(3X)
+\fBncurses\fR(3), \fBcurs_outopts\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_slk.3 b/lib/libncurses/curs_slk.3
index b674159..c391701 100644
--- a/lib/libncurses/curs_slk.3
+++ b/lib/libncurses/curs_slk.3
@@ -1,9 +1,9 @@
-.TH curs_slk 3X ""
+.TH curs_slk 3 ""
 .SH NAME
-\fBcurs_slk\fR: \fBslk_init\fR, \fBslk_set\fR, \fBslk_refresh\fR,
+\fBslk_init\fR, \fBslk_set\fR, \fBslk_refresh\fR,
 \fBslk_noutrefresh\fR, \fBslk_label\fR, \fBslk_clear\fR, \fBslk_restore\fR,
-\fBslk_touch\fR, \fBslk_attron\fR, \fBslk_attrset\fR, \fBslk_attroff\fR -
-\fBncurses\fR soft label routines
+\fBslk_touch\fR, \fBslk_attron\fR, \fBslk_attrset\fR, 
+\fBslk_attroff\fR - \fBncurses\fR soft label routines
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -76,7 +76,7 @@ value other than \fBERR\fR upon successful completion.
 Most applications would use \fBslk_noutrefresh\fR because a
 \fBwrefresh\fR is likely to follow soon.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_attr\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_refresh\fR(3X)
+\fBncurses\fR(3), \fBcurs_attr\fR(3), \fBcurs_initscr\fR(3), \fBcurs_refresh\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_termatt.3 b/lib/libncurses/curs_termatt.3
index 75599bd..e7a5078 100644
--- a/lib/libncurses/curs_termatt.3
+++ b/lib/libncurses/curs_termatt.3
@@ -1,6 +1,6 @@
-.TH curs_termattrs 3X ""
+.TH curs_termattrs 3 ""
 .SH NAME
-\fBcurs_termattrs\fR: \fBbaudrate\fR, \fBerasechar\fR, \fBhas_ic\fR,
+\fBbaudrate\fR, \fBerasechar\fR, \fBhas_ic\fR,
 \fBhas_il\fR, \fBkillchar\fR, \fBlongname\fR, \fBtermattrs\fR,
 \fBtermname\fR - \fBncurses\fR environment query routines
 .SH SYNOPSIS
@@ -65,7 +65,7 @@ value other than \fBERR\fR upon successful completion.
 .SH NOTES
 Note that \fBtermattrs\fR may be a macro.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_outopts\fR(3X)
+\fBncurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_outopts\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_termin.3 b/lib/libncurses/curs_termin.3
index 3fc9315..a624b65 100644
--- a/lib/libncurses/curs_termin.3
+++ b/lib/libncurses/curs_termin.3
@@ -1,11 +1,11 @@
-.TH curs_terminfo 3X ""
+.TH curs_terminfo 3 ""
 .ds n 5
 .SH NAME
-\fBcurs_terminfo\fR: \fBsetupterm\fR, \fBsetterm\fR,
+\fBsetupterm\fR, \fBsetterm\fR,
 \fBset_curterm\fR, \fBdel_curterm\fR, \fBrestartterm\fR, \fBtparm\fR,
 \fBtputs\fR, \fBputp\fR, \fBvidputs\fR, \fBvidattr\fR, \fBmvcur\fR,
-\fBtigetflag\fR, \fBtigetnum\fR, \fBtigetstr\fR - \fBncurses\fR
-interfaces to terminfo database
+\fBtigetflag\fR, \fBtigetnum\fR, 
+\fBtigetstr\fR - \fBncurses\fR interfaces to terminfo database
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 .br
@@ -51,7 +51,7 @@ recommended.
 Initially, \fBsetupterm\fR should be called.  Note that
 \fBsetupterm\fR is automatically called by \fBinitscr\fR and
 \fBnewterm\fR.  This defines the set of terminal-dependent variables
-[listed in \fBterminfo\fR(\*n)].  The \fBterminfo\fR variables
+[listed in \fBterminfo\fR(5)].  The \fBterminfo\fR variables
 \fBlines\fR and \fBcolumns\fR are initialized by \fBsetupterm\fR as
 follows: If \fBuse_env(FALSE)\fR has been called, values for
 \fBlines\fR and \fBcolumns\fR specified in \fBterminfo\fR are used.
@@ -68,7 +68,7 @@ correspond to the SVr4 headers \fBcurses.h\fR and \fBterm.h\fR).  Parameterized
 strings should be passed through \fBtparm\fR to instantiate them.  All
 \fBterminfo\fR strings [including the output of \fBtparm\fR] should be printed
 with \fBtputs\fR or \fBputp\fR.  Call the \fBreset_shell_mode\fR to restore the
-tty modes before exiting [see \fBcurs_kernel\fR(3X)].  Programs which use
+tty modes before exiting [see \fBcurs_kernel\fR(3)].  Programs which use
 cursor addressing should output \fBenter_ca_mode\fR upon startup and should
 output \fBexit_ca_mode\fR before exiting.  Programs desiring shell escapes
 should call
@@ -136,7 +136,7 @@ the \fIfildes\fR specified in \fBsetupterm\fR.
 
 The \fBvidputs\fR routine displays the string on the terminal in the
 video attribute mode \fIattrs\fR, which is any combination of the
-attributes listed in \fBncurses\fR(3X).  The characters are passed to
+attributes listed in \fBncurses\fR(3).  The characters are passed to
 the \fBputchar\fR-like routine \fIputc\fR.
 
 The \fBvidattr\fR routine is like the \fBvidputs\fR routine, except
@@ -159,7 +159,7 @@ With the \fBtigetstr\fR routine, the value \fB(char *)-1\fR is
 returned if \fIcapname\fR is not a string capability.
 
 The \fIcapname\fR for each capability is given in the table column entitled
-\fIcapname\fR code in the capabilities section of \fBterminfo\fR(\*n).
+\fIcapname\fR code in the capabilities section of \fBterminfo\fR(5).
 
 \fBchar *boolnames\fR, \fB*boolcodes\fR, \fB*boolfnames\fR
 
@@ -181,8 +181,8 @@ The \fBsetupterm\fR routine should be used in place of \fBsetterm\fR.
 
 Note that \fBvidattr\fR and \fBvidputs\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_kernel\fR(3X), \fBcurs_termcap\fR(3X),
-\fBputc\fR(3S), \fBterminfo\fR(\*n)
+\fBncurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_kernel\fR(3),
+\fBputc\fR(3), \fBterminfo\fR(5)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_touch.3 b/lib/libncurses/curs_touch.3
index 8fe73b8..5d3a620 100644
--- a/lib/libncurses/curs_touch.3
+++ b/lib/libncurses/curs_touch.3
@@ -1,8 +1,8 @@
-.TH curs_touch 3X ""
+.TH curs_touch 3 ""
 .SH NAME
-\fBcurs_touch\fR: \fBtouchwin\fR, \fBtouchline\fR, \fBuntouchwin\fR,
-\fBwtouchln\fR, \fBis_linetouched\fR, \fBis_wintouched\fR -
-\fBncurses\fR refresh control routines
+\fBtouchwin\fR, \fBtouchline\fR, \fBuntouchwin\fR,
+\fBwtouchln\fR, \fBis_linetouched\fR, 
+\fBis_wintouched\fR - \fBncurses\fR refresh control routines
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 .br
@@ -48,7 +48,7 @@ preceding routine descriptions.
 .SH NOTES
 Note that all routines except \fBwtouchln\fR may be macros.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_refresh\fR(3X).
+\fBncurses\fR(3), \fBcurs_refresh\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_util.3 b/lib/libncurses/curs_util.3
index 93e83e8..ee46fad 100644
--- a/lib/libncurses/curs_util.3
+++ b/lib/libncurses/curs_util.3
@@ -1,6 +1,6 @@
-.TH curs_util 3X ""
+.TH curs_util 3 ""
 .SH NAME
-\fBcurs_util\fR: \fBunctrl\fR, \fBkeyname\fR, \fBfilter\fR,
+\fBunctrl\fR, \fBkeyname\fR, \fBfilter\fR,
 \fBuse_env\fR, \fBputwin\fR, \fBgetwin\fR, \fBdelay_output\fR,
 \fBflushinp\fR - miscellaneous \fBncurses\fR utility routines
 .SH SYNOPSIS
@@ -72,7 +72,7 @@ The \fBfilter\fR entry point is not yet supported.
 .SH NOTES
 Note that \fBunctrl\fR is a macro, which is defined in <\fBunctrl.h\fR>.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_scr_dump\fR(3X).
+\fBncurses\fR(3), \fBcurs_initscr\fR(3), \fBcurs_scr_dmp\fR(3).
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/curs_window.3 b/lib/libncurses/curs_window.3
index b2a2315..5ac63f4 100644
--- a/lib/libncurses/curs_window.3
+++ b/lib/libncurses/curs_window.3
@@ -1,9 +1,9 @@
-.TH curs_window 3X ""
+.TH curs_window 3 ""
 .SH NAME
-\fBcurs_window\fR: \fBnewwin\fR, \fBdelwin\fR, \fBmvwin\fR,
+\fBnewwin\fR, \fBdelwin\fR, \fBmvwin\fR,
 \fBsubwin\fR, \fBderwin\fR, \fBmvderwin\fR, \fBdupwin\fR,
-\fBwsyncup\fR, \fBsyncok\fR, \fBwcursyncup\fR, \fBwsyncdown\fR -
-create \fBncurses\fR windows
+\fBwsyncup\fR, \fBsyncok\fR, \fBwcursyncup\fR, 
+\fBwsyncdown\fR - create \fBncurses\fR windows
 .SH SYNOPSIS
 \fB#include <ncurses.h>\fR
 
@@ -114,7 +114,7 @@ The subwindow functions (\fIsubwin\fR, \fIderwin\fR, etc.) are flaky,
 incompletely implemented, and not well tested, especially in their
 interaction with scrolling.
 .SH SEE ALSO
-\fBncurses\fR(3X), \fBcurs_refresh\fR(3X), \fBcurs_touch\fR(3X)
+\fBncurses\fR(3), \fBcurs_refresh\fR(3), \fBcurs_touch\fR(3)
 .\"#
 .\"# The following sets edit modes for GNU EMACS
 .\"# Local Variables:
diff --git a/lib/libncurses/ncurses.3 b/lib/libncurses/ncurses.3
index 8da84a0..3af3614 100644
--- a/lib/libncurses/ncurses.3
+++ b/lib/libncurses/ncurses.3
@@ -1,4 +1,4 @@
-.TH ncurses 3X ""
+.TH ncurses 3 ""
 .ds n 5
 .ds d @TERMINFO@
 .SH NAME
@@ -10,7 +10,7 @@
 The \fBncurses\fR library routines give the user a terminal-independent
 method of updating character screens with reasonable optimization.
 
-The \fBncurses\fR routines emulate the \fBcurses\fR(3X) library of System V
+The \fBncurses\fR routines emulate the \fBcurses\fR(3) library of System V
 Release 4 UNIX, but is freely redistributable in source form.  Differences from
 the SVr4 curses are described in the BUGS sections of individual man pages.
 There are only few of these, and as ncurses matures they will become fewer
@@ -53,7 +53,7 @@ default window called \fBstdscr\fR, which is the size of the terminal
 screen, is supplied.  Others may be created with \fBnewwin\fR.
 
 Windows are referred to by variables declared as \fBWINDOW *\fR.
-These data structures are manipulated with routines described on 3X
+These data structures are manipulated with routines described in manual section 3
 pages (whose names begin "curs_").  Among which the most basic
 routines are \fBmove\fR and \fBaddch\fR.  More general versions of
 these routines are included with names beginning with \fBw\fR,
@@ -68,7 +68,7 @@ about the character may also be stored with each character.
 
 Special windows called \fIpads\fR may also be manipulated.  These are windows
 which are not constrained to the size of the screen and whose contents need not
-be completely displayed.  See curs_pad(3X) for more information.
+be completely displayed.  See curs_pad(3) for more information.
 
 In addition to drawing characters on the screen, video attributes and colors
 may be supported, causing the characters to show up in such modes as
@@ -149,263 +149,257 @@ the manual page on which it is described.
 .nf 
 \fBncurses\fR Routine Name    Manual Page Name
 ___________________________________________
-addch                  curs_addch(3X)
-addchnstr              curs_addchstr(3X)
-addchstr               curs_addchstr(3X)
-addnstr                curs_addstr(3X)
-addstr                 curs_addstr(3X)
-attroff                curs_attr(3X)
-attron                 curs_attr(3X)
-attrset                curs_attr(3X)
-baudrate               curs_termattrs(3X)
-beep                   curs_beep(3X)
-bkgd                   curs_bkgd(3X)
-bkgdset                curs_bkgd(3X)
-border                 curs_border(3X)
-box                    curs_border(3X)
-can_change_color       curs_color(3X)
-cbreak                 curs_inopts(3X)
-clear                  curs_clear(3X)
-clearok                curs_outopts(3X)
-clrtobot               curs_clear(3X)
-clrtoeol               curs_clear(3X)
-color_content          curs_color(3X)
-copywin                curs_overlay(3X)
-curs_set               curs_kernel(3X)
-def_prog_mode          curs_kernel(3X)
-def_shell_mode         curs_kernel(3X)
+addch                  curs_addch(3)
+addchnstr              curs_addchstr(3)
+addchstr               curs_addchstr(3)
+addnstr                curs_addstr(3)
+addstr                 curs_addstr(3)
+attroff                curs_attr(3)
+attron                 curs_attr(3)
+attrset                curs_attr(3)
+baudrate               curs_termattrs(3)
+beep                   curs_beep(3)
+bkgd                   curs_bkgd(3)
+bkgdset                curs_bkgd(3)
+border                 curs_border(3)
+box                    curs_border(3)
+can_change_color       curs_color(3)
+cbreak                 curs_inopts(3)
+clear                  curs_clear(3)
+clearok                curs_outopts(3)
+clrtobot               curs_clear(3)
+clrtoeol               curs_clear(3)
+color_content          curs_color(3)
+copywin                curs_overlay(3)
+curs_set               curs_kernel(3)
+def_prog_mode          curs_kernel(3)
+def_shell_mode         curs_kernel(3)
 del_curterm            curs_terminfo(\*n)
-delay_output           curs_util(3X)
-delch                  curs_delch(3X)
-deleteln               curs_deleteln(3X)
-delscreen              curs_initscr(3X)
-delwin                 curs_window(3X)
-derwin                 curs_window(3X)
-doupdate               curs_refresh(3X)
-dupwin                 curs_window(3X)
-echo                   curs_inopts(3X)
-echochar               curs_addch(3X)
-endwin                 curs_initscr(3X)
-erase                  curs_clear(3X)
-erasechar              curs_termattrs(3X)
-filter                 curs_util(3X)
-flash                  curs_beep(3X)
-flushinp               curs_util(3X)
-getbegyx               curs_getyx(3X)
-getch                  curs_getch(3X)
-getmaxyx               curs_getyx(3X)
-getparyx               curs_getyx(3X)
-getstr                 curs_getstr(3X)
-getsyx                 curs_kernel(3X)
-getwin                 curs_util(3X)
-getyx                  curs_getyx(3X)
-halfdelay              curs_inopts(3X)
-has_colors             curs_color(3X)
-has_ic                 curs_termattrs(3X)
-has_il                 curs_termattrs(3X)
-hline                  curs_border(3X)
-idcok                  curs_outopts(3X)
-idlok                  curs_outopts(3X)
-immedok                curs_outopts(3X)
-inch                   curs_inch(3X)
-inchnstr               curs_inchstr(3X)
-inchstr                curs_inchstr(3X)
-init_color             curs_color(3X)
-init_pair              curs_color(3X)
-initscr                curs_initscr(3X)
-innstr                 curs_instr(3X)
-insch                  curs_insch(3X)
-insdelln               curs_deleteln(3X)
-insertln               curs_deleteln(3X)
-insnstr                curs_insstr(3X)
-insstr                 curs_insstr(3X)
-instr                  curs_instr(3X)
-intrflush              curs_inopts(3X)
-is_linetouched         curs_touch(3X)
-is_wintouched          curs_touch(3X)
-isendwin               curs_initscr(3X)
-keyname                curs_util(3X)
-keypad                 curs_inopts(3X)
-killchar               curs_termattrs(3X)
-leaveok                curs_outopts(3X)
-longname               curs_termattrs(3X)
-meta                   curs_inopts(3X)
-move                   curs_move(3X)
-mvaddch                curs_addch(3X)
-mvaddchnstr            curs_addchstr(3X)
-mvaddchstr             curs_addchstr(3X)
-mvaddnstr              curs_addstr(3X)
-mvaddstr               curs_addstr(3X)
+delay_output           curs_util(3)
+delch                  curs_delch(3)
+deleteln               curs_deleteln(3)
+delscreen              curs_initscr(3)
+delwin                 curs_window(3)
+derwin                 curs_window(3)
+doupdate               curs_refresh(3)
+dupwin                 curs_window(3)
+echo                   curs_inopts(3)
+echochar               curs_addch(3)
+endwin                 curs_initscr(3)
+erase                  curs_clear(3)
+erasechar              curs_termattrs(3)
+filter                 curs_util(3)
+flash                  curs_beep(3)
+flushinp               curs_util(3)
+getbegyx               curs_getyx(3)
+getch                  curs_getch(3)
+getmaxyx               curs_getyx(3)
+getparyx               curs_getyx(3)
+getstr                 curs_getstr(3)
+getsyx                 curs_kernel(3)
+getwin                 curs_util(3)
+getyx                  curs_getyx(3)
+halfdelay              curs_inopts(3)
+has_colors             curs_color(3)
+has_ic                 curs_termattrs(3)
+has_il                 curs_termattrs(3)
+hline                  curs_border(3)
+idcok                  curs_outopts(3)
+idlok                  curs_outopts(3)
+immedok                curs_outopts(3)
+inch                   curs_inch(3)
+inchnstr               curs_inchstr(3)
+inchstr                curs_inchstr(3)
+init_color             curs_color(3)
+init_pair              curs_color(3)
+initscr                curs_initscr(3)
+innstr                 curs_instr(3)
+insch                  curs_insch(3)
+insdelln               curs_deleteln(3)
+insertln               curs_deleteln(3)
+insnstr                curs_insstr(3)
+insstr                 curs_insstr(3)
+instr                  curs_instr(3)
+intrflush              curs_inopts(3)
+is_linetouched         curs_touch(3)
+is_wintouched          curs_touch(3)
+isendwin               curs_initscr(3)
+keyname                curs_util(3)
+keypad                 curs_inopts(3)
+killchar               curs_termattrs(3)
+leaveok                curs_outopts(3)
+longname               curs_termattrs(3)
+meta                   curs_inopts(3)
+move                   curs_move(3)
+mvaddch                curs_addch(3)
+mvaddchnstr            curs_addchstr(3)
+mvaddchstr             curs_addchstr(3)
+mvaddnstr              curs_addstr(3)
+mvaddstr               curs_addstr(3)
 mvcur                  curs_terminfo(\*n)
-mvdelch                curs_delch(3X)
-mvderwin               curs_window(3X)
-mvgetch                curs_getch(3X)
-mvgetstr               curs_getstr(3X)
-mvinch                 curs_inch(3X)
-mvinchnstr             curs_inchstr(3X)
-mvinchstr              curs_inchstr(3X)
-mvinnstr               curs_instr(3X)
-mvinsch                curs_insch(3X)
-mvinsnstr              curs_insstr(3X)
-mvinsstr               curs_insstr(3X)
-mvinstr                curs_instr(3X)
-mvprintw               curs_printw(3X)
-mvscanw                curs_scanw(3X)
-mvwaddch               curs_addch(3X)
-mvwaddchnstr           curs_addchstr(3X)
-mvwaddchstr            curs_addchstr(3X)
-mvwaddnstr             curs_addstr(3X)
-mvwaddstr              curs_addstr(3X)
-mvwdelch               curs_delch(3X)
-mvwgetch               curs_getch(3X)
-mvwgetstr              curs_getstr(3X)
-mvwin                  curs_window(3X)
-mvwinch                curs_inch(3X)
-mvwinchnstr            curs_inchstr(3X)
-mvwinchstr             curs_inchstr(3X)
-mvwinnstr              curs_instr(3X)
-mvwinsch               curs_insch(3X)
-mvwinsnstr             curs_insstr(3X)
-mvwinsstr              curs_insstr(3X)
-mvwinstr               curs_instr(3X)
-mvwprintw              curs_printw(3X)
-mvwscanw               curs_scanw(3X)
-napms                  curs_kernel(3X)
-newpad                 curs_pad(3X)
-newterm                curs_initscr(3X)
-newwin                 curs_window(3X)
-nl                     curs_outopts(3X)
-nocbreak               curs_inopts(3X)
-nodelay                curs_inopts(3X)
-noecho                 curs_inopts(3X)
-nonl                   curs_outopts(3X)
-noqiflush              curs_inopts(3X)
-noraw                  curs_inopts(3X)
-notimeout              curs_inopts(3X)
-overlay                curs_overlay(3X)
-overwrite              curs_overlay(3X)
-pair_content           curs_color(3X)
-pechochar              curs_pad(3X)
-pnoutrefresh           curs_pad(3X)
-prefresh               curs_pad(3X)
-printw                 curs_printw(3X)
+mvdelch                curs_delch(3)
+mvderwin               curs_window(3)
+mvgetch                curs_getch(3)
+mvgetstr               curs_getstr(3)
+mvinch                 curs_inch(3)
+mvinchnstr             curs_inchstr(3)
+mvinchstr              curs_inchstr(3)
+mvinnstr               curs_instr(3)
+mvinsch                curs_insch(3)
+mvinsnstr              curs_insstr(3)
+mvinsstr               curs_insstr(3)
+mvinstr                curs_instr(3)
+mvprintw               curs_printw(3)
+mvscanw                curs_scanw(3)
+mvwaddch               curs_addch(3)
+mvwaddchnstr           curs_addchstr(3)
+mvwaddchstr            curs_addchstr(3)
+mvwaddnstr             curs_addstr(3)
+mvwaddstr              curs_addstr(3)
+mvwdelch               curs_delch(3)
+mvwgetch               curs_getch(3)
+mvwgetstr              curs_getstr(3)
+mvwin                  curs_window(3)
+mvwinch                curs_inch(3)
+mvwinchnstr            curs_inchstr(3)
+mvwinchstr             curs_inchstr(3)
+mvwinnstr              curs_instr(3)
+mvwinsch               curs_insch(3)
+mvwinsnstr             curs_insstr(3)
+mvwinsstr              curs_insstr(3)
+mvwinstr               curs_instr(3)
+mvwprintw              curs_printw(3)
+mvwscanw               curs_scanw(3)
+napms                  curs_kernel(3)
+newpad                 curs_pad(3)
+newterm                curs_initscr(3)
+newwin                 curs_window(3)
+nl                     curs_outopts(3)
+nocbreak               curs_inopts(3)
+nodelay                curs_inopts(3)
+noecho                 curs_inopts(3)
+nonl                   curs_outopts(3)
+noqiflush              curs_inopts(3)
+noraw                  curs_inopts(3)
+notimeout              curs_inopts(3)
+overlay                curs_overlay(3)
+overwrite              curs_overlay(3)
+pair_content           curs_color(3)
+pechochar              curs_pad(3)
+pnoutrefresh           curs_pad(3)
+prefresh               curs_pad(3)
+printw                 curs_printw(3)
 putp                   curs_terminfo(\*n)
-putwin                 curs_util(3X)
-qiflush                curs_inopts(3X)
-raw                    curs_inopts(3X)
-redrawwin              curs_refresh(3X)
-refresh                curs_refresh(3X)
-reset_prog_mode        curs_kernel(3X)
-reset_shell_mode       curs_kernel(3X)
-resetty                curs_kernel(3X)
+putwin                 curs_util(3)
+qiflush                curs_inopts(3)
+raw                    curs_inopts(3)
+redrawwin              curs_refresh(3)
+refresh                curs_refresh(3)
+reset_prog_mode        curs_kernel(3)
+reset_shell_mode       curs_kernel(3)
+resetty                curs_kernel(3)
 restartterm            curs_terminfo(\*n)
-ripoffline             curs_kernel(3X)
-savetty                curs_kernel(3X)
-scanw                  curs_scanw(3X)
-scr_dump               curs_scr_dump(3X)
-scr_init               curs_scr_dump(3X)
-scr_restore            curs_scr_dump(3X)
-scr_set                curs_scr_dump(3X)
-scrl                   curs_scroll(3X)
-scroll                 curs_scroll(3X)
-scrollok               curs_outopts(3X)
+ripoffline             curs_kernel(3)
+savetty                curs_kernel(3)
+scanw                  curs_scanw(3)
+scr_dump               curs_scr_dmp(3)
+scr_init               curs_scr_dmp(3)
+scr_restore            curs_scr_dmp(3)
+scr_set                curs_scr_dmp(3)
+scrl                   curs_scroll(3)
+scroll                 curs_scroll(3)
+scrollok               curs_outopts(3)
 set_curterm            curs_terminfo(\*n)
-set_term               curs_initscr(3X)
-setscrreg              curs_outopts(3X)
-setsyx                 curs_kernel(3X)
+set_term               curs_initscr(3)
+setscrreg              curs_outopts(3)
+setsyx                 curs_kernel(3)
 setterm                curs_terminfo(\*n)
 setupterm              curs_terminfo(\*n)
-slk_attroff            curs_slk(3X)
-slk_attron             curs_slk(3X)
-slk_attrset            curs_slk(3X)
-slk_clear              curs_slk(3X)
-slk_init               curs_slk(3X)
-slk_label              curs_slk(3X)
-slk_noutrefresh        curs_slk(3X)
-slk_refresh            curs_slk(3X)
-slk_restore            curs_slk(3X)
-slk_set                curs_slk(3X)
-slk_touch              curs_slk(3X)
-standend               curs_attr(3X)
-standout               curs_attr(3X)
-start_color            curs_color(3X)
-subpad                 curs_pad(3X)
-subwin                 curs_window(3X)
-syncok                 curs_window(3X)
-termattrs              curs_termattrs(3X)
-termname               curs_termattrs(3X)
-tgetent                curs_termcap(3X)
-tgetflag               curs_termcap(3X)
-tgetnum                curs_termcap(3X)
-tgetstr                curs_termcap(3X)
-tgoto                  curs_termcap(3X)
+slk_attroff            curs_slk(3)
+slk_attron             curs_slk(3)
+slk_attrset            curs_slk(3)
+slk_clear              curs_slk(3)
+slk_init               curs_slk(3)
+slk_label              curs_slk(3)
+slk_noutrefresh        curs_slk(3)
+slk_refresh            curs_slk(3)
+slk_restore            curs_slk(3)
+slk_set                curs_slk(3)
+slk_touch              curs_slk(3)
+standend               curs_attr(3)
+standout               curs_attr(3)
+start_color            curs_color(3)
+subpad                 curs_pad(3)
+subwin                 curs_window(3)
+syncok                 curs_window(3)
+termattrs              curs_termattrs(3)
+termname               curs_termattrs(3)
 tigetflag              curs_terminfo(\*n)
 tigetnum               curs_terminfo(\*n)
 tigetstr               curs_terminfo(\*n)
-timeout                curs_inopts(3X)
-touchline              curs_touch(3X)
-touchwin               curs_touch(3X)
+timeout                curs_inopts(3)
+touchline              curs_touch(3)
+touchwin               curs_touch(3)
 tparm                  curs_terminfo(\*n)
-tputs                  curs_termcap(3X)
 tputs                  curs_terminfo(\*n)
-typeahead              curs_inopts(3X)
-unctrl                 curs_util(3X)
-ungetch                curs_getch(3X)
-untouchwin             curs_touch(3X)
-use_env                curs_util(3X)
+typeahead              curs_inopts(3)
+unctrl                 curs_util(3)
+ungetch                curs_getch(3)
+untouchwin             curs_touch(3)
+use_env                curs_util(3)
 vidattr                curs_terminfo(\*n)
 vidputs                curs_terminfo(\*n)
-vline                  curs_border(3X)
-vwprintw               curs_printw(3X)
-vwscanw                curs_scanw(3X)
-waddch                 curs_addch(3X)
-waddchnstr             curs_addchstr(3X)
-waddchstr              curs_addchstr(3X)
-waddnstr               curs_addstr(3X)
-waddstr                curs_addstr(3X)
-wattroff               curs_attr(3X)
-wattron                curs_attr(3X)
-wattrset               curs_attr(3X)
-wbkgd                  curs_bkgd(3X)
-wbkgdset               curs_bkgd(3X)
-wborder                curs_border(3X)
-wclear                 curs_clear(3X)
-wclrtobot              curs_clear(3X)
-wclrtoeol              curs_clear(3X)
-wcursyncup             curs_window(3X)
-wdelch                 curs_delch(3X)
-wdeleteln              curs_deleteln(3X)
-wechochar              curs_addch(3X)
-werase                 curs_clear(3X)
-wgetch                 curs_getch(3X)
-wgetnstr               curs_getstr(3X)
-wgetstr                curs_getstr(3X)
-whline                 curs_border(3X)
-winch                  curs_inch(3X)
-winchnstr              curs_inchstr(3X)
-winchstr               curs_inchstr(3X)
-winnstr                curs_instr(3X)
-winsch                 curs_insch(3X)
-winsdelln              curs_deleteln(3X)
-winsertln              curs_deleteln(3X)
-winsnstr               curs_insstr(3X)
-winsstr                curs_insstr(3X)
-winstr                 curs_instr(3X)
-wmove                  curs_move(3X)
-wnoutrefresh           curs_refresh(3X)
-wprintw                curs_printw(3X)
-wredrawln              curs_refresh(3X)
-wrefresh               curs_refresh(3X)
-wscanw                 curs_scanw(3X)
-wscrl                  curs_scroll(3X)
-wsetscrreg             curs_outopts(3X)
-wstandend              curs_attr(3X)
-wstandout              curs_attr(3X)
-wsyncdown              curs_window(3X)
-wsyncup                curs_window(3X)
-wtimeout               curs_inopts(3X)
-wtouchln               curs_touch(3X)
-wvline                 curs_border(3X)
+vline                  curs_border(3)
+vwprintw               curs_printw(3)
+vwscanw                curs_scanw(3)
+waddch                 curs_addch(3)
+waddchnstr             curs_addchstr(3)
+waddchstr              curs_addchstr(3)
+waddnstr               curs_addstr(3)
+waddstr                curs_addstr(3)
+wattroff               curs_attr(3)
+wattron                curs_attr(3)
+wattrset               curs_attr(3)
+wbkgd                  curs_bkgd(3)
+wbkgdset               curs_bkgd(3)
+wborder                curs_border(3)
+wclear                 curs_clear(3)
+wclrtobot              curs_clear(3)
+wclrtoeol              curs_clear(3)
+wcursyncup             curs_window(3)
+wdelch                 curs_delch(3)
+wdeleteln              curs_deleteln(3)
+wechochar              curs_addch(3)
+werase                 curs_clear(3)
+wgetch                 curs_getch(3)
+wgetnstr               curs_getstr(3)
+wgetstr                curs_getstr(3)
+whline                 curs_border(3)
+winch                  curs_inch(3)
+winchnstr              curs_inchstr(3)
+winchstr               curs_inchstr(3)
+winnstr                curs_instr(3)
+winsch                 curs_insch(3)
+winsdelln              curs_deleteln(3)
+winsertln              curs_deleteln(3)
+winsnstr               curs_insstr(3)
+winsstr                curs_insstr(3)
+winstr                 curs_instr(3)
+wmove                  curs_move(3)
+wnoutrefresh           curs_refresh(3)
+wprintw                curs_printw(3)
+wredrawln              curs_refresh(3)
+wrefresh               curs_refresh(3)
+wscanw                 curs_scanw(3)
+wscrl                  curs_scroll(3)
+wsetscrreg             curs_outopts(3)
+wstandend              curs_attr(3)
+wstandout              curs_attr(3)
+wsyncdown              curs_window(3)
+wsyncup                curs_window(3)
+wtimeout               curs_inopts(3)
+wtouchln               curs_touch(3)
+wvline                 curs_border(3)
 .fi
 .SH RETURN VALUE
 Routines that return an integer return \fBERR\fR upon failure and an
@@ -420,7 +414,7 @@ right-hand side of assignment statements).
 
 Routines that return pointers return \fBNULL\fR on error.
 .SH SEE ALSO
-\fBterminfo\fR(\*n) and 3X pages whose names begin "curs_" for detailed routine
+\fBterminfo\fR(5) and section 3 pages whose names begin "curs_" for detailed routine
 descriptions.
 .SH NOTES
 The header file \fB<ncurses.h>\fR automatically includes the header files
diff --git a/lib/libncurses/term.5 b/lib/libncurses/term.5
index 68f5d7f..3fe30bd 100644
--- a/lib/libncurses/term.5
+++ b/lib/libncurses/term.5
@@ -31,7 +31,7 @@ The compiled file is created with the
 program, and read by the routine
 .IR setupterm .
 Both of these pieces of software are part of
-.IR ncurses (3X).
+.IR ncurses (3).
 The file is divided into six parts:
 the header,
 terminal names,
@@ -150,4 +150,4 @@ The name field cannot exceed 128 bytes.
 .SH FILES
 \*d/*/*	compiled terminal capability data base
 .SH "SEE ALSO"
-ncurses(3X), terminfo(\*n).
+ncurses(3), terminfo(5).
diff --git a/lib/libncurses/terminfo.5 b/lib/libncurses/terminfo.5
index 107032d..6810df6 100644
--- a/lib/libncurses/terminfo.5
+++ b/lib/libncurses/terminfo.5
@@ -12,7 +12,7 @@ is a data base describing terminals, used by screen-oriented programs such as
 .IR vi (1),
 .IR rogue (1)
 and
-.IR ncurses (3X).
+.IR ncurses (3).
 .I Terminfo
 describes terminals by giving a set of capabilities which they
 have, by specifying how to perform screen operations, and by
@@ -1645,7 +1645,7 @@ user preferences.
 \*d/?/*
 files containing terminal descriptions
 .SH "SEE ALSO"
-tic(1m), curses(3X), printf(3S), term(\*n).
+tic(1), curses(3), printf(3), term(5).
 .SH AUTHORS
 Pavel Curtis, Zeyd M. Ben-Halim
 .\"#