aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Kinnunen <fluxgen at fluxbox dot org>2011-02-20 14:49:05 (GMT)
committerHenrik Kinnunen <fluxgen at fluxbox dot org>2011-02-20 14:49:05 (GMT)
commitbf9fb893daa0963694fee27cea60021dcf364f24 (patch)
tree17870c39b30b72ed7beb6965f66a777f828e3128
parent34bf3b4833bcded73646ee5c702dfae52fb8f86b (diff)
parent0a330107e6855aaafafbe1f805092e2689d6cdc7 (diff)
downloadfluxbox-bf9fb893daa0963694fee27cea60021dcf364f24.zip
fluxbox-bf9fb893daa0963694fee27cea60021dcf364f24.tar.bz2
Merge branch 'master' of ssh://git.fluxbox.org/fluxbox
-rw-r--r--ChangeLog16
-rw-r--r--doc/asciidoc/client-patterns.txt2
-rw-r--r--doc/fluxbox-apps.5.in2
-rw-r--r--doc/fluxbox-keys.5.in2
4 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c0e8064..3056408 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.1.2 2
3Changes for 1.3.1
4*11/02/20:
5 * Spelling fixes (thanks Paul)
6
7-----------------------------
8Changes for 1.3.0
9
10*11/02/19:
11
12 * Readded default style to data/init (Henrik)
13
14*11/02/15:
15
16 * updated pt_BR translations (thanks to Sergia Cipolla)
3 17
4*11/02/03: 18*11/02/03:
5 19
diff --git a/doc/asciidoc/client-patterns.txt b/doc/asciidoc/client-patterns.txt
index addb12e..5bb50a0 100644
--- a/doc/asciidoc/client-patterns.txt
+++ b/doc/asciidoc/client-patterns.txt
@@ -66,7 +66,7 @@ The following values are accepted for 'propertyname':::
66 *AboveDock*, *Dock*, *Top*, *Normal*, *Bottom*, *Desktop* 66 *AboveDock*, *Dock*, *Top*, *Normal*, *Bottom*, *Desktop*
67*Screen*;; 67*Screen*;;
68 The number of the currently used 'screen'. If the setup of the 68 The number of the currently used 'screen'. If the setup of the
69 running xserver involves independant screens ('not Xinerama'), the $DISPLAY 69 running xserver involves independent screens ('not Xinerama'), the $DISPLAY
70 environment contains something like ':0.1' or ':1.0'. The part after the 70 environment contains something like ':0.1' or ':1.0'. The part after the
71 dot ('.') is the number of the screen. 71 dot ('.') is the number of the screen.
72*@XPROP*;; 72*@XPROP*;;
diff --git a/doc/fluxbox-apps.5.in b/doc/fluxbox-apps.5.in
index cf57ba6..6ffa0e1 100644
--- a/doc/fluxbox-apps.5.in
+++ b/doc/fluxbox-apps.5.in
@@ -430,7 +430,7 @@ The string name of the window\(cqs layer, which is one of
430\fBScreen\fR 430\fBScreen\fR
431.RS 4 431.RS 4
432The number of the currently used 432The number of the currently used
433\fIscreen\fR\&. If the setup of the running xserver involves independant screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like 433\fIscreen\fR\&. If the setup of the running xserver involves independent screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like
434\fI:0\&.1\fR 434\fI:0\&.1\fR
435or 435or
436\fI:1\&.0\fR\&. The part after the dot (\fI\&.\fR) is the number of the screen\&. 436\fI:1\&.0\fR\&. The part after the dot (\fI\&.\fR) is the number of the screen\&.
diff --git a/doc/fluxbox-keys.5.in b/doc/fluxbox-keys.5.in
index 2190917..07b3434 100644
--- a/doc/fluxbox-keys.5.in
+++ b/doc/fluxbox-keys.5.in
@@ -1111,7 +1111,7 @@ The string name of the window\(cqs layer, which is one of
1111\fBScreen\fR 1111\fBScreen\fR
1112.RS 4 1112.RS 4
1113The number of the currently used 1113The number of the currently used
1114\fIscreen\fR\&. If the setup of the running xserver involves independant screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like 1114\fIscreen\fR\&. If the setup of the running xserver involves independent screens (\fInot Xinerama\fR), the $DISPLAY environment contains something like
1115\fI:0\&.1\fR 1115\fI:0\&.1\fR
1116or 1116or
1117\fI:1\&.0\fR\&. The part after the dot (\fI\&.\fR) is the number of the screen\&. 1117\fI:1\&.0\fR\&. The part after the dot (\fI\&.\fR) is the number of the screen\&.