summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am10
-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
-rw-r--r--doc/fluxbox-style.5.in (renamed from doc/fluxstyle.1.in)8
-rw-r--r--doc/fluxbox.1.in10
6 files changed, 29 insertions, 23 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 879edf3..8268fff 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,17 +2,17 @@
2# Makefile.am for fluxbox/doc 2# Makefile.am for fluxbox/doc
3 3
4SUBDIRS = ru 4SUBDIRS = ru
5CLEANFILES = fluxbox.1 fluxstyle.1 5CLEANFILES = fluxbox.1 fluxbox-style.5
6MAINTAINERCLEANFILES = Makefile.in 6MAINTAINERCLEANFILES = Makefile.in
7man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \ 7man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \
8 startfluxbox.1 fluxstyle.1 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1 8 startfluxbox.1 fluxbox-style.5 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1
9EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1 startfluxbox.1 fbsetbg.1 \ 9EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1 startfluxbox.1 fbsetbg.1 \
10 fluxstyle.1.in CODESTYLE 10 fluxbox-style.5.in CODESTYLE
11distclean-local: 11distclean-local:
12 rm -f *\~ 12 rm -f *\~
13 13
14fluxbox.1: fluxbox.1.in 14fluxbox.1: fluxbox.1.in
15 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1 15 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1
16 16
17fluxstyle.1: fluxstyle.1.in 17fluxbox-style.5: fluxbox-style.5.in
18 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxstyle.1.in > fluxstyle.1 18 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox-style.5.in > fluxbox-style.5
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
diff --git a/doc/fluxstyle.1.in b/doc/fluxbox-style.5.in
index 11b12e8..02323d5 100644
--- a/doc/fluxstyle.1.in
+++ b/doc/fluxbox-style.5.in
@@ -1,12 +1,12 @@
1.\" Title: fluxstyle 1.\" Title: fluxbox-style
2.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] 2.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> 3.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
4.\" Date: 02/10/2009 4.\" Date: 02/10/2009
5.\" Manual: Fluxbox Manual 5.\" Manual: Fluxbox Manual
6.\" Source: fluxstyle.txt 1.1.1 6.\" Source: fluxbox-style.txt 1.1.1
7.\" Language: English 7.\" Language: English
8.\" 8.\"
9.TH "FLUXSTYLE" "1" "02/10/2009" "fluxstyle\&.txt 1\&.1\&.1" "Fluxbox Manual" 9.TH "FLUXBOX\-STYLE" "5" "02/10/2009" "fluxbox\-style\&.txt 1\&.1\&.1" "Fluxbox Manual"
10.\" ----------------------------------------------------------------- 10.\" -----------------------------------------------------------------
11.\" * (re)Define some macros 11.\" * (re)Define some macros
12.\" ----------------------------------------------------------------- 12.\" -----------------------------------------------------------------
@@ -167,7 +167,7 @@
167.\" * MAIN CONTENT STARTS HERE * 167.\" * MAIN CONTENT STARTS HERE *
168.\" ----------------------------------------------------------------- 168.\" -----------------------------------------------------------------
169.SH "Name" 169.SH "Name"
170fluxstyle \- A comprehensive look at styles/themes for fluxbox(1)\&. 170fluxbox-style \- A comprehensive look at styles/themes for fluxbox(1)\&.
171.SH "Synopsis" 171.SH "Synopsis"
172.sp 172.sp
173This document describes various options available for fluxbox styles\&. 173This document describes various options available for fluxbox styles\&.
diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in
index 98dacab..b3f8825 100644
--- a/doc/fluxbox.1.in
+++ b/doc/fluxbox.1.in
@@ -406,6 +406,8 @@ A left click (mouse button 1) on any part of the window\'s border will raise it\
406.SS "Tabs" 406.SS "Tabs"
407.sp 407.sp
408fluxbox allows windows to be `grouped\' by middle clicking and holding on a window\'s tab and dragging it onto another window\&. This `tabbing\' allows you to put multiple applications in one location on the desktop and do several operations (for example, moving or resizing) to all windows in the group\&. By default, tabs are located just above the window, but they may be embedded in the titlebar or moved to other locations on the outside of the window\&. Configuration is discussed in TAB OPTIONS section\&. 408fluxbox allows windows to be `grouped\' by middle clicking and holding on a window\'s tab and dragging it onto another window\&. This `tabbing\' allows you to put multiple applications in one location on the desktop and do several operations (for example, moving or resizing) to all windows in the group\&. By default, tabs are located just above the window, but they may be embedded in the titlebar or moved to other locations on the outside of the window\&. Configuration is discussed in TAB OPTIONS section\&.
409.sp
410You can also set up automatic grouping using the `apps\' file\&. See \fBGROUP SECTIONS\fR in fluxbox\-apps(5) for details\&.
409.SH "MENUS" 411.SH "MENUS"
410.sp 412.sp
411fluxbox installs a default menu file in @pkgdatadir@/menu\&. You can also use fluxbox \-i to confirm this action\&. Of course this system\-wide menu can be customized for all users at once, but it is also possible to create an individual menu file for each user\&. By convention, users create a menu file in ~/\&.fluxbox/menu \&. Once you\'ve created your own menu file, you\'ll want to make sure that you properly declare this location in your `init\' file so that fluxbox knows where to look\&. The value you\'ll want to add or change is: 413fluxbox installs a default menu file in @pkgdatadir@/menu\&. You can also use fluxbox \-i to confirm this action\&. Of course this system\-wide menu can be customized for all users at once, but it is also possible to create an individual menu file for each user\&. By convention, users create a menu file in ~/\&.fluxbox/menu \&. Once you\'ve created your own menu file, you\'ll want to make sure that you properly declare this location in your `init\' file so that fluxbox knows where to look\&. The value you\'ll want to add or change is:
@@ -466,7 +468,7 @@ The root menu is where you can change different aspects of fluxbox by simply cli
466 468
467\fBUser Styles\fR: ~/\&.fluxbox/styles This is the location where you will store new styles that you grab from the Internet\&. If you create your own styles this is also where you will put yours (provided that you follow the 469\fBUser Styles\fR: ~/\&.fluxbox/styles This is the location where you will store new styles that you grab from the Internet\&. If you create your own styles this is also where you will put yours (provided that you follow the
468\fIstandards\fR 470\fIstandards\fR
469described in fluxstyle(1))\&. 471described in fluxbox\-style(5))\&.
470.RE 472.RE
471.sp 473.sp
472.RS 4 474.RS 4
@@ -2106,10 +2108,10 @@ session\&.screen0\&.tab\&.placement: <direction>
2106.sp 2108.sp
2107fluxbox enables you to use specialized files that contain X(1) resources to specify colors, textures, pixmaps and fonts, and thus the overall look of your window borders, menus and the toolbar\&. 2109fluxbox enables you to use specialized files that contain X(1) resources to specify colors, textures, pixmaps and fonts, and thus the overall look of your window borders, menus and the toolbar\&.
2108.sp 2110.sp
2109The default installation of fluxbox provides some of these style files\&. See fluxstyle(1) to accommodate the growing number of style components\&. 2111The default installation of fluxbox provides some of these style files\&. See fluxbox\-style(5) to accommodate the growing number of style components\&.
2110.SH "STYLE OVERLAY" 2112.SH "STYLE OVERLAY"
2111.sp 2113.sp
2112In addition to the style file, the overlay file, whose location is specified by session\&.screen0\&.styleOverlay (default: ~/\&.fluxbox/overlay ) can be used to set style resources that override all styles\&. For more information about which parts of fluxbox can be controlled by the overlay file, see fluxstyle(1)\&. 2114In addition to the style file, the overlay file, whose location is specified by session\&.screen0\&.styleOverlay (default: ~/\&.fluxbox/overlay ) can be used to set style resources that override all styles\&. For more information about which parts of fluxbox can be controlled by the overlay file, see fluxbox\-style(5)\&.
2113.SH "THE SLIT" 2115.SH "THE SLIT"
2114.sp 2116.sp
2115The slit is a special fluxbox window frame that can contain dockable applications, e\&.g\&. \fIbbtools\fR or \fIwmapps\fR\&. 2117The slit is a special fluxbox window frame that can contain dockable applications, e\&.g\&. \fIbbtools\fR or \fIwmapps\fR\&.
@@ -2391,4 +2393,4 @@ Numerous other languages could be available if someone jumps in\&.
2391If you find any bugs, please visit the #fluxbox irc channel on irc\&.freenode\&.net or submit them to the bug tracker at \m[blue]\fBhttp://sf\&.net/projects/fluxbox\fR\m[] \&. Or you may subscribe to one of the mailinglists\&. More information can be found on the official website\&. 2393If you find any bugs, please visit the #fluxbox irc channel on irc\&.freenode\&.net or submit them to the bug tracker at \m[blue]\fBhttp://sf\&.net/projects/fluxbox\fR\m[] \&. Or you may subscribe to one of the mailinglists\&. More information can be found on the official website\&.
2392.SH "SEE ALSO" 2394.SH "SEE ALSO"
2393.sp 2395.sp
2394fluxbox\-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxstyle(1) 2396fluxbox\-apps(5) fluxbox\-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxbox\-style(5) fluxbox\-remote(1)