Small edits for consistency

10 files changed, 127 insertions, 87 deletions

diff --git a/doc/asciidoc/fbrun.txt b/doc/asciidoc/fbrun.txt
index 12342f7..fd27be8 100644
--- a/doc/asciidoc/fbrun.txt
+++ b/doc/asciidoc/fbrun.txt
@@ -1,6 +1,6 @@
 fbrun(1)
-==========
-Bastian Kleineidam <calvin@debian.org>
+========
+Jim Ramsay <i.am@jimramsay.com>
 v1.1.2, 18 February 2009
 :man source:   fbrun.txt
 :man version:  {revision}
@@ -80,14 +80,12 @@ fbrun -fg black -bg white -text xterm -title "run xterm"
 
 AUTHORS
 -------
-- This manpage was originally written by Bastian Kleineidam <calvin at
-  debian.org> for the Debian distribution of fluxbox (but may be used by
-  others).
+This manpage was originally written by Bastian Kleineidam <calvin at
+debian.org> for the Debian distribution of fluxbox (but may be used by
+others).
 
-- It was then converted to asciidoc format by Jim Ramsay <i.am at jimramsay.com>
-  for fluxbox-1.1.2
-
-- The main author of fluxbox is Henrik Kinnunen <fluxgen at fluxbox.org>.
+It was then converted to asciidoc format by Jim Ramsay <i.am at jimramsay.com>
+for fluxbox-1.1.2
 
 SEE ALSO
 --------
diff --git a/doc/asciidoc/fbsetbg.txt b/doc/asciidoc/fbsetbg.txt
index 03626b2..6e91329 100644
--- a/doc/asciidoc/fbsetbg.txt
+++ b/doc/asciidoc/fbsetbg.txt
@@ -51,7 +51,8 @@ doesn't support this option fbsetbg falls back to *-f*).
 Use specified wallpapersetter, use no argument to forget.
 
 *-b* 'fbsetrootoptions'::
-Forward the options to fbsetroot.
+Forward the options to *fbsetroot(1)*. These can be used to set a solid,
+pattern, or gradient background texture.
 
 *-r* 'directory'::
 Set random wallpaper from a directory.
@@ -97,10 +98,6 @@ Recall the last set wallpaper on display *:0.0* with the stored options.
 
         $ DISPLAY=:0.0 fbsetbg -l
 
-SEE ALSO
---------
-fluxbox(1), fbsetroot(1)
-
 ONLINE DOCUMENTATION
 --------------------
 Much more extensive documentation for *fbsetbg(1)* is provided on:::
@@ -112,6 +109,11 @@ BUGS
 
 AUTHORS
 -------
-The author of fbsetbg is Han Boetes <han@fluxbox.org>
+The author of fbsetbg is Han Boetes <han at fluxbox.org>
 
-This manpage was updated to asciidoc format by Jim Ramsay <i.am@jimramsay.com>
+This manpage was converted to asciidoc format by Jim Ramsay <i.am at
+jimramsay.com> for fluxbox-1.1.2
+
+SEE ALSO
+--------
+fluxbox(1) fbsetroot(1)
diff --git a/doc/asciidoc/fbsetroot.txt b/doc/asciidoc/fbsetroot.txt
index a41733d..74d5fa8 100644
--- a/doc/asciidoc/fbsetroot.txt
+++ b/doc/asciidoc/fbsetroot.txt
@@ -33,6 +33,9 @@ fluxbox does. It doesn't handle cursors etc. fbsetroot was originally part of
 the Blackbox package and was carried over with the code that became Fluxbox. It
 was called bsetroot back in those days.
 
+If any errors are encountered, fbsetroot will use either *gxmessage(1)* or
+*xmessage(1)* to inform the user of errors.
+
 OPTIONS
 -------
 fbsetroot operates in three ways, you must choose one of  the  first  3
@@ -74,14 +77,12 @@ Prints version info and short help text.
 
 AUTHORS
 -------
-fbsetroot is written and maintained by the Fluxbox Development Team
-
-This manpage was modified by Curt "Asenchi" Micol <asenchi@asenchi.com>
+This manpage was modified by Curt "Asenchi" Micol <asenchi at asenchi.com>
 for the Fluxbox window manager.
 
 Further updates for fluxbox-1.1.2 and conversion to asciidoc format by Jim
-Ramsay <i.am@jimramsay.com>
+Ramsay <i.am at jimramsay.com>
 
 SEE ALSO
 --------
