aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2011-10-28 19:09:05 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-10-28 19:09:05 (GMT)
commit1ba4fbe8785a7acf3c4cab6de556929e8f5375b9 (patch)
tree976dd48f176d21eae6182ca59320492140fbb971
parent05d3c55763afdbe3a1939b56cfbf78647d7f44a0 (diff)
downloadfluxbox-1ba4fbe8785a7acf3c4cab6de556929e8f5375b9.zip
fluxbox-1ba4fbe8785a7acf3c4cab6de556929e8f5375b9.tar.bz2
Prepare 1.3.2 releaseRelease-1_3_2
-rw-r--r--BUGS9
-rw-r--r--NEWS34
-rw-r--r--configure.in2
-rw-r--r--doc/asciidoc/fbsetbg.txt2
-rw-r--r--doc/asciidoc/fbsetroot.txt2
-rw-r--r--doc/asciidoc/fluxbox-apps.txt2
-rw-r--r--doc/asciidoc/fluxbox-keys.txt2
-rw-r--r--doc/asciidoc/fluxbox-menu.txt2
-rw-r--r--doc/asciidoc/fluxbox-style.txt2
-rw-r--r--doc/asciidoc/fluxbox.txt2
-rw-r--r--doc/asciidoc/startfluxbox.txt2
-rw-r--r--doc/fbsetbg.1.in4
-rw-r--r--doc/fbsetroot.1.in4
-rw-r--r--doc/fluxbox-apps.5.in4
-rw-r--r--doc/fluxbox-keys.5.in4
-rw-r--r--doc/fluxbox-menu.5.in4
-rw-r--r--doc/fluxbox-style.5.in4
-rw-r--r--doc/fluxbox.1.in18
-rw-r--r--doc/startfluxbox.1.in6
19 files changed, 53 insertions, 56 deletions
diff --git a/BUGS b/BUGS
deleted file mode 100644
index 307abe6..0000000
--- a/BUGS
+++ /dev/null
@@ -1,9 +0,0 @@
1Known bugs and missing features that will be fixed in future version:
2
3BUGS:
4
5 * "My window (e.g. mplayer/xmms) stops updating with non-opaque
6 window moving.
7 - Current implementation of outline moving does this, it's not a bug.
8
9
diff --git a/NEWS b/NEWS
index 2615e71..160b02f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,18 +1,24 @@
1This is mostly a bug fix release. For a more complete list and detailed 1This is mostly a bug fix release. For a more complete list and detailed
2description of them see the documention and ChangeLog. 2description of them see the documentation and ChangeLog.
3 3
4Critical Bugfixes in 1.3.1: 4General:
5 * Fix for not hiding submenus if menuDelay is set. 5 * Supprot for ARG32 visuals (cairo-dock etc)
6 * Fix crash when moving transient windows (Dialogs) between Workspaces, 6 * Support for VPATH builds
7 #3088856. 7 * Updated translations
8 * Fix crash when SystemTray was rotated 90/270°, #3188223. 8 * Removed Gnome window manager hints
9 * Fix potential crash when gettting an UnmapEvent before a FocusEvent. 9 * Relicense 'ostrich' theme
10 * Fix potential crash on accessing NULL-pointer. 10 * Support CARDINAL for client pattern
11
12Other Bugfixes:
13 * Fix wrong width calculation of Systemtray, #3150939.
14 * Fix initial placement of WindowMenu, #2731524.
15 * Fix incorrectly shown alpha values in Menus, #3187373.
16 * Fix render 'sunken' Textures correctly.
17 11
12Critical Bugfixes in 1.3.2:
13 * Crash at SIGINT / exit
14 * Signal/Slot related crashes on exit
15 * Sync bootstraped config files to disk before launching
16 * Don't warp workspaces on single workspaces
17 * Crash on Sparc64, #3285968
18 * Crash when using ClientMenu after changing the client, #3210493
18 19
20Other Bugfixes:
21 * Remap keysyms to keycodes after 'MappingNotify' (setxkbmap, xmodmap), #3386257
22 * Use _NET_WM_ICON correctly, #1852693
23 * Compile fixes for Clang, SunStudio, gcc-4.6.x
24 * Updated 'bloe' and 'arch' styles to work without XPM support
diff --git a/configure.in b/configure.in
index e75e51f..6e4a53c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
1dnl Initialize autoconf and automake 1dnl Initialize autoconf and automake
2AC_INIT(src/main.cc) 2AC_INIT(src/main.cc)
3AC_PREREQ(2.52) 3AC_PREREQ(2.52)
4AM_INIT_AUTOMAKE(fluxbox,1.3.1, no-define) 4AM_INIT_AUTOMAKE(fluxbox,1.3.2, no-define)
5 5
6dnl Determine default prefix 6dnl Determine default prefix
7test x$prefix = "xNONE" && prefix="$ac_default_prefix" 7test x$prefix = "xNONE" && prefix="$ac_default_prefix"
diff --git a/doc/asciidoc/fbsetbg.txt b/doc/asciidoc/fbsetbg.txt
index 307158c..547cf58 100644
--- a/doc/asciidoc/fbsetbg.txt
+++ b/doc/asciidoc/fbsetbg.txt
@@ -1,7 +1,7 @@
1fbsetbg(1) 1fbsetbg(1)
2========== 2==========
3Jim Ramsay <i.am@jimramsay.com> 3Jim Ramsay <i.am@jimramsay.com>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: fbsetbg.txt 5:man source: fbsetbg.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/asciidoc/fbsetroot.txt b/doc/asciidoc/fbsetroot.txt
index 32748c8..5e7c840 100644
--- a/doc/asciidoc/fbsetroot.txt
+++ b/doc/asciidoc/fbsetroot.txt
@@ -1,7 +1,7 @@
1fbsetroot(1) 1fbsetroot(1)
2============ 2============
3Jim Ramsay <i.am@jimramsay.com> 3Jim Ramsay <i.am@jimramsay.com>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: fbsetroot.txt 5:man source: fbsetroot.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox-apps.txt b/doc/asciidoc/fluxbox-apps.txt
index 1b61eb4..26f560b 100644
--- a/doc/asciidoc/fluxbox-apps.txt
+++ b/doc/asciidoc/fluxbox-apps.txt
@@ -1,7 +1,7 @@
1fluxbox-apps(5) 1fluxbox-apps(5)
2=============== 2===============
3Jim Ramsay <i.am@jimramsay.com> 3Jim Ramsay <i.am@jimramsay.com>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: fluxbox-apps.txt 5:man source: fluxbox-apps.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox-keys.txt b/doc/asciidoc/fluxbox-keys.txt
index 60d6e6f..2679bc0 100644
--- a/doc/asciidoc/fluxbox-keys.txt
+++ b/doc/asciidoc/fluxbox-keys.txt
@@ -1,7 +1,7 @@
1fluxbox-keys(5) 1fluxbox-keys(5)
2=============== 2===============
3Jim Ramsay <i.am@jimramsay.com> 3Jim Ramsay <i.am@jimramsay.com>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: fluxbox-keys.txt 5:man source: fluxbox-keys.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox-menu.txt b/doc/asciidoc/fluxbox-menu.txt
index f6b940d..bb7f2e4 100644
--- a/doc/asciidoc/fluxbox-menu.txt
+++ b/doc/asciidoc/fluxbox-menu.txt
@@ -1,7 +1,7 @@
1fluxbox-menu(5) 1fluxbox-menu(5)
2=============== 2===============
3Jim Ramsay <i.am@jimramsay.com> 3Jim Ramsay <i.am@jimramsay.com>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: fluxbox-menu.txt 5:man source: fluxbox-menu.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox-style.txt b/doc/asciidoc/fluxbox-style.txt
index b193a8f..c41937e 100644
--- a/doc/asciidoc/fluxbox-style.txt
+++ b/doc/asciidoc/fluxbox-style.txt
@@ -1,7 +1,7 @@
1fluxbox-style(5) 1fluxbox-style(5)
2================ 2================
3Henrik Kinnunen <fluxgen@fluxbox.org> 3Henrik Kinnunen <fluxgen@fluxbox.org>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: fluxbox-style.txt 5:man source: fluxbox-style.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index ea740df..fab73d9 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -1,7 +1,7 @@
1fluxbox(1) 1fluxbox(1)
2========== 2==========
3Henrik Kinnunen <fluxgen@fluxbox.org> 3Henrik Kinnunen <fluxgen@fluxbox.org>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: fluxbox.txt 5:man source: fluxbox.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/asciidoc/startfluxbox.txt b/doc/asciidoc/startfluxbox.txt
index 672ea15..cd13ca6 100644
--- a/doc/asciidoc/startfluxbox.txt
+++ b/doc/asciidoc/startfluxbox.txt
@@ -1,7 +1,7 @@
1startfluxbox(1) 1startfluxbox(1)
2=============== 2===============
3Jim Ramsay <i.am@jimramsay.com> 3Jim Ramsay <i.am@jimramsay.com>
4v1.3.1, 27 February 2011 4v1.3.2, 28 October 2011
5:man source: startfluxbox.txt 5:man source: startfluxbox.txt
6:man version: {revision} 6:man version: {revision}
7:man manual: Fluxbox Manual 7:man manual: Fluxbox Manual
diff --git a/doc/fbsetbg.1.in b/doc/fbsetbg.1.in
index 737c10b..c897307 100644
--- a/doc/fbsetbg.1.in
+++ b/doc/fbsetbg.1.in
@@ -2,12 +2,12 @@
2.\" Title: fbsetbg 2.\" Title: fbsetbg
3.\" Author: Jim Ramsay <i.am@jimramsay.com> 3.\" Author: Jim Ramsay <i.am@jimramsay.com>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: fbsetbg.txt 7.\" Source: fbsetbg.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "FBSETBG" "1" "27 February 2011" "fbsetbg\&.txt" "Fluxbox Manual" 10.TH "FBSETBG" "1" "28 October 2011" "fbsetbg\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
diff --git a/doc/fbsetroot.1.in b/doc/fbsetroot.1.in
index 5ae0f1f..c76261b 100644
--- a/doc/fbsetroot.1.in
+++ b/doc/fbsetroot.1.in
@@ -2,12 +2,12 @@
2.\" Title: fbsetroot 2.\" Title: fbsetroot
3.\" Author: Jim Ramsay <i.am@jimramsay.com> 3.\" Author: Jim Ramsay <i.am@jimramsay.com>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: fbsetroot.txt 7.\" Source: fbsetroot.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "FBSETROOT" "1" "27 February 2011" "fbsetroot\&.txt" "Fluxbox Manual" 10.TH "FBSETROOT" "1" "28 October 2011" "fbsetroot\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
diff --git a/doc/fluxbox-apps.5.in b/doc/fluxbox-apps.5.in
index 8101863..88b947c 100644
--- a/doc/fluxbox-apps.5.in
+++ b/doc/fluxbox-apps.5.in
@@ -2,12 +2,12 @@
2.\" Title: fluxbox-apps 2.\" Title: fluxbox-apps
3.\" Author: Jim Ramsay <i.am@jimramsay.com> 3.\" Author: Jim Ramsay <i.am@jimramsay.com>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: fluxbox-apps.txt 7.\" Source: fluxbox-apps.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "FLUXBOX\-APPS" "5" "27 February 2011" "fluxbox\-apps\&.txt" "Fluxbox Manual" 10.TH "FLUXBOX\-APPS" "5" "28 October 2011" "fluxbox\-apps\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
diff --git a/doc/fluxbox-keys.5.in b/doc/fluxbox-keys.5.in
index 19377a7..50b79d8 100644
--- a/doc/fluxbox-keys.5.in
+++ b/doc/fluxbox-keys.5.in
@@ -2,12 +2,12 @@
2.\" Title: fluxbox-keys 2.\" Title: fluxbox-keys
3.\" Author: Jim Ramsay <i.am@jimramsay.com> 3.\" Author: Jim Ramsay <i.am@jimramsay.com>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: fluxbox-keys.txt 7.\" Source: fluxbox-keys.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "FLUXBOX\-KEYS" "5" "27 February 2011" "fluxbox\-keys\&.txt" "Fluxbox Manual" 10.TH "FLUXBOX\-KEYS" "5" "28 October 2011" "fluxbox\-keys\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
diff --git a/doc/fluxbox-menu.5.in b/doc/fluxbox-menu.5.in
index 74e8ce0..64eea31 100644
--- a/doc/fluxbox-menu.5.in
+++ b/doc/fluxbox-menu.5.in
@@ -2,12 +2,12 @@
2.\" Title: fluxbox-menu 2.\" Title: fluxbox-menu
3.\" Author: Jim Ramsay <i.am@jimramsay.com> 3.\" Author: Jim Ramsay <i.am@jimramsay.com>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: fluxbox-menu.txt 7.\" Source: fluxbox-menu.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "FLUXBOX\-MENU" "5" "27 February 2011" "fluxbox\-menu\&.txt" "Fluxbox Manual" 10.TH "FLUXBOX\-MENU" "5" "28 October 2011" "fluxbox\-menu\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
diff --git a/doc/fluxbox-style.5.in b/doc/fluxbox-style.5.in
index ccaa6cb..f4dfb61 100644
--- a/doc/fluxbox-style.5.in
+++ b/doc/fluxbox-style.5.in
@@ -2,12 +2,12 @@
2.\" Title: fluxbox-style 2.\" Title: fluxbox-style
3.\" Author: Henrik Kinnunen <fluxgen@fluxbox.org> 3.\" Author: Henrik Kinnunen <fluxgen@fluxbox.org>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: fluxbox-style.txt 7.\" Source: fluxbox-style.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "FLUXBOX\-STYLE" "5" "27 February 2011" "fluxbox\-style\&.txt" "Fluxbox Manual" 10.TH "FLUXBOX\-STYLE" "5" "28 October 2011" "fluxbox\-style\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in
index 79d57c1..b78c918 100644
--- a/doc/fluxbox.1.in
+++ b/doc/fluxbox.1.in
@@ -2,12 +2,12 @@
2.\" Title: fluxbox 2.\" Title: fluxbox
3.\" Author: Henrik Kinnunen <fluxgen@fluxbox.org> 3.\" Author: Henrik Kinnunen <fluxgen@fluxbox.org>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: fluxbox.txt 7.\" Source: fluxbox.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "FLUXBOX" "1" "27 February 2011" "fluxbox\&.txt" "Fluxbox Manual" 10.TH "FLUXBOX" "1" "28 October 2011" "fluxbox\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
@@ -1383,7 +1383,7 @@ Users are free to manually edit the slitlist file\&. It is a simple list of wind
1383The user also has the option of choosing a different path for the slitlist file, by setting the \fBsession\&.session0\&.slitlistFile\fR resource\&. 1383The user also has the option of choosing a different path for the slitlist file, by setting the \fBsession\&.session0\&.slitlistFile\fR resource\&.
1384.SH "LAYERS" 1384.SH "LAYERS"
1385.sp 1385.sp
1386Layers affect the way that windows will overlap each other on the screen\&. Windows on a higher layer will always appear above those on a lower one, whether they are focused or not\&. By default, fluxbox uses 13 layers, starting from 1 (highest)\&. The total number of layers can be changed by using the \fBsession\&.numLayers\fR resource\&. 1386Layers affect the way that windows will overlap each other on the screen\&. Windows on a higher layer will always appear above those on a lower one, whether they are focused or not\&. Fluxbox uses 13 layers, starting from 1 (highest)\&.
1387.sp 1387.sp
1388There are two ways to assign a window to a different layer\&. When the window is open, you may select the layer in the \(oqLayer \&...\(cq submenu of the window menu\&. The menu gives six choices for the layer, which fluxbox manages by name\&. The names are (from highest to lowest layer): 1388There are two ways to assign a window to a different layer\&. When the window is open, you may select the layer in the \(oqLayer \&...\(cq submenu of the window menu\&. The menu gives six choices for the layer, which fluxbox manages by name\&. The names are (from highest to lowest layer):
1389.sp 1389.sp
@@ -1506,7 +1506,7 @@ Possible options are:
1506.RE 1506.RE
1507.sp 1507.sp
1508Slit default: 1508Slit default:
1509\fBTopRight\fR 1509\fBRightBottom\fR
1510.sp 1510.sp
1511Toolbar default: 1511Toolbar default:
1512\fBBottomCenter\fR 1512\fBBottomCenter\fR
@@ -1674,7 +1674,7 @@ This adjusts the way the current time is displayed in the toolbar\&. The
1674format is used\&. 1674format is used\&.
1675.sp 1675.sp
1676Default: 1676Default:
1677\fB%I:%M %p\fR 1677\fB%k:%M\fR
1678.RE 1678.RE
1679.PP 1679.PP
1680\fBsession\&.screen0\&.tabs\&.intitlebar\fR: \fIboolean\fR 1680\fBsession\&.screen0\&.tabs\&.intitlebar\fR: \fIboolean\fR
@@ -1747,7 +1747,7 @@ Default:
1747Setting this resource to True shows the user, in a little window, the exact position of the application window while the user is dragging it\&. Allows a precise placement of windows on a screen\&. 1747Setting this resource to True shows the user, in a little window, the exact position of the application window while the user is dragging it\&. Allows a precise placement of windows on a screen\&.
1748.sp 1748.sp
1749Default: 1749Default:
1750\fBTrue\fR 1750\fBFalse\fR
1751.RE 1751.RE
1752.PP 1752.PP
1753\fBsession\&.screen0\&.defaultDeco\fR: \fIstring\fR 1753\fBsession\&.screen0\&.defaultDeco\fR: \fIstring\fR
@@ -1782,7 +1782,7 @@ Default:
1782Here is where the user can name their workspaces, in a comma\-delimited list\&. However it is recommended to use the tool available in the Workspace Menu to set these\&. 1782Here is where the user can name their workspaces, in a comma\-delimited list\&. However it is recommended to use the tool available in the Workspace Menu to set these\&.
1783.sp 1783.sp
1784Default: 1784Default:
1785\fBone, two, three, four\fR 1785\fBWorkspace 1, Workspace 2, Workspace 3, Workspace 4\fR
1786.RE 1786.RE
1787.PP 1787.PP
1788\fBsession\&.screen0\&.edgeSnapThreshold\fR: \fIinteger\fR 1788\fBsession\&.screen0\&.edgeSnapThreshold\fR: \fIinteger\fR
@@ -1969,7 +1969,7 @@ The available options are:
1969.RE 1969.RE
1970.sp 1970.sp
1971Default left: 1971Default left:
1972\fBStick MenuIcon\fR 1972\fBStick\fR
1973.sp 1973.sp
1974Default right: 1974Default right:
1975\fBShade Minimize Maximize Close\fR 1975\fBShade Minimize Maximize Close\fR
@@ -2028,6 +2028,7 @@ for details\&.
2028Location of the style overlay file\&. See 2028Location of the style overlay file\&. See
2029\fBfluxbox\-style(5)\fR 2029\fBfluxbox\-style(5)\fR
2030for details\&. 2030for details\&.
2031.RE
2031.PP 2032.PP
2032\fBsession\&.screen0\&.windowMenu\fR: \fIlocation\fR 2033\fBsession\&.screen0\&.windowMenu\fR: \fIlocation\fR
2033.RS 4 2034.RS 4
@@ -2037,7 +2038,6 @@ This optionally specifies the location of a user\-defined window menu\&. If left
2037Default: 2038Default:
2038\fBblank\fR 2039\fBblank\fR
2039.RE 2040.RE
2040.RE
2041.SH "ENVIRONMENT" 2041.SH "ENVIRONMENT"
2042.PP 2042.PP
2043\fBHOME\fR 2043\fBHOME\fR
diff --git a/doc/startfluxbox.1.in b/doc/startfluxbox.1.in
index 59b6694..9356f9e 100644
--- a/doc/startfluxbox.1.in
+++ b/doc/startfluxbox.1.in
@@ -2,12 +2,12 @@
2.\" Title: startfluxbox 2.\" Title: startfluxbox
3.\" Author: Jim Ramsay <i.am@jimramsay.com> 3.\" Author: Jim Ramsay <i.am@jimramsay.com>
4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> 4.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
5.\" Date: 27 February 2011 5.\" Date: 28 October 2011
6.\" Manual: Fluxbox Manual 6.\" Manual: Fluxbox Manual
7.\" Source: startfluxbox.txt 7.\" Source: startfluxbox.txt
8.\" Language: English 8.\" Language: English
9.\" 9.\"
10.TH "STARTFLUXBOX" "1" "27 February 2011" "startfluxbox\&.txt" "Fluxbox Manual" 10.TH "STARTFLUXBOX" "1" "28 October 2011" "startfluxbox\&.txt" "Fluxbox Manual"
11.\" ----------------------------------------------------------------- 11.\" -----------------------------------------------------------------
12.\" * Define some portability stuff 12.\" * Define some portability stuff
13.\" ----------------------------------------------------------------- 13.\" -----------------------------------------------------------------
@@ -103,7 +103,7 @@ wait $fbpid
103.sp 103.sp
104So xsetroot, ipager, and gkrellm2 will all be started after fluxbox, after giving fluxbox 1 second to startup\&. 104So xsetroot, ipager, and gkrellm2 will all be started after fluxbox, after giving fluxbox 1 second to startup\&.
105.sp 105.sp
106For more details on what else you can do in this script, see \fBsh(1p)\fR, or the documentation for your shell\&. 106For more details on what else you can do in this script, see \fBsh(1)\fR, or the documentation for your shell\&.
107.SH "AUTHORS" 107.SH "AUTHORS"
108.sp 108.sp
109The author of \fBstartfluxbox(1)\fR is Han Boetes <han at fluxbox\&.org> 109The author of \fBstartfluxbox(1)\fR is Han Boetes <han at fluxbox\&.org>