aboutsummaryrefslogtreecommitdiff
path: root/doc/asciidoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/asciidoc')
-rw-r--r--doc/asciidoc/Makefile4
-rw-r--r--doc/asciidoc/fluxbox-style.txt (renamed from doc/asciidoc/fluxstyle.txt)8
-rw-r--r--doc/asciidoc/fluxbox.txt12
3 files changed, 14 insertions, 10 deletions
diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile
index e116a23..646d415 100644
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@@ -2,8 +2,8 @@
2# create manpages from the asciidoc files 2# create manpages from the asciidoc files
3# 3#
4 4
5SRC1 = fluxbox.txt fluxstyle.txt fluxbox-keys.txt fluxbox-remote.txt 5SRC1 = fluxbox.txt fluxbox-keys.txt fluxbox-remote.txt
6SRC5 = fluxbox-keys.txt fluxbox-apps.txt 6SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt
7 7
8MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5) 8MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
9 9
diff --git a/doc/asciidoc/fluxstyle.txt b/doc/asciidoc/fluxbox-style.txt
index 221507d..ce1d264 100644
--- a/doc/asciidoc/fluxstyle.txt
+++ b/doc/asciidoc/fluxbox-style.txt
@@ -1,14 +1,14 @@
1fluxstyle(1) 1fluxbox-style(5)
2============ 2================
3Henrik Kinnunen <fluxgen@fluxbox.org> 3Henrik Kinnunen <fluxgen@fluxbox.org>
4v1.1.1, 10 February 2009 4v1.1.1, 10 February 2009
5:man source: fluxstyle.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
8 8
9NAME 9NAME
10---- 10----
11fluxstyle - A comprehensive look at styles/themes for fluxbox(1). 11fluxbox-style - A comprehensive look at styles/themes for fluxbox(1).
12 12
13SYNOPSIS 13SYNOPSIS
14-------- 14--------
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index e13647a..eb463dc 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -196,6 +196,9 @@ default, tabs are located just above the window, but they may be embedded in the
196titlebar or moved to other locations on the outside of the window. Configuration 196titlebar or moved to other locations on the outside of the window. Configuration
197is discussed in TAB OPTIONS section. 197is discussed in TAB OPTIONS section.
198 198
199You can also set up automatic grouping using the `apps' file. See *GROUP
200SECTIONS* in fluxbox-apps(5) for details.
201
199MENUS 202MENUS
200----- 203-----
201fluxbox installs a default menu file in @pkgdatadir@/menu. You can also use 204fluxbox installs a default menu file in @pkgdatadir@/menu. You can also use
@@ -238,7 +241,7 @@ if not all, of those here.
238 ~/.fluxbox/styles This is the location where you will store new styles 241 ~/.fluxbox/styles This is the location where you will store new styles
239 that you grab from the Internet. If you create your own styles this is 242 that you grab from the Internet. If you create your own styles this is
240 also where you will put yours (provided that you follow the 'standards' 243 also where you will put yours (provided that you follow the 'standards'
241 described in fluxstyle(1)). 244 described in fluxbox-style(5)).
242 245
243- *Workspace List*: 246- *Workspace List*:
244 This is a list of the workspaces configured in your `init' file. If there 247 This is a list of the workspaces configured in your `init' file. If there
@@ -1033,14 +1036,14 @@ specify colors, textures, pixmaps and fonts, and thus the overall look of your
1033window borders, menus and the toolbar. 1036window borders, menus and the toolbar.
1034 1037
1035The default installation of fluxbox provides some of these style files. See 1038The default installation of fluxbox provides some of these style files. See
1036fluxstyle(1) to accommodate the growing number of style components. 1039fluxbox-style(5) to accommodate the growing number of style components.
1037 1040
1038STYLE OVERLAY 1041STYLE OVERLAY
1039------------- 1042-------------
1040In addition to the style file, the overlay file, whose location is specified by 1043In addition to the style file, the overlay file, whose location is specified by
1041session.screen0.styleOverlay (default: ~/.fluxbox/overlay ) can be used to set 1044session.screen0.styleOverlay (default: ~/.fluxbox/overlay ) can be used to set
1042style resources that override all styles. For more information about which parts 1045style resources that override all styles. For more information about which parts
1043of fluxbox can be controlled by the overlay file, see fluxstyle(1). 1046of fluxbox can be controlled by the overlay file, see fluxbox-style(5).
1044 1047
1045THE SLIT 1048THE SLIT
1046-------- 1049--------
@@ -1192,5 +1195,6 @@ mailinglists. More information can be found on the official website.
1192 1195
1193SEE ALSO 1196SEE ALSO
1194-------- 1197--------
1195fluxbox-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxstyle(1) 1198fluxbox-apps(5) fluxbox-keys(5) bsetroot(1) fbsetbg(1) fbrun(1)
1199fluxbox-style(5) fluxbox-remote(1)
1196 1200