-fluxbox(1) fbsetbg(1)
+fluxbox(1) fbsetbg(1) xsetroot(1) xmessage(1) gxmessage(1)
diff --git a/doc/asciidoc/fluxbox-apps.txt b/doc/asciidoc/fluxbox-apps.txt
index ca5c6de..c278962 100644
--- a/doc/asciidoc/fluxbox-apps.txt
+++ b/doc/asciidoc/fluxbox-apps.txt
@@ -1,7 +1,7 @@
 fluxbox-apps(5)
 ===============
 Jim Ramsay <i.am@jimramsay.com>
-v1.1.2, 10 February 2009
+v1.1.2, 18 February 2009
 :man source:   fluxbox-apps.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
@@ -253,10 +253,8 @@ file.
 [end]
 ..................
 
-AUTHOR and CREDITS
-------------------
-This manpage is the combined work of:
-
+AUTHORS
+-------
 - Jim Ramsay <i.am at jimramsay com> (>fluxbox-1.0.0)
 - Curt Micol <asenchi at asenchi com> (>fluxbox-0.9.11)
 - Tobias Klausmann <klausman at users sourceforge net> (<=fluxbox-0.9.11)
@@ -264,9 +262,6 @@ This manpage is the combined work of:
 - Matthew Hawkins <matt at mh dropbear id au> (blackbox)
 - Wilbert Berendsen <wbsoft at xs4all nl> (blackbox)
 
-- Numerous other languages could be available if someone jumps in.
-
 SEE ALSO
 --------
-fluxbox(1), xev(1), xkill(1), regex(7)
-
+fluxbox(1) xprop(1) regex(7)
diff --git a/doc/asciidoc/fluxbox-keys.txt b/doc/asciidoc/fluxbox-keys.txt
index 906324f..9edb22b 100644
--- a/doc/asciidoc/fluxbox-keys.txt
+++ b/doc/asciidoc/fluxbox-keys.txt
@@ -1,7 +1,7 @@
 fluxbox-keys(5)
 ===============
 Jim Ramsay <i.am@jimramsay.com>
-v1.1.2, 10 February 2009
+v1.1.2, 18 February 2009
 :man source:   fluxbox-keys.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
@@ -79,15 +79,15 @@ KEYS
 You may specify a key by its key name (for example, *a* or *space*) or by its
 numeric keycode (for example, *38* or *0xf3*).
 
-If you don't know the name of a key, you can run 'xev(1)' in a terminal, push
+If you don't know the name of a key, you can run *xev(1)* in a terminal, push
 the key, and see the name in the output. If you have some "special" keys that
-do not produce a key name in the output of 'xev(1)', you can just use the
+do not produce a key name in the output of *xev(1)*, you can just use the
 keycode (NOT the keysym!) in your keys file.
 
 Commands can also be bound to mouse button presses, for which the proper "key"
 name is *Mouse*'n' where 'n' is the number of the mouse button. For example,
 *Mouse1* is the primary button, and *Mouse4* / *Mouse5* are the scroll wheel
-events, in normal configurations. 'xev(1)' can also be used to tell the button
+events, in normal configurations. *xev(1)* can also be used to tell the button
 number.
 
 ////////////////
@@ -199,7 +199,7 @@ These commands ordinarily affect only the currently focused window. The
         Close the current window, equivalent to the window button.
 
 *Kill* | *KillWindow*::
-        Close a window that's not responding to *Close*, like using `xkill`.
+        Close a window that's not responding to *Close*, like using *xkill(1)*.
 
 *Shade* | *ShadeWindow*::
         Toggle the *shaded* state of the current window, equivalent to the
@@ -622,10 +622,8 @@ Mod4 t :If {Some Matches (xterm)} {NextWindow (xterm)} {Exec xterm}
 ChangeWorkspace :Exec fbsetbg ~/.fluxbox/bg$(xprop -root _NET_CURRENT_DESKTOP | awk '{print $3}').png
 ..................
 
-AUTHOR and CREDITS
-------------------
-This manpage is the combined work of:
-
+AUTHORS
+-------
 - Jim Ramsay <i.am at jimramsay com> (>fluxbox-1.0.0)
 - Curt Micol <asenchi at asenchi com> (>fluxbox-0.9.11)
 - Tobias Klausmann <klausman at users sourceforge net> (<=fluxbox-0.9.11)
