2 files changed, 32 insertions, 23 deletions

diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 681d445..2e143ca 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -796,10 +796,11 @@ session.screen0.toolbar.placement: <placement>
 
 session.screen0.slit.maxOver: <boolean>
 session.screen0.toolbar.maxOver: <boolean>
+session.screen0.tabs.maxOver: <boolean>
       Setting these to True will allow application windows to maximize over the
-      complete screen. Setting to False allows the slit and toolbar to hold
-      their territory and will always be visible when an application is
-      maximized. Default: False
+      complete screen. Setting to False allows the slit, toolbar, and external
+      tabs to hold their territory and will always be visible when an
+      application is maximized. Default: False
 
 session.screen0.toolbar.height: <integer>
       Set the height of the toolbar. If the value is set to 0, the style file
@@ -851,13 +852,6 @@ session.screen0.iconbar.iconTextPadding: <integer>
       This specifies the space between the window title and the edge of the
       button. Default: 10
 
-session.screen0.iconbar.deiconifyMode: Current|Follow|Semifollow
-      This specifies what should happen when you click on an iconbar button for
-      a window in another workspace. `Current' moves the window to the current
-      workspace. `Follow' switches to the window's workspace. `Semifollow' acts
-      like `Current' for minimized windows and like `Follow' for the rest.
-      Default: Current
-
 session.screen0.iconbar.wheelMode: Screen|On|Off
       This defines the behavior for scrolling on the iconbar. `Screen' uses the
       value set in session.screen0.desktopWheeling . `On' means scrolling on the
@@ -903,11 +897,16 @@ session.screen0.tab.placement: <placement>
 session.screen0.tab.width: <integer>
       This specifies the width of external tabs in pixels. Default: 64
 
-session.screen0.followModel: Ignore|Follow|Current
-      This specifies the behavior when a window on another workspace requests to
-      become the active window. `Ignore' does nothing. `Follow' moves to the
-      window's workspace. `Current' moves the window to the current workspace.
-      Default: Ignore
+session.screen0.followModel: <model>
+session.screen0.userFollowModel: <model>
+      This specifies the behavior when a window on another workspace becomes the
+      active window. The former is used when an application asks to focus the
+      window, and the latter is used when the window is activated due to user
+      actions, such as clicking in the iconbar, menu, or pager. `Ignore' does
+      nothing. `Follow' moves to the window's workspace. `Current' moves the
+      window to the current workspace. `SemiFollow' acts like `Current' for
+      iconified windows and like `Follow' otherwise. Defaults: Ignore and
+      Follow, respectively.
 
 session.screen0.resizeMode: Bottom|Quadrant|Center
       Setting this resource to `Quadrant' makes resizing by ALT + Right
@@ -1024,6 +1023,7 @@ session.keyFile: <location>
 session.menuFile: <location>
 session.slitlistFile: <location>
 session.styleFile: <location>
+session.styleOverlay: <location>
       All of these resources require a pathname to their specific files. This is
       where you can specify different files. Most of the defaults will be
       located in the user's ~/.fluxbox directory.
@@ -1238,10 +1238,11 @@ Couple of things
     press the NextWindow key, you will walk through all windows in the,
     order that they were opened, instead of switching back and forth 
     between the most recently focused windows.
+    16 = Skip iconified windows
 
     To combine any of these effects, add the corresponding numbers.
     For instance, 14 means switch linearly, skipping stuck and shaded
-    windows.
+    windows, since 14 = 8 + 4 + 2.
 
 - Bindkey will append key string and action to your keys file and bind the key.
 
@@ -1376,6 +1377,10 @@ tabs. Inside of it there are three main options:
     When this option is on, tabs are fixed in window titlebar and the width
     varies according to the amount of windows grouped.
 
+- *Maximize Over*:
+    When this option is on, maximizing a window will disregard the size and
+    location of external tabs.
+
 - *External Tab Width*:
     This specifies in pixels the width of external tabs.
 
@@ -1395,6 +1400,10 @@ 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.
 
+In addition to the style file, the overlay file, whose location is specified by
+session.screen0.styleOverlay can be used to set style resources that override
+the current style.
+
 APPLICATIONS
 ------------
 It is possible to force an application to always have the same dimensions,
diff --git a/doc/asciidoc/fluxstyle.txt b/doc/asciidoc/fluxstyle.txt
index 39418c3..596c148 100644
--- a/doc/asciidoc/fluxstyle.txt
+++ b/doc/asciidoc/fluxstyle.txt
@@ -24,10 +24,10 @@ installation of fluxbox is shipped with many classic examples that show a
 great deal of what one could do. To use one of the standard styles navigate to
 the 'System Styles' menu under your main fluxbox menu.
 
-fluxbox uses it's own graphics class to render its images on the fly. By using
-styles you can determine, at a great level, of configurability what your
-desktop will look like. Since fluxbox was derived from flackbox many often
-wonder if old themes will work on the latest releases of flackbox. Well they
+fluxbox uses its own graphics class to render its images on the fly. By using
+styles you can determine, at a great level of configurability, what your
+desktop will look like. Since fluxbox was derived from blackbox many often
+wonder if old themes will work on the latest releases of fluxbox. Well they
 basically do, but you will have to tune them since the fluxbox code has
 changed quite a bit since the initial grab.
 
@@ -116,7 +116,7 @@ information about the fonts installed on your system, you can use a
 program like xfontsel(1), gtkfontsel, or xlsfonts(1).)
 
 In the last example you will notice the wildcard (\*) before font. In a Fluxbox
-style you can set a value with a wild card. The example means that every font
+style you can set a value with a wildcard. The example means that every font
 in the style will be what is specified. You can do this with any
 component/value. For example if you wanted all of the text to be one color you
 would do:
@@ -157,8 +157,8 @@ Select one of these texture types. They only work when *Gradient* is specified.
 
 .Interlaced
 tells fluxbox to interlace the texture (darken every other line). This option
-is most commonly used with gradiented textures, but from fluxbox version
-0.60.3 on, it also works in solid textures.
+is most commonly used with gradiented textures, but it also works in solid
+textures.
 
 .Bevel1 | Bevel2
 tells fluxbox which type of bevel to use. Bevel1 is the default bevel. The