nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.fluxbox.org/fluxbox

Browse source
This commit is contained in:
Henrik Kinnunen 2011-02-20 15:49:05 +01:00
commit bf9fb893da
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -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:

2
doc/asciidoc/client-patterns.txt
View file

@ -66,7 +66,7 @@ The following values are accepted for 'propertyname':::
*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*;;

2
doc/fluxbox-apps.5.in
View file

@ -430,7 +430,7 @@ The string name of the window\(cqs layer, which is one of
\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\&.

2
doc/fluxbox-keys.5.in
View file

@ -1111,7 +1111,7 @@ The string name of the window\(cqs layer, which is one of
\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\&.