@@ -633,9 +631,6 @@ This manpage is the combined work of:
 - Matthew Hawkins <matt at mh dropbear id au> (blackbox)
 - Wilbert Berendsen <wbsoft at xs4all nl> (blackbox)
 
-- Numerous other languages could be available if someone jumps in.
-
 SEE ALSO
 --------
-fluxbox(1), xev(1), xkill(1), regex(7)
-
+fluxbox(1) xprop(1) xev(1) xkill(1) regex(7)
diff --git a/doc/asciidoc/fluxbox-menu.txt b/doc/asciidoc/fluxbox-menu.txt
index 0968202..69a4486 100644
--- a/doc/asciidoc/fluxbox-menu.txt
+++ b/doc/asciidoc/fluxbox-menu.txt
@@ -1,7 +1,7 @@
 fluxbox-menu(5)
 ===============
 Jim Ramsay <i.am@jimramsay.com>
-v1.1.2, 12 February 2009
+v1.1.2, 18 February 2009
 :man source:   fluxbox-menu.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
@@ -326,20 +326,15 @@ EXAMPLES
 [end]
 ....
 
-AUTHOR and CREDITS
-------------------
-This manpage is the combined work of:
-
-- Jim Ramsay <i.am at jimramsay com> (>fluxbox-1.1.1)
+AUTHORS
+-------
+- Jim Ramsay <i.am at jimramsay com> (>fluxbox-1.0.0)
 - Curt Micol <asenchi at asenchi com> (>fluxbox-0.9.11)
 - Tobias Klausmann <klausman at users sourceforge net> (<=fluxbox-0.9.11)
 - Grubert <grubert at users sourceforge net> (fluxbox)
 - Matthew Hawkins <matt at mh dropbear id au> (blackbox)
 - Wilbert Berendsen <wbsoft at xs4all nl> (blackbox)
 
-- Numerous other languages could be available if someone jumps in.
-
 SEE ALSO
 --------
-fluxbox(1), xev(1), xkill(1), regex(7)
-
+fluxbox(1) fluxbox-keys(5) fluxbox-apps(5) xkill(1) iconv(1)
diff --git a/doc/asciidoc/fluxbox-remote.txt b/doc/asciidoc/fluxbox-remote.txt
index 1b13436..089b2d6 100644
--- a/doc/asciidoc/fluxbox-remote.txt
+++ b/doc/asciidoc/fluxbox-remote.txt
@@ -1,7 +1,7 @@
 fluxbox-remote(1)
 =================
 Mark Tiefenbruck <mark@fluxbox.org>
-v1.1.2, 10 February 2009
+v1.1.2, 18 February 2009
 :man source: fluxbox-remote.txt
 :man version: {revision}
 :man manual: Fluxbox Manual
@@ -37,7 +37,10 @@ ENVIRONMENT
 In order to communicate with 'fluxbox(1)', the DISPLAY environment variable must
 be set properly. Usually, the value should be `:0.0'.
 
+AUTHORS
+-------
+This man page written by Mark Tiefenbruck <mark at fluxbox.org>
+
 SEE ALSO
 --------
-fluxbox(1), fluxbox-keys(5), wmctrl(1)
-
+fluxbox(1) fluxbox-keys(5) wmctrl(1)
diff --git a/doc/asciidoc/fluxbox-style.txt b/doc/asciidoc/fluxbox-style.txt
index 71942b5..02838fb 100644
--- a/doc/asciidoc/fluxbox-style.txt
+++ b/doc/asciidoc/fluxbox-style.txt
@@ -1,7 +1,7 @@
 fluxbox-style(5)
 ================
 Henrik Kinnunen <fluxgen@fluxbox.org>
-v1.1.2, 10 February 2009
+v1.1.2, 18 February 2009
 :man source:   fluxbox-style.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
@@ -357,11 +357,11 @@ change the user's background, then use `background: none'. The options
 `centered', `aspect', `tiled', and `fullscreen' require the `background.pixmap'
 resource to contain a valid file name. The `random' option requires
 `background.pixmap' to contain a valid directory name. For these options,
