This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via bae28b2fae3b6dac2b3c5448d567125a1b85525e (commit)
via d6d165c29d899e75b0600da35fc4a41ddd6f6c91 (commit)
via 0a009143c32064d47dc857ec50e95116b7c5b6be (commit)
via 8088dc1eabb743a1dbd594cb0908234c0721d61c (commit)
from 4d0585ede250dbf0dfe7191519aec8abce365996 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/bae28b2fae3b6dac2b3c5448d567125a1b85525e
commit bae28b2fae3b6dac2b3c5448d567125a1b85525e
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sat May 23 17:19:32 2015 +0200
doc: changed section for translated man pages from 1x to 1
Similarly to the previous patch that changed the section for the core man
pages, this patch updates the translated man pages.
Took opportunity to re-order alphabetically the files in the Makefile
because it eases maintenance.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am
index 480bdb6..2747364 100644
--- a/doc/cs/Makefile.am
+++ b/doc/cs/Makefile.am
@@ -3,15 +3,15 @@
mandir=@mandir@/cs
man_MANS = \
- geticonset.1x \
- setstyle.1x \
- wxpaste.1x \
- getstyle.1x \
- wdwrite.1x \
- wmsetbg.1x \
- seticons.1x \
- wmaker.1x \
- wxcopy.1x
+ geticonset.1 \
+ getstyle.1 \
+ seticons.1 \
+ setstyle.1 \
+ wdwrite.1 \
+ wmaker.1 \
+ wmsetbg.1 \
+ wxcopy.1 \
+ wxpaste.1
EXTRA_DIST = $(man_MANS)
diff --git a/doc/cs/geticonset.1x b/doc/cs/geticonset.1
similarity index 93%
rename from doc/cs/geticonset.1x
rename to doc/cs/geticonset.1
index 83fcf5d..34c8397 100644
--- a/doc/cs/geticonset.1x
+++ b/doc/cs/geticonset.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH geticonset 1x "Leden 1999"
+.TH geticonset 1 "Leden 1999"
.SH JM�NO
geticonset \- extrahuje aktu�ln� sadu ikon Window Makera
.SH SYNTAXE
@@ -26,8 +26,8 @@ tak jej
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
Toto je soubor, kter� se zap��e.
.SH POD�VEJTE SE TAK�
-.BR seticons (1x),
-.BR wmaker (1x)
+.BR seticons (1),
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/cs/getstyle.1x b/doc/cs/getstyle.1
similarity index 97%
rename from doc/cs/getstyle.1x
rename to doc/cs/getstyle.1
index 349c996..93ae965 100644
--- a/doc/cs/getstyle.1x
+++ b/doc/cs/getstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH getstyle 1x "Leden 1999"
+.TH getstyle 1 "Leden 1999"
.SH JMÉNO
getstyle \- vytvoøí balík s aktuálním stylem Window Makera.
.SH SYNTAXE
@@ -58,8 +58,8 @@ tak její implicitní hodnota je "~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
Toto je soubor, který se zapí¹e.
.SH PODÍVEJTE SE TAKÉ
-.BR setstyle (1x),
-.BR wmaker (1x)
+.BR setstyle (1),
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/cs/seticons.1x b/doc/cs/seticons.1
similarity index 93%
rename from doc/cs/seticons.1x
rename to doc/cs/seticons.1
index 6f80c29..c9782e7 100644
--- a/doc/cs/seticons.1x
+++ b/doc/cs/seticons.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH seticons 1x "B�ezen 1998"
+.TH seticons 1 "B�ezen 1998"
.SH JM�NO
seticons \- nastav� ikony pro Window Maker
.SH SYNTAXe
@@ -28,8 +28,8 @@ tak jej
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
Toto je soubor, kter� se zap��e.
.SH POD�VEJTE SE TAK�
-.BR geticonset (1x),
-.BR wmaker (1x)
+.BR geticonset (1),
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/cs/setstyle.1x b/doc/cs/setstyle.1
similarity index 96%
rename from doc/cs/setstyle.1x
rename to doc/cs/setstyle.1
index 38fc48e..35b76c2 100644
--- a/doc/cs/setstyle.1x
+++ b/doc/cs/setstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH setstyle 1x "Leden 1999"
+.TH setstyle 1 "Leden 1999"
.SH JMÉNO
setstyle \- zmìní nastavení Window Makera související se stylem nebo
zavede téma
@@ -46,8 +46,8 @@ tak její implicitní hodnota je "~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
Toto je soubor, který se zapí¹e.
.SH PODÍVEJTE SE TAKÉ
-.BR getstyle (1x),
-.BR wmaker (1x)
+.BR getstyle (1),
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/cs/wdwrite.1x b/doc/cs/wdwrite.1
similarity index 95%
rename from doc/cs/wdwrite.1x
rename to doc/cs/wdwrite.1
index b334d3f..10d6408 100644
--- a/doc/cs/wdwrite.1x
+++ b/doc/cs/wdwrite.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wdwrite 1x "Leden 1999"
+.TH wdwrite 1 "Leden 1999"
.SH JM�NO
wdwrite \- zap��e kl��e a hodnoty do datab�ze standardn�ch nastaven�
.SH SYNTAXE
@@ -30,7 +30,7 @@ tak jej
.SH SOUBORY
Dom�ny se nach�zej� v GNUSTEP_USER_ROOT/Defaults/
.SH POD�VEJTE SE TAK�
-.BR wmaker (1x)
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/cs/wmaker.1x b/doc/cs/wmaker.1
similarity index 95%
rename from doc/cs/wmaker.1x
rename to doc/cs/wmaker.1
index 13da570..81bc641 100644
--- a/doc/cs/wmaker.1x
+++ b/doc/cs/wmaker.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH Window\ Maker 1x "Srpen 1998"
+.TH Window\ Maker 1 "Srpen 1998"
.SH JM�NO
wmaker \- okenn� mana�er pro X11 se vzhledem NEXTSTEPu
.SH SYNTAXE
@@ -35,7 +35,7 @@ vyp
.TP
.B \-\-visual\-id
ur�� ��sla obrazov�ho re�imu. Spus�te
-.BR xdpyinfo (1x)
+.BR xdpyinfo (1)
pro seznam obrazov�ch re�im� dostupn�ch na va�em displeji.
.TP
.B \-\-help
@@ -129,16 +129,16 @@ The Window Maker User Guide
The Window Maker FAQ
(�asto kladen� dotazy)
.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 X (7),
+.BR wdwrite (1),
+.BR wxcopy (1),
+.BR geticonset (1),
+.BR seticons (1),
+.BR wmaker (1),
+.BR wxpaste (1),
+.BR getstyle (1),
+.BR setstyle (1),
+.BR wmsetbg (1)
.SH AUTOR
Auto�i Window Makera jsou Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.info> a mnoho dal��ch lid� z cel�ho sv�ta.
diff --git a/doc/cs/wmsetbg.1x b/doc/cs/wmsetbg.1
similarity index 97%
rename from doc/cs/wmsetbg.1x
rename to doc/cs/wmsetbg.1
index 85ebaa2..99f9709 100644
--- a/doc/cs/wmsetbg.1x
+++ b/doc/cs/wmsetbg.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wmsetbg 1x "Leden 1999"
+.TH wmsetbg 1 "Leden 1999"
.SH JM�NO
wmsetbg \- nastav� pozad� hlavn�ho okna v X11
.SH SYNTAXE
@@ -57,7 +57,7 @@ vyp
.B \-\-version
vyp��e ��slo verze
.SH POD�VEJTE SE TAK�
-.BR wmaker (1x)
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
wmsetbg napsal Dan Pascu <d...@windowmaker.info>
diff --git a/doc/cs/wxcopy.1x b/doc/cs/wxcopy.1
similarity index 95%
rename from doc/cs/wxcopy.1x
rename to doc/cs/wxcopy.1
index aa35a0d..a186fe1 100644
--- a/doc/cs/wxcopy.1x
+++ b/doc/cs/wxcopy.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wxcopy 1x "Z��� 1998"
+.TH wxcopy 1 "Z��� 1998"
.SH JM�NO
wxcopy \- kop�ruje standartn� vstup do vyrovn�vac� pam�ti
.SH SYNOPSIS
@@ -32,8 +32,8 @@ vlo
pam�ti 0, nam�sto p��padn�ho spu�t�n� selelekce my�i.
.PP
.SH POD�VEJTE SE TAK�
-.BR wxpaste (1x),
-.BR wmaker (1x)
+.BR wxpaste (1),
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/cs/wxpaste.1x b/doc/cs/wxpaste.1
similarity index 95%
rename from doc/cs/wxpaste.1x
rename to doc/cs/wxpaste.1
index c77cce4..33197b4 100644
--- a/doc/cs/wxpaste.1x
+++ b/doc/cs/wxpaste.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wxpaste 1x "B�ezen 1998"
+.TH wxpaste 1 "B�ezen 1998"
.SH JM�NO
wxpaste \- zap��e vyrovn�vac� pam�� na standardn� v�stup
.SH SYNTAXE
@@ -30,8 +30,8 @@ Typy selekc
podporovan� jen jednoduch� text, co� by m�lo sta�it pro v�t�inu u�ivatel�
takov�to jednoduch� utilitky.
.SH POD�VEJTE SE TAK�
-.BR wxcopy (1x),
-.BR wmaker (1x)
+.BR wxcopy (1),
+.BR wmaker (1)
.SH AUTOR
Autorem Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/ru/Makefile.am b/doc/ru/Makefile.am
index 54fef0f..8310451 100644
--- a/doc/ru/Makefile.am
+++ b/doc/ru/Makefile.am
@@ -3,14 +3,14 @@
mandir=@mandir@/ru
man_MANS = \
- geticonset.1x \
- setstyle.1x \
- wxpaste.1x \
- getstyle.1x \
- wdwrite.1x \
- wmsetbg.1x \
- seticons.1x \
- wmaker.1x \
- wxcopy.1x
+ geticonset.1 \
+ getstyle.1 \
+ seticons.1 \
+ setstyle.1 \
+ wdwrite.1 \
+ wmaker.1 \
+ wmsetbg.1 \
+ wxcopy.1 \
+ wxpaste.1
EXTRA_DIST = $(man_MANS)
diff --git a/doc/ru/geticonset.1x b/doc/ru/geticonset.1
similarity index 95%
rename from doc/ru/geticonset.1x
rename to doc/ru/geticonset.1
index 11fb440..1842b77 100644
--- a/doc/ru/geticonset.1x
+++ b/doc/ru/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 "НАИМЕНОВАНИЕ"
geticonset \- считывает данные о наборе иконок Window Maker.
.SH "СИНТАКСИС"
@@ -26,8 +26,8 @@ geticonset \- считывает данные о наборе иконок Windo
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
Файл, из которого читаются данные.
.SH "СМОТРИ ТАКЖЕ"
-.BR seticons (1x),
-.BR wmaker (1x)
+.BR seticons (1),
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/getstyle.1x b/doc/ru/getstyle.1
similarity index 98%
rename from doc/ru/getstyle.1x
rename to doc/ru/getstyle.1
index f83b28e..72037a0 100644
--- a/doc/ru/getstyle.1x
+++ b/doc/ru/getstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH getstyle 1x "January 1999"
+.TH getstyle 1 "January 1999"
.SH "НАИМЕНОВАНИЕ"
getstyle \- делает дамп темы оформления Window Maker.
.SH "СИНТАКСИС"
@@ -58,8 +58,8 @@ getstyle \- делает дамп темы оформления Window Maker.
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
В указанный файл идёт запись данных.
.SH "СМОТРИ ТАКЖЕ"
-.BR setstyle (1x),
-.BR wmaker (1x)
+.BR setstyle (1),
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/seticons.1x b/doc/ru/seticons.1
similarity index 96%
rename from doc/ru/seticons.1x
rename to doc/ru/seticons.1
index ee88e8e..81956b1 100644
--- a/doc/ru/seticons.1x
+++ b/doc/ru/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 "НАИМЕНОВАНИЕ"
seticons \- устанавливает набор иконок Window Maker.
.SH "СИНТАКСИС"
@@ -28,8 +28,8 @@ seticons \- устанавливает набор иконок Window Maker.
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
Это файл, в который идёт запись.
.SH "СМОТРИ ТАКЖЕ"
-.BR geticonset (1x),
-.BR wmaker (1x)
+.BR geticonset (1),
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/setstyle.1x b/doc/ru/setstyle.1
similarity index 97%
rename from doc/ru/setstyle.1x
rename to doc/ru/setstyle.1
index e97942d..53548fe 100644
--- a/doc/ru/setstyle.1x
+++ b/doc/ru/setstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH setstyle 1x "January 1999"
+.TH setstyle 1 "January 1999"
.SH "НАИМЕНОВАНИЕ"
setstyle \- устанавливает опции связанные со стилем Window Maker или загружает
тему оформления.
@@ -49,8 +49,8 @@ setstyle \- устанавливает опции связанные со сти
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
Это файл с которым идёт взаимодействие.
.SH "СМОТРИ ТАКЖЕ"
-.BR getstyle (1x),
-.BR wmaker (1x)
+.BR getstyle (1),
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/wdwrite.1x b/doc/ru/wdwrite.1
similarity index 96%
rename from doc/ru/wdwrite.1x
rename to doc/ru/wdwrite.1
index af5da4a..39d786e 100644
--- a/doc/ru/wdwrite.1x
+++ b/doc/ru/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 "НАИМЕНОВАНИЕ"
wdwrite \- записывает пары ключ/значение в домен.
.SH "СИНТАКСИС"
@@ -30,7 +30,7 @@ wdwrite \- записывает пары ключ/значение в домен
.SH "ФАЙЛЫ"
Домены находятся в директории GNUSTEP_USER_ROOT/Defaults/ .
.SH "СМОТРИ ТАКЖЕ"
-.BR wmaker (1x)
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/wmaker.1x b/doc/ru/wmaker.1
similarity index 96%
rename from doc/ru/wmaker.1x
rename to doc/ru/wmaker.1
index c873467..ab67082 100644
--- a/doc/ru/wmaker.1x
+++ b/doc/ru/wmaker.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH Window\ Maker 1x "August 1998"
+.TH Window\ Maker 1 "August 1998"
.SH "НАИМЕНОВАНИЕ"
wmaker \- оконный менеджер для X11 эмулирующий интерфейс NEXTSTEP.
.SH "СИНТАКСИС"
@@ -35,7 +35,7 @@ Window Maker это оконный менеджер для X11 эмулирую
.TP
.B \-\-visual\-id
Указать ID графического режима. Смотрите
-.BR xdpyinfo (1x)
+.BR xdpyinfo (1)
для списка доспупных графических режимов.
.TP
.B \-\-help
@@ -125,16 +125,16 @@ 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 X (7),
+.BR wdwrite (1),
+.BR wxcopy (1),
+.BR geticonset (1),
+.BR seticons (1),
+.BR wmaker (1),
+.BR wxpaste (1),
+.BR getstyle (1),
+.BR setstyle (1),
+.BR wmsetbg (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/wmsetbg.1x b/doc/ru/wmsetbg.1
similarity index 98%
rename from doc/ru/wmsetbg.1x
rename to doc/ru/wmsetbg.1
index a80895d..0113893 100644
--- a/doc/ru/wmsetbg.1x
+++ b/doc/ru/wmsetbg.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wmsetbg 1x "January 1999"
+.TH wmsetbg 1 "January 1999"
.SH "НАИМЕНОВАНИЕ"
wmsetbg \- устанавливает фон дисплея X11.
.SH "СИНТАКСИС"
@@ -68,7 +68,7 @@ Window Maker временно устанавливает фон указанно
.B \-\-version
Вывести номер версии.
.SH "СМОТРИ ТАКЖЕ"
-.BR wmaker (1x)
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/wxcopy.1x b/doc/ru/wxcopy.1
similarity index 97%
rename from doc/ru/wxcopy.1x
rename to doc/ru/wxcopy.1
index e2666e2..dd286c4 100644
--- a/doc/ru/wxcopy.1x
+++ b/doc/ru/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 "НАИМЕНОВАНИЕ"
wxcopy \- копирует стандартный ввод или файл в буфер.
.SH "СИНТАКСИС"
@@ -31,8 +31,8 @@ wxcopy \- копирует стандартный ввод или файл в б
будут выбираться из буфера 0, вместо существующего выделения.
.PP
.SH "СМОТРИ ТАКЖЕ"
-.BR wxpaste (1x),
-.BR wmaker (1x)
+.BR wxpaste (1),
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/ru/wxpaste.1x b/doc/ru/wxpaste.1
similarity index 97%
rename from doc/ru/wxpaste.1x
rename to doc/ru/wxpaste.1
index 9495197..4b77bf6 100644
--- a/doc/ru/wxpaste.1x
+++ b/doc/ru/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 "НАИМЕНОВАНИЕ"
wxpaste \- выводит содержимое буфера на стандартный вывод.
.SH "СИНТАКСИС"
@@ -32,8 +32,8 @@ wxpaste \- выводит содержимое буфера на стандар
только простые текстовые выделения, которых должно быть достаточно для
большинства случаев использования этой утилиты.
.SH "СМОТРИ ТАКЖЕ"
-.BR wxcopy (1x),
-.BR wmaker (1x)
+.BR wxcopy (1),
+.BR wmaker (1)
.SH "АВТОРЫ"
Window Maker написан Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.org> и дополнен вкладом многих людей по всему
diff --git a/doc/sk/Makefile.am b/doc/sk/Makefile.am
index eae74a9..e516506 100644
--- a/doc/sk/Makefile.am
+++ b/doc/sk/Makefile.am
@@ -3,15 +3,15 @@
mandir=@mandir@/sk
man_MANS = \
- geticonset.1x \
- setstyle.1x \
- wxpaste.1x \
- getstyle.1x \
- wdwrite.1x \
- wmsetbg.1x \
- seticons.1x \
- wmaker.1x \
- wxcopy.1x
+ geticonset.1 \
+ getstyle.1 \
+ seticons.1 \
+ setstyle.1 \
+ wdwrite.1 \
+ wmaker.1 \
+ wmsetbg.1 \
+ wxcopy.1 \
+ wxpaste.1
EXTRA_DIST = $(man_MANS)
diff --git a/doc/sk/geticonset.1x b/doc/sk/geticonset.1
similarity index 92%
rename from doc/sk/geticonset.1x
rename to doc/sk/geticonset.1
index 98d412e..0f50316 100644
--- a/doc/sk/geticonset.1x
+++ b/doc/sk/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 MENO
geticonset \- extrahuje aktu�lnu sadu ikon Window Makera
.SH SYNTAX
@@ -26,8 +26,8 @@ jej implicitn
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
Toto je s�bor, ktor� sa zap��e.
.SH POZRI TIE�
-.BR seticons (1x),
-.BR wmaker (1x)
+.BR seticons (1),
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/sk/getstyle.1x b/doc/sk/getstyle.1
similarity index 97%
rename from doc/sk/getstyle.1x
rename to doc/sk/getstyle.1
index 1ff642c..54b8ee2 100644
--- a/doc/sk/getstyle.1x
+++ b/doc/sk/getstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH getstyle 1x "January 1999"
+.TH getstyle 1 "January 1999"
.SH MENO
getstyle \- vytvorí balík s aktuálnym ¹týlom Window Makera.
.SH SYNTAX
@@ -58,8 +58,8 @@ jej implicitná hodnota je "~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
Toto je súbor, ktorý sa zapí¹e.
.SH POZRI TIE®
-.BR setstyle (1x),
-.BR wmaker (1x)
+.BR setstyle (1),
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/sk/seticons.1x b/doc/sk/seticons.1
similarity index 93%
rename from doc/sk/seticons.1x
rename to doc/sk/seticons.1
index da8745b..3276a54 100644
--- a/doc/sk/seticons.1x
+++ b/doc/sk/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 MENO
seticons \- nastav� obr�zky ikon pre Window Maker
.SH SYNTAX
@@ -28,8 +28,8 @@ jej implicitn
.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes
Toto je s�bor, ktor� sa zap��e.
.SH POZRI TIE�
-.BR geticonset (1x),
-.BR wmaker (1x)
+.BR geticonset (1),
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/sk/setstyle.1x b/doc/sk/setstyle.1
similarity index 96%
rename from doc/sk/setstyle.1x
rename to doc/sk/setstyle.1
index b3a84dc..2be89a4 100644
--- a/doc/sk/setstyle.1x
+++ b/doc/sk/setstyle.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH setstyle 1x "January 1999"
+.TH setstyle 1 "January 1999"
.SH MENO
setstyle \- zmení nastavenia Window Makera súvisiace so ¹týlmi alebo
zavedie tému
@@ -47,8 +47,8 @@ jej implicitná hodnota je "~/GNUstep"
.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker
Toto je súbor, ktorý sa zapí¹e.
.SH POZRI TIE®
-.BR getstyle (1x),
-.BR wmaker (1x)
+.BR getstyle (1),
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/sk/wdwrite.1x b/doc/sk/wdwrite.1
similarity index 94%
rename from doc/sk/wdwrite.1x
rename to doc/sk/wdwrite.1
index 1a0c4f4..6d84f9b 100644
--- a/doc/sk/wdwrite.1x
+++ b/doc/sk/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 MENO
wdwrite \- zap��e k���e a hodnoty do datab�zy �tandardn�ch nastaven�
.SH SYNTAX
@@ -30,7 +30,7 @@ jej implicitn
.SH S�BORY
Dom�ny sa nach�dzaj� v GNUSTEP_USER_ROOT/Defaults/
.SH POZRI TIE�
-.BR wmaker (1x)
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/sk/wmaker.1x b/doc/sk/wmaker.1
similarity index 95%
rename from doc/sk/wmaker.1x
rename to doc/sk/wmaker.1
index 4ad8cf0..9f1e981 100644
--- a/doc/sk/wmaker.1x
+++ b/doc/sk/wmaker.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH Window\ Maker 1x "August 1998"
+.TH Window\ Maker 1 "August 1998"
.SH MENO
wmaker \- mana��r okien pre X11 so vzh�adom NEXTSTEP
.SH SYNTAX
@@ -35,7 +35,7 @@ vyp
.TP
.B \-\-visual\-id
ur�enie ��sla obrazov�ho re�imu. Vi�
-.BR xdpyinfo (1x)
+.BR xdpyinfo (1)
pre zoznam obrazov�ch re�imov dostupn�ch na va�om display-i.
.TP
.B \-\-help
@@ -127,16 +127,16 @@ 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 X (7),
+.BR wdwrite (1),
+.BR wxcopy (1),
+.BR geticonset (1),
+.BR seticons (1),
+.BR wmaker (1),
+.BR wxpaste (1),
+.BR getstyle (1),
+.BR setstyle (1),
+.BR wmsetbg (1)
.SH AUTOR
Autormi Window Makera s� Alfredo K. Kojima <koj...@windowmaker.info>,
Dan Pascu <d...@windowmaker.info> s pomocou mnoh�ch �ud� z cel�ho Internetu.
diff --git a/doc/sk/wmsetbg.1x b/doc/sk/wmsetbg.1
similarity index 97%
rename from doc/sk/wmsetbg.1x
rename to doc/sk/wmsetbg.1
index 3376001..d808817 100644
--- a/doc/sk/wmsetbg.1x
+++ b/doc/sk/wmsetbg.1
@@ -1,5 +1,5 @@
.\" Hey, Emacs! This is an -*- nroff -*- source file.
-.TH wmsetbg 1x "January 1999"
+.TH wmsetbg 1 "January 1999"
.SH MENO
wmsetbg \- nastav� pozadie hlavn�ho okna v X11
.SH SYNTAX
@@ -57,7 +57,7 @@ vyp
.B \-\-version
vyp��e ��slo verzie
.SH POZRI TIE�
-.BR wmaker (1x)
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
wmsetbg nap�sal Dan Pascu <d...@windowmaker.info>
diff --git a/doc/sk/wxcopy.1x b/doc/sk/wxcopy.1
similarity index 94%
rename from doc/sk/wxcopy.1x
rename to doc/sk/wxcopy.1
index 75b9e84..59db852 100644
--- a/doc/sk/wxcopy.1x
+++ b/doc/sk/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 \- kop�ruje �tandardn� vstup do cutbuffera
.SH SYNOPSIS
@@ -31,8 +31,8 @@ vlo
namiesto pr�padnej existuj�cej selelekcie my�i.
.PP
.SH POZRI TIE�
-.BR wxpaste (1x),
-.BR wmaker (1x)
+.BR wxpaste (1),
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
diff --git a/doc/sk/wxpaste.1x b/doc/sk/wxpaste.1
similarity index 94%
rename from doc/sk/wxpaste.1x
rename to doc/sk/wxpaste.1
index 6f7a627..9c4f322 100644
--- a/doc/sk/wxpaste.1x
+++ b/doc/sk/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 MENO
wxpaste \- zap��e cutbuffer na �tandardn� v�stup
.SH SYNTAX
@@ -31,8 +31,8 @@ Typy selekci
podporovan� len jednoduch� text, �o by malo sta�i� pre v���inu u��vate�ov
takejto jednoduchej utilitky.
.SH POZRI TIE�
-.BR wxcopy (1x),
-.BR wmaker (1x)
+.BR wxcopy (1),
+.BR wmaker (1)
.SH AUTOR
Autorom Window Makera je Alfredo K. Kojima <koj...@windowmaker.info>.
.PP
http://repo.or.cz/w/wmaker-crm.git/commit/d6d165c29d899e75b0600da35fc4a41ddd6f6c91
commit d6d165c29d899e75b0600da35fc4a41ddd6f6c91
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sat May 23 17:19:31 2015 +0200
doc: do not install translated man pages if the language was not enabled in
LINGUAS
When people cherry-pick the languages they want to install, they certainly
do not care for man pages in other languages. So, instead of always
installing them, the configure script will now automatically detect which
ones need to be installed.
Took opportunity to add a section in the I18N manual to invite contributors
to think about the man pages if contribute to translations.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 500e33a..a79d68c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,7 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = build sk cs ru
+SUBDIRS = build @MANLANGDIRS@
+DIST_SUBDIRS = build cs ru sk
dist_man_MANS = \
geticonset.1 \
diff --git a/doc/build/Translations.texi b/doc/build/Translations.texi
index 427aec2..b2faa43 100644
--- a/doc/build/Translations.texi
+++ b/doc/build/Translations.texi
@@ -448,6 +448,31 @@ You may find some information on working with @code{po}
file in the
@uref{https://www.gnu.org/software/gettext/manual/html_node/Editing.html,GNU
gettext documentation}.
+@c ---------------------------------------------------------------------
Translate the Man Pages ---
+@section Translate the Man Pages
+
+You may want to extend the translation to the documentation that is provided
to users in the form
+of Unix @i{man pages}.
+The sources of the man pages are located in the @file{doc/} directory;
+the translation should be placed in the directory @file{doc/@i{lang}/} with
the same file name.
+
+The directory will also need a file @file{Makefile.am} which provides the list
of man pages to be
+included in the distribution package and to be installed.
+You can probably get inspiration from an existing one from another language;
+if you do not feel confident about it do not hesitate to ask on the project's
mailing list
+(@value{emailsupport}), either for help or to ask someone to make it for you.
+
+Please note that although most man pages sources are directly in man page
format
+(@emph{nroff}, the file extension being a number), a few of them are processed
by a script
+(those with the @file{.in} extension, like @file{wmaker.in}).
+This is done because in some case we want the man page to reflect the actual
compilation options.
+
+You may not want to bother with this hassle, in which case you can simply name
your translation
+file with the @file{.1} and remove the special @code{@@keyword@@} marks.
+If you are sure you want to keep that processing but do not feel confident
about hacking the
+@file{Makefile.am} do not hesitate to ask on the project's mailing list
(@value{emailsupport}).
+
+
@c -------------------------------------------------------------------------
Checking the Result ---
@section Checking the Result
diff --git a/m4/wm_i18n.m4 b/m4/wm_i18n.m4
index eb742e6..307481e 100644
--- a/m4/wm_i18n.m4
+++ b/m4/wm_i18n.m4
@@ -70,6 +70,7 @@ AS_IF([test "x$LINGUAS" != "x"],
wmaker_locales=" m4_esyscmd([ls po/ | sed -n '/po$/{s,.po,,;p}' | tr '\n'
' '])"
wprefs_locales=" m4_esyscmd([ls WPrefs.app/po/ | sed -n
'/po$/{s,.po,,;p}' | tr '\n' ' '])"
util_locales=" m4_esyscmd([ls util/po/ | sed -n '/po$/{s,.po,,;p}' | tr
'\n' ' '])"
+ man_locales=" m4_esyscmd([ls doc/ | grep '^[a-z][a-z]\(_[A-Z][A-Z]\)*$' |
tr '\n' ' '])"
# If the LINGUAS is specified as a simple '*', then we enable all the
languages
# we know. This is not standard, but it is useful is some cases
@@ -80,7 +81,7 @@ AS_IF([test "x$LINGUAS" != "x"],
for lang in $LINGUAS; do
found=0
wm_missing=""
- m4_foreach([REGION], [WINGs, wmaker, WPrefs, util],
+ m4_foreach([REGION], [WINGs, wmaker, WPrefs, util, man],
[AS_IF([echo "$[]m4_tolower(REGION)[]_locales" | grep " $lang " >
/dev/null],
[m4_toupper(REGION)MOFILES="$[]m4_toupper(REGION)MOFILES
$lang.mo"
found=1],
@@ -96,12 +97,17 @@ AS_IF([test "x$LINGUAS" != "x"],
[AC_MSG_WARN([locale $lang is not supported in
$wm_missing])]) ],
[AC_MSG_WARN([locale $lang is not supported at all, ignoring])])
done
+ #
+ # Post-processing the names for the man pages because we are not expecting
+ # a "po" file but a directory name in this case
+ MANLANGDIRS="`echo $MANMOFILES | sed -e 's,\.mo,,g' `"
],
[INTLIBS=""
WINGSMOFILES=""
WMAKERMOFILES=""
WPREFSMOFILES=""
UTILMOFILES=""
+ MANLANGDIRS=""
supported_locales=" disabled"])
dnl
dnl The variables that are used in the Makefiles:
@@ -110,6 +116,7 @@ AC_SUBST([WINGSMOFILES])dnl
AC_SUBST([WMAKERMOFILES])dnl
AC_SUBST([WPREFSMOFILES])dnl
AC_SUBST([UTILMOFILES])dnl
+AC_SUBST([MANLANGDIRS])dnl
])
http://repo.or.cz/w/wmaker-crm.git/commit/0a009143c32064d47dc857ec50e95116b7c5b6be
commit 0a009143c32064d47dc857ec50e95116b7c5b6be
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sat May 23 17:19:30 2015 +0200
util: improve the command line argument parsing in wmmenugen
The code ignored the last argument provided on the command line;
It did not support the recommended '--version' and '--help' from GNU which
are often handy;
It used an unusual syntax to specify the parser, now it can also use more
usual "-parser=name" and "-parser name", the old syntax is still supported
to avoid breaking compatibility;
When a problem is found with an argument, the program stops instead of
printing an error message and continuing;
There's been updates on the exit codes in case of problem because it is an
information that could be useful for people calling the program from a
script;
Took the opportunity to provide more information in the man page and to
get it cross-checked against the program's option list during "make check".
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 26187f5..500e33a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -49,7 +49,7 @@ am__v_CHKOPTS_0 = @echo " CHK $@" ;
am__v_CHKOPTS_1 =
check-local: 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
+ wdread-args wdwrite-args wmgenmenu-args wmmenugen-args wmsetbg-args
wxcopy-args wxpaste-args
wmaker-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
@@ -91,6 +91,10 @@ wmgenmenu-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
--program "$(top_builddir)/util/wmgenmenu" --man-page
"$(top_srcdir)/doc/wmgenmenu.1"
+wmmenugen-args:
+ $(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
+ --program "$(top_builddir)/util/wmmenugen" --man-page
"$(top_srcdir)/doc/wmmenugen.1"
+
wmsetbg-args:
$(AM_V_CHKOPTS)$(top_srcdir)/script/check-cmdline-options-doc.sh \
--program "$(top_builddir)/util/wmsetbg" --man-page "wmsetbg.1"
@@ -104,4 +108,4 @@ wxpaste-args:
--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
+ wdread-args wdwrite-args wmgenmenu-args wmmenugen-args wmsetbg-args
wxcopy-args wxpaste-args
diff --git a/doc/wmmenugen.1 b/doc/wmmenugen.1
index 4a9f588..1617648 100644
--- a/doc/wmmenugen.1
+++ b/doc/wmmenugen.1
@@ -1,22 +1,93 @@
-.TH "wmmenugen" "1" "15 August 2011"
+.TH "wmmenugen" "1" "16 May 2015"
.SH "NAME"
\fBwmmenugen\fR \- Window Maker PropList menu generator
.PP
.SH "SYNOPSIS"
-.B wmmenugen \fI\-parser:<parser> fspec \fR[ fpsec ... \fR]
-\fR[\fI\-parser:<parser> fspec \fR[ fpsec ... \fR] ... \fR]
-.PP
+.B wmmenugen
+.RI [ options ...]
+.BI \-parser= <name>
+.IR fspec " [" fspec "...]"
+.BI \fR[\fP\-parser= <name>
+.IR fspec " [" fspec "...]...]"
.SH "DESCRIPTION"
-\fBwmmenugen \fR\- Window Maker PropList menu generator
-.PP
+.B wmmenugen
+generates a menu in the
+.I PropList
+format for Window Maker from the input file
+.IR fspec .
+In the case where
+.I fspec
+is a directory instead of a file, then
+.B wmmenugen
+will read all the files present in the hierarchy of this directory.
.SH "OPTIONS"
.TP
+.BR \-\-help ", " \-h
+print a help message with the list of options
+.TP
.B \-parser
-\fRspecify the parser. Known parsers are xdg and wmconfig.
+specify the format of the file to be parsed
+.TP
+.B \-\-version
+print the version of Window Maker from which the program comes
+.SH "PARSERS"
+.B wmmenugen
+supports these file formats for input files:
+.TP
+.I wmconfig
+the format of the menu generation tool for X of the same name
.TP
-.B \-fspec
-\fRspecify the file.
+.I xdg
+the format of the menu specification as defined by the
+.I FreeDesktop
+standard, currently at version 1.1
+.SH "RETURN VALUE"
+The exit status from the
+.B wmmenugen
+command provides information for the caller:
+.TP
+.B 0
+when the
+.I PropList
+menu was successfully generated on
+.IR stdout .
+.TP
+.B 1
+when a
+.I fspec
+caused a problem (non readable file, ...)
+.TP
+.B 2
+the arguments of the command line where not recognised
+.TP
+.B 3
+the program met an unexpected menu structure;
+you probably want to look at the section
+.B BUGS
+below.
+.SH "BUGS"
+If you get the exit status
+.B 3
+with the unclear error message about
+.IR "unprocessed levels on the stack" ,
+you encountered a limitation of
+.BR wmmenugen .
+It would be a good idea to prepare an archive with the files incriminated and
submit them to the
+mailing list (wmaker-dev@lists.windowmaker.org) with you command line, so the
team can work on
+improving the behaviour of the program on this case.
+.SH "SEE ALSO"
+.BR wmgenmenu (1),
+the tool to generate a default menu
+.PP
+the
+.I Wmconfig
+program can be found at:
+<http://www.arrishq.net/index.html>
.PP
+the
+.I xdg
+specification can be found at:
+<http://standards.freedesktop.org/menu-spec/menu-spec-1.1.html>
.SH "AUTHOR"
wmmenugen is a part of Window Maker. It was written by Tamas TEVESZ.
.PP
diff --git a/util/wmmenugen.c b/util/wmmenugen.c
index 0c55d51..5839189 100644
--- a/util/wmmenugen.c
+++ b/util/wmmenugen.c
@@ -28,6 +28,7 @@
#include <string.h>
#include <strings.h>
#include <unistd.h>
+#include <errno.h>
#include "wmmenugen.h"
@@ -54,6 +55,35 @@ static const char *prog_name;
WMTreeNode *menu;
char *env_lang, *env_ctry, *env_enc, *env_mod;
+static void print_help(void)
+{
+ printf("Usage: %s -parser:<parser> fspec [fspec...]\n", prog_name);
+ puts("Dynamically generate a menu in Property List format for Window
Maker");
+ puts("");
+ puts(" -h, --help\t\tdisplay this help and exit");
+ puts(" -parser=<name>\tspecify the format of the input, see below");
+ puts(" --version\t\toutput version information and exit");
+ puts("");
+ puts("fspec: the file to be converted or the directory containing all
the menu files");
+ puts("");
+ puts("Known parsers:");
+ puts(" xdg\t\tDesktop Entry from FreeDesktop standard");
+ puts(" wmconfig\tfrom the menu generation tool by the same name");
+}
+
+#ifdef DEBUG
+static const char *get_parser_name(void)
+{
+ if (parse == &parse_xdg)
+ return "xdg";
+ if (parse == &parse_wmconfig)
+ return "wmconfig";
+
+ /* This case is not supposed to happen, but if it does it means that
someone to update this list */
+ return "<unknown>";
+}
+#endif
+
int main(int argc, char **argv)
{
struct stat st;
@@ -76,45 +106,69 @@ int main(int argc, char **argv)
parse_locale(NULL, &env_lang, &env_ctry, &env_enc, &env_mod);
terminal = find_terminal_emulator();
- if (argc < 3) {
- fprintf(stderr, "Usage: %s -parser:<parser> fspec [fpsec...] "
- "[-parser:<parser> fspec [fpsec...]...]\n", prog_name);
- fputs( "Known parsers: xdg wmconfig\n", stderr);
- return 1;
- }
-
- for (i = 1; i < argc; i++)
+ for (i = 1; i <= argc; i++)
{
- if (strncmp(argv[i], "-parser:", 8) == 0) {
- if (strcmp(argv[i] + 8, "xdg") == 0) {
-#if DEBUG
- fputs("Using parser \"xdg\"\n", stderr);
-#endif
+ if (strncmp(argv[i], "-parser", 7) == 0 &&
+ (argv[i][7] == '=' ||
+ argv[i][7] == ':' || /* for legacy compatibility */
+ argv[i][7] == '\0')) {
+ const char *name;
+
+ if (argv[i][7] == '\0') {
+ if (++i > argc) {
+ fprintf(stderr, "%s: Missing parser
name after \"-parser\"\n", prog_name);
+ return 2;
+ }
+ name = argv[i];
+ } else {
+ name = argv[i] + 8;
+ }
+
+ if (strcmp(name, "xdg") == 0) {
parse = &parse_xdg;
- } else if (strcmp(argv[i] + 8, "wmconfig") == 0) {
-#if DEBUG
- fputs("Using parser \"wmconfig\"\n", stderr);
-#endif
+ } else if (strcmp(name, "wmconfig") == 0) {
parse = &parse_wmconfig;
validateFilename = &wmconfig_validate_file;
} else {
- fprintf(stderr, "%s: Unknown parser \"%s\"\n",
prog_name, argv[i] + 8);
+ fprintf(stderr, "%s: Unknown parser \"%s\"\n",
prog_name, name);
+ return 2;
}
continue;
}
- if (parse) {
- if (stat(argv[i], &st) == -1) {
- fprintf(stderr, "%s: unable to stat \"%s\"\n",
prog_name, argv[i]);
- } else if (S_ISREG(st.st_mode)) {
- parse(argv[i], addWMMenuEntryCallback);
- } else if (S_ISDIR(st.st_mode)) {
- nftw(argv[i], dirParseFunc, 16, FTW_PHYS);
- } else {
- fprintf(stderr, "%s: \"%s\" is not a file or
directory\n", prog_name, argv[i]);
- }
- } else {
+ if (strcmp(argv[i], "--version") == 0) {
+ printf("%s (Window Maker %s)\n", prog_name, VERSION);
+ return 0;
+ }
+
+ if (strcmp(argv[i], "-h") == 0 ||
+ strcmp(argv[i], "-help") == 0 ||
+ strcmp(argv[i], "--help") == 0) {
+ print_help();
+ return 0;
+ }
+
+ if (parse == NULL) {
fprintf(stderr, "%s: argument \"%s\" with no valid
parser\n", prog_name, argv[i]);
+ return 2;
+ }
+
+#if DEBUG
+ fprintf(stderr, "%s: Using parser \"%s\" to process \"%s\"\n",
+ prog_name, get_parser_name(), argv[i]);
+#endif
+
+ if (stat(argv[i], &st) == -1) {
+ fprintf(stderr, "%s: unable to stat \"%s\", %s\n",
+ prog_name, argv[i], strerror(errno));
+ return 1;
+ } else if (S_ISREG(st.st_mode)) {
+ parse(argv[i], addWMMenuEntryCallback);
+ } else if (S_ISDIR(st.st_mode)) {
+ nftw(argv[i], dirParseFunc, 16, FTW_PHYS);
+ } else {
+ fprintf(stderr, "%s: \"%s\" is not a file or
directory\n", prog_name, argv[i]);
+ return 1;
}
}
@@ -129,16 +183,17 @@ int main(int argc, char **argv)
i = WMGetArrayItemCount(plMenuNodes);
if (i > 2) { /* more than one submenu unprocessed is almost certainly
an error */
fprintf(stderr, "%s: unprocessed levels on the stack.
fishy.\n", prog_name);
- return 1;
+ return 3;
} else if (i > 1 ) { /* possibly the top-level attachment is not yet
done */
WMPropList *first, *next;
+
next = WMPopFromArray(plMenuNodes);
first = WMPopFromArray(plMenuNodes);
WMAddToPLArray(first, next);
WMAddToArray(plMenuNodes, first);
}
- printf("%s\n", WMGetPropListDescription((WMPropList
*)WMGetFromArray(plMenuNodes, 0), True));
+ puts(WMGetPropListDescription((WMPropList *)WMGetFromArray(plMenuNodes,
0), True));
return 0;
}
http://repo.or.cz/w/wmaker-crm.git/commit/8088dc1eabb743a1dbd594cb0908234c0721d61c
commit 8088dc1eabb743a1dbd594cb0908234c0721d61c
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Sat May 23 17:19:29 2015 +0200
doc: changed section for man pages from 1x to 1
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>
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
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.am | 71 ++++++++++----------
doc/{WPrefs.1x => WPrefs.1} | 6 +-
doc/WindowMaker.1 | 1 +
doc/WindowMaker.1x | 1 -
doc/build/Translations.texi | 25 +++++++
doc/cs/Makefile.am | 18 ++---
doc/cs/{geticonset.1x => geticonset.1} | 6 +-
doc/cs/{getstyle.1x => getstyle.1} | 6 +-
doc/cs/{seticons.1x => seticons.1} | 6 +-
doc/cs/{setstyle.1x => setstyle.1} | 6 +-
doc/cs/{wdwrite.1x => wdwrite.1} | 4 +-
doc/cs/{wmaker.1x => wmaker.1} | 24 +++----
doc/cs/{wmsetbg.1x => wmsetbg.1} | 4 +-
doc/cs/{wxcopy.1x => wxcopy.1} | 6 +-
doc/cs/{wxpaste.1x => wxpaste.1} | 6 +-
doc/{geticonset.1x => geticonset.1} | 6 +-
doc/{getstyle.1x => getstyle.1} | 6 +-
doc/ru/Makefile.am | 18 ++---
doc/ru/{geticonset.1x => geticonset.1} | 6 +-
doc/ru/{getstyle.1x => getstyle.1} | 6 +-
doc/ru/{seticons.1x => seticons.1} | 6 +-
doc/ru/{setstyle.1x => setstyle.1} | 6 +-
doc/ru/{wdwrite.1x => wdwrite.1} | 4 +-
doc/ru/{wmaker.1x => wmaker.1} | 24 +++----
doc/ru/{wmsetbg.1x => wmsetbg.1} | 4 +-
doc/ru/{wxcopy.1x => wxcopy.1} | 6 +-
doc/ru/{wxpaste.1x => wxpaste.1} | 6 +-
doc/{seticons.1x => seticons.1} | 6 +-
doc/{setstyle.1x => setstyle.1} | 8 +--
doc/sk/Makefile.am | 18 ++---
doc/sk/{geticonset.1x => geticonset.1} | 6 +-
doc/sk/{getstyle.1x => getstyle.1} | 6 +-
doc/sk/{seticons.1x => seticons.1} | 6 +-
doc/sk/{setstyle.1x => setstyle.1} | 6 +-
doc/sk/{wdwrite.1x => wdwrite.1} | 4 +-
doc/sk/{wmaker.1x => wmaker.1} | 24 +++----
doc/sk/{wmsetbg.1x => wmsetbg.1} | 4 +-
doc/sk/{wxcopy.1x => wxcopy.1} | 6 +-
doc/sk/{wxpaste.1x => wxpaste.1} | 6 +-
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/wmmenugen.1 | 89 ++++++++++++++++++++++---
doc/wmsetbg.in | 4 +-
doc/{wxcopy.1x => wxcopy.1} | 6 +-
doc/{wxpaste.1x => wxpaste.1} | 6 +-
m4/wm_i18n.m4 | 9 ++-
util/wmmenugen.c | 117 ++++++++++++++++++++++++---------
51 files changed, 419 insertions(+), 244 deletions(-)
rename doc/{WPrefs.1x => WPrefs.1} (95%)
create mode 100644 doc/WindowMaker.1
delete mode 100644 doc/WindowMaker.1x
rename doc/cs/{geticonset.1x => geticonset.1} (93%)
rename doc/cs/{getstyle.1x => getstyle.1} (97%)
rename doc/cs/{seticons.1x => seticons.1} (93%)
rename doc/cs/{setstyle.1x => setstyle.1} (96%)
rename doc/cs/{wdwrite.1x => wdwrite.1} (95%)
rename doc/cs/{wmaker.1x => wmaker.1} (95%)
rename doc/cs/{wmsetbg.1x => wmsetbg.1} (97%)
rename doc/cs/{wxcopy.1x => wxcopy.1} (95%)
rename doc/cs/{wxpaste.1x => wxpaste.1} (95%)
rename doc/{geticonset.1x => geticonset.1} (93%)
rename doc/{getstyle.1x => getstyle.1} (97%)
rename doc/ru/{geticonset.1x => geticonset.1} (95%)
rename doc/ru/{getstyle.1x => getstyle.1} (98%)
rename doc/ru/{seticons.1x => seticons.1} (96%)
rename doc/ru/{setstyle.1x => setstyle.1} (97%)
rename doc/ru/{wdwrite.1x => wdwrite.1} (96%)
rename doc/ru/{wmaker.1x => wmaker.1} (96%)
rename doc/ru/{wmsetbg.1x => wmsetbg.1} (98%)
rename doc/ru/{wxcopy.1x => wxcopy.1} (97%)
rename doc/ru/{wxpaste.1x => wxpaste.1} (97%)
rename doc/{seticons.1x => seticons.1} (94%)
rename doc/{setstyle.1x => setstyle.1} (95%)
rename doc/sk/{geticonset.1x => geticonset.1} (92%)
rename doc/sk/{getstyle.1x => getstyle.1} (97%)
rename doc/sk/{seticons.1x => seticons.1} (93%)
rename doc/sk/{setstyle.1x => setstyle.1} (96%)
rename doc/sk/{wdwrite.1x => wdwrite.1} (94%)
rename doc/sk/{wmaker.1x => wmaker.1} (95%)
rename doc/sk/{wmsetbg.1x => wmsetbg.1} (97%)
rename doc/sk/{wxcopy.1x => wxcopy.1} (94%)
rename doc/sk/{wxpaste.1x => wxpaste.1} (94%)
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%)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
