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 @@
 # Makefile.am for fluxbox/doc
 SUBDIRS = ru
-CLEANFILES = fluxbox.1 fluxstyle.1
+CLEANFILES = fluxbox.1 fluxbox-style.5
 MAINTAINERCLEANFILES = Makefile.in
 man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \
-        startfluxbox.1 fluxstyle.1 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1
+        startfluxbox.1 fluxbox-style.5 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1
 EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 fluxbox-keys.5 fluxbox-apps.5 fluxbox-remote.1 startfluxbox.1 fbsetbg.1 \
-        fluxstyle.1.in CODESTYLE
+        fluxbox-style.5.in CODESTYLE
 distclean-local:
        rm -f *\~
 fluxbox.1: fluxbox.1.in
        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxbox.1.in > fluxbox.1
-fluxstyle.1: fluxstyle.1.in
+fluxbox-style.5: fluxbox-style.5.in
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $(srcdir)/fluxstyle.1.in > fluxstyle.1
+        @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 @@
 # create manpages from the asciidoc files
 #
-SRC1 = fluxbox.txt fluxstyle.txt fluxbox-keys.txt fluxbox-remote.txt
+SRC1 = fluxbox.txt fluxbox-keys.txt fluxbox-remote.txt
-SRC5 = fluxbox-keys.txt fluxbox-apps.txt
+SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt
 MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
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 @@
-fluxstyle(1)
+fluxbox-style(5)
-============
+================
 Henrik Kinnunen <fluxgen@fluxbox.org>
 v1.1.1, 10 February 2009
-:man source:   fluxstyle.txt
+:man source:   fluxbox-style.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
 NAME
 ----
-fluxstyle - A comprehensive look at styles/themes for fluxbox(1).
+fluxbox-style - A comprehensive look at styles/themes for fluxbox(1).
 SYNOPSIS
 --------
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
 titlebar or moved to other locations on the outside of the window. Configuration
 is discussed in TAB OPTIONS section.
+You can also set up automatic grouping using the `apps' file. See *GROUP
+SECTIONS* in fluxbox-apps(5) for details.
 MENUS
 -----
 fluxbox installs a default menu file in @pkgdatadir@/menu. You can also use
@@ -238,7 +241,7 @@ if not all, of those here.
    ~/.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 'standards'
-    described in fluxstyle(1)).
+    described in fluxbox-style(5)).
 - *Workspace List*:
    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
 window borders, menus and the toolbar.
 The default installation of fluxbox provides some of these style files. See
-fluxstyle(1) to accommodate the growing number of style components.
+fluxbox-style(5) to accommodate the growing number of style components.
 STYLE OVERLAY
 -------------
 In 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).
+of fluxbox can be controlled by the overlay file, see fluxbox-style(5).
 THE SLIT
 --------
@@ -1192,5 +1195,6 @@ mailinglists. More information can be found on the official website.
 SEE ALSO
 --------
-fluxbox-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxstyle(1)
+fluxbox-apps(5) fluxbox-keys(5) bsetroot(1) fbsetbg(1) fbrun(1)
+fluxbox-style(5) fluxbox-remote(1)
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 @@
-.\"     Title: fluxstyle
+.\"     Title: fluxbox-style
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
 .\"      Date: 02/10/2009
 .\"    Manual: Fluxbox Manual
-.\"    Source: fluxstyle.txt 1.1.1
+.\"    Source: fluxbox-style.txt 1.1.1
 .\"  Language: English
 .\"
-.TH "FLUXSTYLE" "1" "02/10/2009" "fluxstyle\&.txt 1\&.1\&.1" "Fluxbox Manual"
+.TH "FLUXBOX\-STYLE" "5" "02/10/2009" "fluxbox\-style\&.txt 1\&.1\&.1" "Fluxbox Manual"
 .\" -----------------------------------------------------------------
 .\" * (re)Define some macros
 .\" -----------------------------------------------------------------
@@ -167,7 +167,7 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "Name"
-fluxstyle \- A comprehensive look at styles/themes for fluxbox(1)\&.
+fluxbox-style \- A comprehensive look at styles/themes for fluxbox(1)\&.
 .SH "Synopsis"
 .sp
 This 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\
 .SS "Tabs"
 .sp
 fluxbox 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\&.
+.sp
+You can also set up automatic grouping using the `apps\' file\&. See \fBGROUP SECTIONS\fR in fluxbox\-apps(5) for details\&.
 .SH "MENUS"
 .sp
 fluxbox 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
 \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
 \fIstandards\fR
-described in fluxstyle(1))\&.
+described in fluxbox\-style(5))\&.
 .RE
 .sp
 .RS 4
@@ -2106,10 +2108,10 @@ session\&.screen0\&.tab\&.placement: <direction>
 .sp
 fluxbox 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\&.
 .sp
-The default installation of fluxbox provides some of these style files\&. See fluxstyle(1) to accommodate the growing number of style components\&.
+The default installation of fluxbox provides some of these style files\&. See fluxbox\-style(5) to accommodate the growing number of style components\&.
 .SH "STYLE OVERLAY"
 .sp
-In 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)\&.
+In 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)\&.
 .SH "THE SLIT"
 .sp
 The 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\&.
 If 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\&.
 .SH "SEE ALSO"
 .sp
-fluxbox\-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxstyle(1)
+fluxbox\-apps(5) fluxbox\-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxbox\-style(5) fluxbox\-remote(1)