Merge branch 'master' of ssh://git.fluxbox.org/fluxbox
Henrik Kinnunen fluxgen at fluxbox dot org
4 files changed,
18 insertions(+),
4 deletions(-)
M
ChangeLog
→
ChangeLog
@@ -1,5 +1,19 @@
(Format: Year/Month/Day) -Changes for 1.1.2 + +Changes for 1.3.1 +*11/02/20: + * Spelling fixes (thanks Paul) + +----------------------------- +Changes for 1.3.0 + +*11/02/19: + + * Readded default style to data/init (Henrik) + +*11/02/15: + + * updated pt_BR translations (thanks to Sergia Cipolla) *11/02/03:
M
doc/asciidoc/client-patterns.txt
→
doc/asciidoc/client-patterns.txt
@@ -66,7 +66,7 @@ The string name of the window's layer, which is one of
*AboveDock*, *Dock*, *Top*, *Normal*, *Bottom*, *Desktop* *Screen*;; The number of the currently used 'screen'. If the setup of the - running xserver involves independant screens ('not Xinerama'), the $DISPLAY + running xserver involves independent screens ('not Xinerama'), the $DISPLAY environment contains something like ':0.1' or ':1.0'. The part after the dot ('.') is the number of the screen. *@XPROP*;;
M
doc/fluxbox-apps.5.in
→
doc/fluxbox-apps.5.in
@@ -430,7 +430,7 @@ .PP
\fBScreen\fR .RS 4 The number of the currently used -\fIscreen\fR\&. If the setup of the running xserver involves independant screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like +\fIscreen\fR\&. If the setup of the running xserver involves independent screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like \fI:0\&.1\fR or \fI:1\&.0\fR\&. The part after the dot (\fI\&.\fR) is the number of the screen\&.
M
doc/fluxbox-keys.5.in
→
doc/fluxbox-keys.5.in
@@ -1111,7 +1111,7 @@ .PP
\fBScreen\fR .RS 4 The number of the currently used -\fIscreen\fR\&. If the setup of the running xserver involves independant screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like +\fIscreen\fR\&. If the setup of the running xserver involves independent screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like \fI:0\&.1\fR or \fI:1\&.0\fR\&. The part after the dot (\fI\&.\fR) is the number of the screen\&.