aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/asciidoc/fluxbox-apps.txt4
-rw-r--r--doc/asciidoc/fluxbox-keys.txt12
-rw-r--r--doc/asciidoc/fluxbox-menu.txt6
-rw-r--r--doc/asciidoc/fluxbox-style.txt12
-rw-r--r--doc/asciidoc/fluxbox.txt2
5 files changed, 18 insertions, 18 deletions
diff --git a/doc/asciidoc/fluxbox-apps.txt b/doc/asciidoc/fluxbox-apps.txt
index 5660e13..1b61eb4 100644
--- a/doc/asciidoc/fluxbox-apps.txt
+++ b/doc/asciidoc/fluxbox-apps.txt
@@ -18,7 +18,7 @@ SYNTAX
18------ 18------
19Variable parameters are shown in emphasis: 'argument' 19Variable parameters are shown in emphasis: 'argument'
20 20
21All other characters shown are required verbatim. Whitespce is only required to 21All other characters shown are required verbatim. Whitespace is only required to
22delimit words, but it is fine to add more whitespace. 22delimit words, but it is fine to add more whitespace.
23 23
24DESCRIPTION 24DESCRIPTION
@@ -71,7 +71,7 @@ Where the 'pattern' item is optional. If specified, this pattern must match for
71the group to take effect. It is common to use non-window-specific patterns such 71the group to take effect. It is common to use non-window-specific patterns such
72as *(workspace)* here. See *CLIENT PATTERNS* for more details. 72as *(workspace)* here. See *CLIENT PATTERNS* for more details.
73 73
74This is followed by any number of *[app]* lines. These have a simiar format to 74This is followed by any number of *[app]* lines. These have a similar format to
75the *[app]* section detailed above in *APP SECTIONS*, but do not contain any 75the *[app]* section detailed above in *APP SECTIONS*, but do not contain any
76settings and do not have an associated *[end]* line. 76settings and do not have an associated *[end]* line.
77 77
diff --git a/doc/asciidoc/fluxbox-keys.txt b/doc/asciidoc/fluxbox-keys.txt
index 8915452..60d6e6f 100644
--- a/doc/asciidoc/fluxbox-keys.txt
+++ b/doc/asciidoc/fluxbox-keys.txt
@@ -93,7 +93,7 @@ button, eg. '1' is the primary button, '4'/'5' are the wheel buttons):
93 The mouse button 'N' is clicked (pressed and released with no 93 The mouse button 'N' is clicked (pressed and released with no
94 movement in between) 94 movement in between)
95*MoveN*;; 95*MoveN*;;
96 The mouse button 'N' is currently held, the binded action is triggered 96 The mouse button 'N' is currently held, the bound action is triggered
97 as often as the mouse moves. 97 as often as the mouse moves.
98 98
99 99
@@ -201,7 +201,8 @@ These commands ordinarily affect only the currently focused window. The
201*MaximizeHorizontal* / *MaximizeVertical*:: 201*MaximizeHorizontal* / *MaximizeVertical*::
202 Maximize the current window in one direction only, leaving the other 202 Maximize the current window in one direction only, leaving the other
203 dimension unchanged. 203 dimension unchanged.
204*Fullscreen* 204
205*Fullscreen*::
205 Resize the window's content to fit the whole screen, without 206 Resize the window's content to fit the whole screen, without
206 any window decoration. 207 any window decoration.
207 208
@@ -237,8 +238,7 @@ These commands ordinarily affect only the currently focused window. The
237 238
238*SetDecor* 'decor':: 239*SetDecor* 'decor'::
239 Sets which window decorations will be shown. 'decor' has the same format 240 Sets which window decorations will be shown. 'decor' has the same format
240 as the `[Deco]' parameter in the apps file. See `man fluxbox' section 241 as the `[Deco]' parameter in the apps file. See 'fluxbox-apps(5)' for more info.
241 APPLICATIONS for more info.
242 242
243*ToggleDecor*:: 243*ToggleDecor*::
244 Toggles the presence of the window decorations (title bar, window 244 Toggles the presence of the window decorations (title bar, window
@@ -579,11 +579,11 @@ To check other windows besides the currently focused one, see the *Every* and
579*Some* conditions below. 579*Some* conditions below.
580 580
581*Some* 'condition':: 581*Some* 'condition'::
582 Retuns *true* if any window on any workspace (not just the currently 582 Returns *true* if any window on any workspace (not just the currently
583 focused one) matches the 'condition'. 583 focused one) matches the 'condition'.
584 584
585*Every* 'condition':: 585*Every* 'condition'::
586 Retuns *true* if every window on every workspace (not just the 586 Returns *true* if every window on every workspace (not just the
587 current one) matches the 'condition'. 587 current one) matches the 'condition'.
588 588
589*Not* 'condition':: 589*Not* 'condition'::
diff --git a/doc/asciidoc/fluxbox-menu.txt b/doc/asciidoc/fluxbox-menu.txt
index d8811a3..f6b940d 100644
--- a/doc/asciidoc/fluxbox-menu.txt
+++ b/doc/asciidoc/fluxbox-menu.txt
@@ -22,7 +22,7 @@ SYNTAX
22------ 22------
23Variable parameters are shown in emphasis: 'argument' 23Variable parameters are shown in emphasis: 'argument'
24 24
25All other characters shown are required verbatim. Whitespce is only required to 25All other characters shown are required verbatim. Whitespace is only required to
26delimit words, but it is fine to add more whitespace. 26delimit words, but it is fine to add more whitespace.
27 27
28DESCRIPTION 28DESCRIPTION
@@ -61,7 +61,7 @@ every tag must be on its own line.
61There are up to four fields in a menu line. They are of the form::: 61There are up to four fields in a menu line. They are of the form:::
62 ['tag'] ('label') {'command'} <'icon'> 62 ['tag'] ('label') {'command'} <'icon'>
63 63
64The <'icon'> field is always optional when show below. If specified, the 'icon' 64The <'icon'> field is always optional when shown below. If specified, the 'icon'
65will be scaled down and displayed in the menu alongside the text label of the 65will be scaled down and displayed in the menu alongside the text label of the
66item. It must be in .xpm or .png format. 66item. It must be in .xpm or .png format.
67 67
@@ -127,7 +127,7 @@ Applications
127 Inserts a command item into the menu. When you select the menu item from the 127 Inserts a command item into the menu. When you select the menu item from the
128 menu, fluxbox runs 'command...' in your *$SHELL* (or /bin/sh if $SHELL is not 128 menu, fluxbox runs 'command...' in your *$SHELL* (or /bin/sh if $SHELL is not
129 set). You can use this to launch applications, run shell scripts, etc. Since 129 set). You can use this to launch applications, run shell scripts, etc. Since
130 all arguments are passed verbatim to te shell, you can use environment 130 all arguments are passed verbatim to the shell, you can use environment
131 variables, pipes, or anything else the shell can do. Note that processes only 131 variables, pipes, or anything else the shell can do. Note that processes only
132 see environment variables that were set before fluxbox started (such as in 132 see environment variables that were set before fluxbox started (such as in
133 ~/.fluxbox/startup). 133 ~/.fluxbox/startup).
diff --git a/doc/asciidoc/fluxbox-style.txt b/doc/asciidoc/fluxbox-style.txt
index 9d9fc56..b193a8f 100644
--- a/doc/asciidoc/fluxbox-style.txt
+++ b/doc/asciidoc/fluxbox-style.txt
@@ -41,10 +41,10 @@ A style is made up of a few major components which then have their own
41sub-directives. The major components are as follows: 41sub-directives. The major components are as follows:
42 42
43The 'window.\*' directives control the appearance of the window frames, 43The 'window.\*' directives control the appearance of the window frames,
44window.tab.* controls the appearance of the window tabs, 'menu.\*' controls 44'window.tab.\*' controls the appearance of the window tabs, 'menu.\*' controls
45the appearance of the popup menu that you see when you right click on the 45the appearance of the popup menu that you see when you right click on the
46desktop. 'toolbar.\*' is the bar you will see at the top or bottom of your 46desktop. 'toolbar.\*' is the bar you will see at the top or bottom of your
47screen. Finally the 'slit.\*' has options you can use to customize the 47screen. Finally the 'slit.*' has options you can use to customize the
48appearance of the slit. However if you don't set the slit directives 48appearance of the slit. However if you don't set the slit directives
49specifically, the slit's appearance is controlled by the toolbar 49specifically, the slit's appearance is controlled by the toolbar
50directives instead. 50directives instead.
@@ -52,7 +52,7 @@ directives instead.
52To understand how the style mechanism works, it is nice to know a little about 52To understand how the style mechanism works, it is nice to know a little about
53how X11 resources work. X11 resources consist of a key and a value. The key is 53how X11 resources work. X11 resources consist of a key and a value. The key is
54constructed of several smaller keys (sometimes referred to as children), 54constructed of several smaller keys (sometimes referred to as children),
55delimited by a period (.). Keys may also contain an asterisk (\*) 55delimited by a period (.). Keys may also contain an asterisk (*)
56to serve as a wildcard, which means that one line of text will match 56to serve as a wildcard, which means that one line of text will match
57several keys. This is useful for styles that are based on one or two 57several keys. This is useful for styles that are based on one or two
58colors. 58colors.
@@ -119,7 +119,7 @@ you set the font resource for all keys to this font name all at once (For
119information about the fonts installed on your system, you can use a 119information about the fonts installed on your system, you can use a
120program like xfontsel(1), gtkfontsel, or xlsfonts(1).) 120program like xfontsel(1), gtkfontsel, or xlsfonts(1).)
121 121
122In the last example you will notice the wildcard (\*) before font. In a Fluxbox 122In the last example you will notice the wildcard (*) before font. In a Fluxbox
123style you can set a value with a wildcard. The example means that every font 123style you can set a value with a wildcard. The example means that every font
124in the style will be what is specified. You can do this with any 124in the style will be what is specified. You can do this with any
125component/value. For example if you wanted all of the text to be one color you 125component/value. For example if you wanted all of the text to be one color you
@@ -222,7 +222,7 @@ FULL COMPONENT LIST
222Here is the exhaustive component list for fluxbox(1) styles. Each one is listed 222Here is the exhaustive component list for fluxbox(1) styles. Each one is listed
223with their type of value required. Comments in a style file are preceded 223with their type of value required. Comments in a style file are preceded
224with an exclamation point (!) which we also use here so that these can be 224with an exclamation point (!) which we also use here so that these can be
225pasted into a new theme.cfg to be customized appropiately. Please note that 225pasted into a new theme.cfg to be customized appropriately. Please note that
226in order to keep styles consistent it is often the practice of stylists 226in order to keep styles consistent it is often the practice of stylists
227to provide all of the theme-items in their style file even if they are not 227to provide all of the theme-items in their style file even if they are not
228used. This allows the user the ease of changing different components. 228used. This allows the user the ease of changing different components.
@@ -473,7 +473,7 @@ These are the color formats for styles:
473 #000000 (Hexadecimal) 473 #000000 (Hexadecimal)
474 rgb:<0-255>/<0-255>/<0-255> 474 rgb:<0-255>/<0-255>/<0-255>
475 475
476See /usr/share/X11/rgb.txt for an explaination. 476See /usr/share/X11/rgb.txt for an explanation.
477 477
478AUTHORS 478AUTHORS
479------- 479-------
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 2c4787d..8cf6e51 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -529,7 +529,7 @@ workspaces, windows, and add/remove/rename workspaces.
529 Pops up a dialog to enter a new name for the current workspace. 529 Pops up a dialog to enter a new name for the current workspace.
530 530
531*Remove Last*::: 531*Remove Last*:::
532 Remove the last workspace in the list. Any windows curretly open there will 532 Remove the last workspace in the list. Any windows currently open there will
533 be sent to the next-to-last workspace. 533 be sent to the next-to-last workspace.
534 534
535TOOLBAR 535TOOLBAR