-fluxbox(1) will call fbsetbg(1) to set the background. The options `gradient',
+*fluxbox(1)* will call *fbsetbg(1)* to set the background. The options `gradient',
 `solid', and `mod' all require `background.color' to be set. `gradient' and
 `mod' both require `background.colorTo'. `mod' requires `background.modX' and
 `background.modY' to be set as well. These options will be passed to
-fbsetroot(1) to set the background.
+*fbsetroot(1)* to set the background.
 
    background: centered|aspect|tiled|fullscreen|random|solid|gradient <texture>|mod|none
    background.pixmap: <file or directory>
@@ -472,25 +472,24 @@ These are the color formats for styles:
 
 See /usr/share/X11/rgb.txt for an explaination.
 
-AUTHOR and CREDITS
-------------------
-Blackbox was written and maintained by Brad Hughes <blackbox@alug.org>
-and Jeff Raven <jraven@psu.edu>.
+AUTHORS
+-------
+Blackbox was written and maintained by Brad Hughes <blackbox at alug.org>
+and Jeff Raven <jraven at psu.edu>.
 
-fluxbox(1) is written and maintained by Henrik Kinnunen <fluxgen@fluxbox.org>
+fluxbox(1) is written and maintained by Henrik Kinnunen <fluxgen at fluxbox.org>
 with contributions and patches merged from many individuals around the world.
 
-The Official fluxbox(1) website: http://www.fluxbox.org[]
-You can find a lot of styles here: http://tenr.de/[]
+The Official fluxbox(1) website: http://www.fluxbox.org
+You can find a lot of styles here: http://tenr.de/
 
 This manpage was composed from various resources including the official
 documentation, fluxbox(1) man page and numerous other resources by Curt
 "Asenchi" Micol. If you notice any errors or problems with this page, please
-contact him here: <asenchi@asenchi.com> and using the great contributions of
-<grubert@users.sourceforge.net>.  Numerous other languages could be available
+contact him here: <asenchi at asenchi.com> and using the great contributions of
+<grubert at users.sourceforge.net>.  Numerous other languages could be available
 if someone jumps in.
 
 SEE ALSO
 --------
 fluxbox(1) fbsetbg(1) fbsetroot(1)
-
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 189d3f5..40e6090 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -1,7 +1,7 @@
 fluxbox(1)
 ==========
 Henrik Kinnunen <fluxgen@fluxbox.org>
-v1.1.2, 10 February 2009
+v1.1.2, 18 February 2009
 :man source:   fluxbox.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual  
@@ -88,12 +88,12 @@ OPTIONS
 
 STARTING FLUXBOX
 ----------------
-*fluxbox(1)* comes with a program called *startfluxbox(8)* usually located
+*fluxbox(1)* comes with a program called *startfluxbox(1)* usually located
 wherever you installed fluxbox. This script provides you with many options and
 variables that can be set when starting fluxbox. To actually call fluxbox and
 begin using it, you should place ``exec startfluxbox'' in your *\~/.xinitrc* as
 the last executed command. This is assuming that the location of *fluxbox(1)*
-and *startfluxbox(8)* are in your shell's $PATH. Also note that you may need to
+and *startfluxbox(1)* are in your shell's $PATH. Also note that you may need to
 create the *\~/.xinitrc* file or your setup may use *\~/.xsession* instead,
 depending on your X setup. Some X login managers like *gdm(1)* or *kdm(1)* may
 simply provide a ``Fluxbox'' session for you without having to alter any
@@ -815,7 +815,7 @@ slit. The file is generally located at *\~/.fluxbox/slitlist*.
 A simple procedure for getting the slit sequences the way you like it is:
 1.   Run fluxbox with no pre-loaded dockapps
 2.   Run dockapps individually in the order you want them
-3.   Add dockapps to your startfluxbox(8) script
+3.   Add dockapps to your *startfluxbox(1)* script
 
 This sequence will be saved by default to *\~/.fluxbox/slitlist* and will be
 remembered for future instances of fluxbox.
@@ -1155,8 +1155,8 @@ fluxbox responds to the following signals:
 - SIGUSR1  Forces reloading of configuration.
 - SIGUSR2  Forces reloading of menu file.
 
-AUTHOR and CREDITS
-------------------
+AUTHORS
+-------
 fluxbox is written and maintained by Henrik Kinnunen <fluxgen at fluxbox org>,
 Simon Bowden <rathnor at fluxbox org>, Mathias Gumz <akira at fluxbox org>, and
 Mark Tiefenbruck <mark at fluxbox org>, with contributions and patches merged
@@ -1165,15 +1165,9 @@ from many individuals around the world.
 Blackbox was written and maintained by Brad Hughes <blackbox at alug org> and
 Jeff Raven <jraven at psu edu>.
 
-The Official fluxbox website: http://www.fluxbox.org
-
-The Official fluxbox wiki: http://www.fluxbox-wiki.org
-
-Many compatible themes: http://tenr.de
-
 This manpage is the combined work of:
 
-- Jim Ramsay <i.am at jimramsay com> (>fluxbox-1.1.1)
+- Jim Ramsay <i.am at jimramsay com> (>fluxbox-1.0.0)
 - Curt Micol <asenchi at asenchi com> (>fluxbox-0.9.11)
 - Tobias Klausmann <klausman at users sourceforge net> (<=fluxbox-0.9.11)
 - Grubert <grubert at users sourceforge net> (fluxbox)
@@ -1182,6 +1176,14 @@ This manpage is the combined work of:
 
 - Numerous other languages could be available if someone jumps in.
 
+ONLINE DOCUMENTATION
+--------------------
+The Official fluxbox website: http://www.fluxbox.org
+
+The Official fluxbox wiki: http://www.fluxbox-wiki.org
+
+Many compatible themes: http://tenr.de
+
 BUGS
 ----
 If you find any bugs, please visit the #fluxbox irc channel on
@@ -1192,5 +1194,4 @@ mailinglists. More information can be found on the official website.
 SEE ALSO
 --------
 fluxbox-apps(5) fluxbox-keys(5) fluxbox-style(5) fluxbox-menu(5)
-fluxbox-remote(1) bsetroot(1) fbsetbg(1) fbrun(1)
-
+fluxbox-remote(1) fbsetroot(1) fbsetbg(1) fbrun(1) startfluxbox(1)
diff --git a/doc/asciidoc/startfluxbox.txt b/doc/asciidoc/startfluxbox.txt
index 5a43ca1..0042ed3 100644
--- a/doc/asciidoc/startfluxbox.txt
+++ b/doc/asciidoc/startfluxbox.txt
@@ -24,11 +24,61 @@ doesn't exist it will be generated.
 
 FILES
 -----
-*~/.fluxbox/startup*::
+*\~/.fluxbox/startup*::
         This file contains all commands that should be executed before fluxbox is
         started. The initial file contains helpful comments for beginners. It also
         starts fluxbox.
 
+EXAMPLES
+--------
+The default *\~/.fluxbox/startup* is as follows:
+....
+#!/bin/sh
+#
+# fluxbox startup-script:
+#
+# Lines starting with a '#' are ignored.
+
+# Change your keymap:
+xmodmap "$HOME/.Xmodmap"
+
+# Applications you want to run with fluxbox.
+# MAKE SURE THAT APPS THAT KEEP RUNNING HAVE AN ''&'' AT THE END.
+#
+# unclutter -idle 2 &
+# wmnd &
+# wmsmixer -w &
+# idesk &
+
+# And last but not least we start fluxbox.
+# Because it is the last app you have to run it with ''exec'' before it.
+
+exec fluxbox
+# or if you want to keep a log:
+# exec fluxbox -log "$fluxdir/log"
+....
+
+If you need to start applications after fluxbox, you can change the *exec
+fluxbox* line above to something like this:
+....
+exec fluxbox &
+fbpid=$!
+  
+sleep 1 
+{ 
+        xsetroot -cursor_name left_ptr -fg white -bg black &
+        ipager &
+        gkrellm2 &
+} &
+                                           
+wait $fbpid
+....
+So xsetroot, ipager, and gkrellm2 will all be started after fluxbox, after
+giving fluxbox 1 second to startup.
+
+For more details on what else you can do in this script, see *sh(1p)*, or the
+documentation for your shell.
+
 ONLINE DOCUMENTATION
 --------------------
 More extensive documentation for *startfluxbox(1)* can be found at:::
@@ -36,9 +86,10 @@ http://www.xs4all.nl/~hanb/software/fluxbox/startfluxbox.html
 
 AUTHORS
 -------
-The author of *startfluxbox(1)* is Han Boetes <han@fluxbox.org>
+The author of *startfluxbox(1)* is Han Boetes <han at fluxbox.org>
 
-This manpage was updated to asciidoc format by Jim Ramsay <i.am@jimramsay.com>
+This manpage was converted to asciidoc format by Jim Ramsay <i.am at
+jimramsay.com> for fluxbox-1.1.2
 
 SEE ALSO
 --------