As pointed by Douglas Torrance, nowadays no application is using anymore
the 1x section for the man pages, so this patch is changing the section for
all our concerned man pages to 1 (general commands).
Took opportunity to add some missing references in "see also" sections.
Reported-by: Doug Torrance <dtorra...@monmouthcollege.edu>
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
doc/Makefile.am | 60 ++++++++++++++++++-------------------
doc/{WPrefs.1x => WPrefs.1} | 6 ++--
doc/WindowMaker.1 | 1 +
doc/WindowMaker.1x | 1 -
doc/{geticonset.1x => geticonset.1} | 6 ++--
doc/{getstyle.1x => getstyle.1} | 6 ++--
doc/{seticons.1x => seticons.1} | 6 ++--
doc/{setstyle.1x => setstyle.1} | 8 ++---
doc/upgrade-windowmaker-defaults.8 | 2 +-
doc/{wdread.1x => wdread.1} | 5 +++-
doc/{wdwrite.1x => wdwrite.1} | 5 ++--
doc/{wmagnify.1x => wmagnify.1} | 2 +-
doc/wmaker.in | 27 +++++++++--------
doc/wmgenmenu.1 | 3 ++
doc/wmsetbg.in | 4 +--
doc/{wxcopy.1x => wxcopy.1} | 6 ++--
doc/{wxpaste.1x => wxpaste.1} | 6 ++--
17 files changed, 83 insertions(+), 71 deletions(-)
rename doc/{WPrefs.1x => WPrefs.1} (95%)
create mode 100644 doc/WindowMaker.1
delete mode 100644 doc/WindowMaker.1x
rename doc/{geticonset.1x => geticonset.1} (93%)
rename doc/{getstyle.1x => getstyle.1} (97%)
rename doc/{seticons.1x => seticons.1} (94%)
rename doc/{setstyle.1x => setstyle.1} (95%)
rename doc/{wdread.1x => wdread.1} (93%)
rename doc/{wdwrite.1x => wdwrite.1} (93%)
rename doc/{wmagnify.1x => wmagnify.1} (97%)
rename doc/{wxcopy.1x => wxcopy.1} (95%)
rename doc/{wxpaste.1x => wxpaste.1} (95%)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 706158c..26187f5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,44 +3,44 @@
SUBDIRS = build sk cs ru
dist_man_MANS = \
- geticonset.1x \
- getstyle.1x \
+ geticonset.1 \
+ getstyle.1 \
get-wings-flags.1 \
get-wraster-flags.1 \
get-wutil-flags.1 \
- seticons.1x \
- setstyle.1x \
+ seticons.1 \
+ setstyle.1 \
upgrade-windowmaker-defaults.8 \
- wdread.1x \
- wdwrite.1x \
- WindowMaker.1x \
- wmagnify.1x \
+ wdread.1 \
+ wdwrite.1 \
+ WindowMaker.1 \
+ wmagnify.1 \
wmgenmenu.1 \
wmmenugen.1 \
- WPrefs.1x \
- wxcopy.1x \
- wxpaste.1x
+ WPrefs.1 \
+ wxcopy.1 \
+ wxpaste.1
man_MANS = \
- wmaker.1x \
- wmsetbg.1x
+ wmaker.1 \
+ wmsetbg.1
-MOSTLYCLEANFILES = wmaker.1x wmsetbg.1x
+MOSTLYCLEANFILES = wmaker.1 wmsetbg.1
EXTRA_DIST = wmaker.in wmsetbg.in
-wmaker.1x: wmaker.in Makefile $(top_builddir)/config.h
+wmaker.1: wmaker.in Makefile $(top_builddir)/config.h
$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
--header "$(top_builddir)/config.h" --filter "HAVE_INOTIFY" \
--filter "USE_ICCCM_WMREPLACE" \
-D"sysconfdir=$(sysconfdir)" --replace "sysconfdir" \
-D"pkgdatadir=$(pkgdatadir)" --replace "pkgdatadir" \
- -o "wmaker.1x" "$(srcdir)/wmaker.in"
+ -o "wmaker.1" "$(srcdir)/wmaker.in"
-wmsetbg.1x: wmsetbg.in Makefile $(top_builddir)/config.h
+wmsetbg.1: wmsetbg.in Makefile $(top_builddir)/config.h
$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
--header "$(top_builddir)/config.h" --filter "USE_XINERAMA" \
- -o "wmsetbg.1x" "$(srcdir)/wmsetbg.in"
+ -o "wmsetbg.1" "$(srcdir)/wmsetbg.in"
# Create a 'silent rule' for our make check the same way automake does
AM_V_CHKOPTS = $(am__v_CHKOPTS_$(V))
@@ -53,39 +53,39 @@ check-local: wmaker-args WPrefs-args wmagnify-args
geticonset-args getstyle-args
wmaker-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/src/wmaker" --man-page "wmaker.1x"
+ --program "$(top_builddir)/src/wmaker" --man-page "wmaker.1"
WPrefs-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/WPrefs.app/WPrefs" --man-page
"$(top_srcdir)/doc/WPrefs.1x"
+ --program "$(top_builddir)/WPrefs.app/WPrefs" --man-page
"$(top_srcdir)/doc/WPrefs.1"
wmagnify-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/wmagnify" --man-page
"$(top_srcdir)/doc/wmagnify.1x"
+ --program "$(top_builddir)/util/wmagnify" --man-page
"$(top_srcdir)/doc/wmagnify.1"
geticonset-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/geticonset" --man-page
"$(top_srcdir)/doc/geticonset.1x"
+ --program "$(top_builddir)/util/geticonset" --man-page
"$(top_srcdir)/doc/geticonset.1"
getstyle-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/getstyle" --man-page
"$(top_srcdir)/doc/getstyle.1x"
+ --program "$(top_builddir)/util/getstyle" --man-page
"$(top_srcdir)/doc/getstyle.1"
seticons-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/seticons" --man-page
"$(top_srcdir)/doc/seticons.1x"
+ --program "$(top_builddir)/util/seticons" --man-page
"$(top_srcdir)/doc/seticons.1"
setstyle-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/setstyle" --man-page
"$(top_srcdir)/doc/setstyle.1x"
+ --program "$(top_builddir)/util/setstyle" --man-page
"$(top_srcdir)/doc/setstyle.1"
wdread-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/wdread" --man-page
"$(top_srcdir)/doc/wdread.1x"
+ --program "$(top_builddir)/util/wdread" --man-page
"$(top_srcdir)/doc/wdread.1"
wdwrite-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/wdwrite" --man-page
"$(top_srcdir)/doc/wdwrite.1x"
+ --program "$(top_builddir)/util/wdwrite" --man-page
"$(top_srcdir)/doc/wdwrite.1"
wmgenmenu-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
@@ -93,15 +93,15 @@ wmgenmenu-args:
wmsetbg-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/wmsetbg" --man-page "wmsetbg.1x"
+ --program "$(top_builddir)/util/wmsetbg" --man-page "wmsetbg.1"
wxcopy-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/wxcopy" --man-page
"$(top_srcdir)/doc/wxcopy.1x"
+ --program "$(top_builddir)/util/wxcopy" --man-page
"$(top_srcdir)/doc/wxcopy.1"
wxpaste-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
- --program "$(top_builddir)/util/wxpaste" --man-page
"$(top_srcdir)/doc/wxpaste.1x"
+ --program "$(top_builddir)/util/wxpaste" --man-page
"$(top_srcdir)/doc/wxpaste.1"
.PHONY: wmaker-args WPrefs-args wmagnify-args geticonset-args getstyle-args
seticons-args setstyle-args \
wdread-args wdwrite-args wmgenmenu-args wmsetbg-args wxcopy-args
wxpaste-args
diff --git a/doc/WPrefs.1x b/doc/WPrefs.1
similarity index 95%
rename from doc/WPrefs.1x
rename to doc/WPrefs.1
index cddf90a..378c886 100644
--- a/doc/WPrefs.1x
+++ b/doc/WPrefs.1
@@ -1,4 +1,4 @@
-.TH WPrefs 1x "March 2001"
+.TH WPrefs 1 "March 2001"
.SH NAME
WPrefs \- Window Maker configuration tool
.SH SYNOPSIS
@@ -46,7 +46,9 @@ The Window Maker User Guide
.PP
The Window Maker FAQ
.PP
-.BR wmaker (1x)
+.BR wmaker (1),
+.BR wdread (1),
+.BR wdwrite (1)
.SH AUTHOR
Window Maker was written by Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.info> with contributions from many people around
diff --git a/doc/WindowMaker.1 b/doc/WindowMaker.1
new file mode 100644
index 0000000..69decbf
--- /dev/null
+++ b/doc/WindowMaker.1
@@ -0,0 +1 @@
+.so man1/wmaker.1
diff --git a/doc/WindowMaker.1x b/doc/WindowMaker.1x
deleted file mode 100644
index c3e95bc..0000000
--- a/doc/WindowMaker.1x
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/wmaker.1x
diff --git a/doc/geticonset.1x b/doc/geticonset.1
similarity index 93%
rename from doc/geticonset.1x
rename to doc/geticonset.1
index 812f82d..61e2cb7 100644
--- a/doc/geticonset.1x
+++ b/doc/geticonset.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH geticonset 1x "January 1999"
+.TH geticonset 1 "January 1999"
.SH NAME
geticonset \- gets the current Window Maker icon set
.SH SYNOPSIS
@@ -28,8 +28,8 @@ databases. If the variable is not set, it defaults to
"~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
is the actual file that's read.
.SH SEE ALSO
-.BR seticons (1x),
-.BR wmaker (1x)
+.BR seticons (1),
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
diff --git a/doc/getstyle.1x b/doc/getstyle.1
similarity index 97%
rename from doc/getstyle.1x
rename to doc/getstyle.1
index 12681c0..3048beb 100644
--- a/doc/getstyle.1x
+++ b/doc/getstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH getstyle 1x "April 2015"
+.TH getstyle 1 "April 2015"
.SH NAME
getstyle \- dumps the current Window Maker style related configuration or
creates a theme pack.
@@ -63,8 +63,8 @@ databases. If the variable is not set, it defaults to
"~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
This is the actual file that gets written.
.SH SEE ALSO
-.BR setstyle (1x),
-.BR wmaker (1x)
+.BR setstyle (1),
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
diff --git a/doc/seticons.1x b/doc/seticons.1
similarity index 94%
rename from doc/seticons.1x
rename to doc/seticons.1
index 0554af6..aa1d61b 100644
--- a/doc/seticons.1x
+++ b/doc/seticons.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH seticons 1x "March 1998"
+.TH seticons 1 "March 1998"
.SH NAME
seticons \- sets the icon images used in Window Maker
.SH SYNOPSIS
@@ -30,8 +30,8 @@ databases. If the variable is not set, it defaults to
"~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
This is the actual file that's written.
.SH SEE ALSO
-.BR geticonset (1x),
-.BR wmaker (1x)
+.BR geticonset (1),
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
diff --git a/doc/setstyle.1x b/doc/setstyle.1
similarity index 95%
rename from doc/setstyle.1x
rename to doc/setstyle.1
index 464ae2d..8b3d519 100644
--- a/doc/setstyle.1x
+++ b/doc/setstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH setstyle 1x "April 2015"
+.TH setstyle 1 "April 2015"
.SH NAME
setstyle \- set style related options for Window Maker or loads a theme
.SH SYNOPSIS
@@ -25,7 +25,7 @@ print a help message with the list of options.
ignore the attribute named \fIkeyword\fP from the style file.
You can specify this option as many times as needed.
You may find a non-exhaustive list of the keywords from the
-.BR getstyle (1x)
+.BR getstyle (1)
man page.
.TP
.B \-\-no\-cursors
@@ -51,8 +51,8 @@ databases. If the variable is not set, it defaults to
"~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
This is the actual file that's written.
.SH SEE ALSO
-.BR getstyle (1x),
-.BR wmaker (1x)
+.BR getstyle (1),
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
diff --git a/doc/upgrade-windowmaker-defaults.8
b/doc/upgrade-windowmaker-defaults.8
index ef5ba07..a29981c 100644
--- a/doc/upgrade-windowmaker-defaults.8
+++ b/doc/upgrade-windowmaker-defaults.8
@@ -16,7 +16,7 @@ The Window Maker FAQ
.PP
The Window Maker changelog and NEWS files (in /usr/share/doc/wmaker)
.PP
-.BR wmaker (1x)
+.BR wmaker (1)
.SH AUTHOR
This utility and manpage were written by Marcelo E. Magallon,
<mmaga...@debian.org>, for the Debian Project. It might be used freely by
diff --git a/doc/wdread.1x b/doc/wdread.1
similarity index 93%
rename from doc/wdread.1x
rename to doc/wdread.1
index 619b76e..92c9dc0 100644
--- a/doc/wdread.1x
+++ b/doc/wdread.1
@@ -1,4 +1,4 @@
-.TH wdread 1x "April 2015"
+.TH wdread 1 "April 2015"
.SH "NAME"
\fBwdread\fR \- read value from defaults database
.PP
@@ -34,6 +34,9 @@ if the \fIdomain\fP's file could not be read (probably
nonexistent domain).
.TP
.B 2
if the \fIkey\fP was not found in the \fIdomain\fP.
+.SH "SEE ALSO"
+.BR wdwrite (1),
+.BR wmaker (1)
.SH "AUTHOR"
Window Maker was written by Alfredo K. Kojima <koj...@windowmaker.info>,
wdread is a part of Window Maker, was cowardly remade from wdwrite.c;
diff --git a/doc/wdwrite.1x b/doc/wdwrite.1
similarity index 93%
rename from doc/wdwrite.1x
rename to doc/wdwrite.1
index bbf5e49..fe33b47 100644
--- a/doc/wdwrite.1x
+++ b/doc/wdwrite.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wdwrite 1x "January 1999"
+.TH wdwrite 1 "January 1999"
.SH NAME
wdwrite \- writes keys and values to the defaults database
.SH SYNOPSIS
@@ -30,7 +30,8 @@ databases. If the variable is not set, it defaults to
"~/GNUstep"
.SH FILES
The domains reside in GNUSTEP_USER_ROOT/Defaults/
.SH SEE ALSO
-.BR wmaker (1x)
+.BR wdread (1),
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
diff --git a/doc/wmagnify.1x b/doc/wmagnify.1
similarity index 97%
rename from doc/wmagnify.1x
rename to doc/wmagnify.1
index b1b192f..af517ea 100644
--- a/doc/wmagnify.1x
+++ b/doc/wmagnify.1
@@ -1,4 +1,4 @@
-.TH wmagnify 1x "March 22, 2006"
+.TH wmagnify 1 "March 22, 2006"
.SH NAME
wmagnify \- magnify parts of the screen
diff --git a/doc/wmaker.in b/doc/wmaker.in
index 48e2879..f5c22ef 100644
--- a/doc/wmaker.in
+++ b/doc/wmaker.in
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH "Window Maker" 1x "February 2015"
+.TH "Window Maker" 1 "February 2015"
.SH NAME
wmaker \- X11 window manager with a NEXTSTEP look
.SH SYNOPSIS
@@ -63,7 +63,7 @@ display Window Maker's version number and exit
.TP
.B \-\-visual\-id
specify the ID of the visual to use; see
-.BR xdpyinfo (1x)
+.BR xdpyinfo (1)
for a list of visuals available in your display
.PP
.SH FILES
@@ -150,16 +150,19 @@ The Window Maker User Guide
.PP
The Window Maker FAQ
.PP
-.BR X (1x),
-.BR wdwrite (1x),
-.BR wxcopy (1x),
-.BR geticonset (1x),
-.BR seticons (1x),
-.BR wmaker (1x),
-.BR wxpaste (1x),
-.BR getstyle (1x),
-.BR setstyle (1x),
-.BR wmsetbg (1x)
+.BR WPrefs (1),
+.BR X (7),
+.BR wxcopy (1),
+.BR wxpaste (1),
+.BR geticonset (1),
+.BR seticons (1),
+.BR getstyle (1),
+.BR setstyle (1),
+.BR wmsetbg (1),
+.BR wmgenmenu (1),
+.BR wmmenugen (1),
+.BR wdread (1),
+.BR wdwrite (1)
.SH AUTHOR
Window Maker was written by Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.info> with contributions from many people around
diff --git a/doc/wmgenmenu.1 b/doc/wmgenmenu.1
index 0b084ab..32545cd 100644
--- a/doc/wmgenmenu.1
+++ b/doc/wmgenmenu.1
@@ -24,6 +24,9 @@ print the version of Window Maker from which the program comes
.SH "BUGS"
The program is using a built-in structure and list of applications, which
means it cannot discover
new programs, but it filters the programs that cannot be found in the
\fBPATH\fP.
+.SH "SEE ALSO"
+.BR wmmenugen (1),
+.BR wmaker (1)
.SH "AUTHOR"
wmgenmenu is a part of Window Maker. It was written by Carlos R. Mafra and
Tamas TEVESZ.
diff --git a/doc/wmsetbg.in b/doc/wmsetbg.in
index 0139fec..7128274 100644
--- a/doc/wmsetbg.in
+++ b/doc/wmsetbg.in
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wmsetbg 1x "April 2015"
+.TH wmsetbg 1 "April 2015"
.SH NAME
wmsetbg \- sets the background on the X11 display
.SH SYNOPSIS
@@ -102,7 +102,7 @@ The value specified with the option defines the number of
possible values for ea
(red, green and blue), for example \fI8\fP would reduce the image to use only
8*8*8=512 colors before
applying the conversion algorithm.
.SH SEE ALSO
-.BR wmaker (1x)
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
diff --git a/doc/wxcopy.1x b/doc/wxcopy.1
similarity index 95%
rename from doc/wxcopy.1x
rename to doc/wxcopy.1
index 7ba9122..9360b89 100644
--- a/doc/wxcopy.1x
+++ b/doc/wxcopy.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wxcopy 1x "September 1998"
+.TH wxcopy 1 "September 1998"
.SH NAME
wxcopy \- copy stdin or file into X11 cutbuffer
.SH SYNOPSIS
@@ -39,8 +39,8 @@ attempt to grow to whatever size is required.
print the version of Window Maker from which the program comes.
.PP
.SH SEE ALSO
-.BR wxpaste (1x),
-.BR wmaker (1x)
+.BR wxpaste (1),
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
diff --git a/doc/wxpaste.1x b/doc/wxpaste.1
similarity index 95%
rename from doc/wxpaste.1x
rename to doc/wxpaste.1
index f85f0b7..9e7c055 100644
--- a/doc/wxpaste.1x
+++ b/doc/wxpaste.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wxpaste 1x "March 1998"
+.TH wxpaste 1 "March 1998"
.SH NAME
wxpaste \- output a cutbuffer to stdout
.SH SYNOPSIS
@@ -38,8 +38,8 @@ The syntax could be cleaned, but backwards compatibility
prevents that...
text selections are handled, which should be enough for most uses of a
utility such as this.
.SH SEE ALSO
-.BR wxcopy (1x),
-.BR wmaker (1x)
+.BR wxcopy (1),
+.BR wmaker (1)
.SH AUTHOR
This man page was written by Marcelo Magallon <mmaga...@debian.org>.
.PP
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
