merge

2 files changed, 13 insertions, 5 deletions

diff --git a/doc/asciidoc/client-patterns.txt b/doc/asciidoc/client-patterns.txt
index 5bb50a0..ed1229d 100644
--- a/doc/asciidoc/client-patterns.txt
+++ b/doc/asciidoc/client-patterns.txt
@@ -32,9 +32,18 @@ The following values are accepted for 'propertyname':::
 *Maximized*;;
         Either *yes* or *no*, depending on whether the window is maximized or
         not.
+*MaximizedHorizontal*;;
+        Either *yes* or *no*, depending on whether the window is maximized
+        horizontally or not.
+*MaximizedVertical*;;
+        Either *yes* or *no*, depending on whether the window is maximized
+        vertically or not.
 *Minimized*;;
         Either *yes* or *no*, depending on whether the window is minimized
         (iconified) or not.
+*Fullscreen*;;
+        Either *yes* or *no*, depending on whether the window is fullscreen or
+        not.
 *Shaded*;;
         Either *yes* or *no*, depending on whether the window is shaded or
         not.
diff --git a/doc/asciidoc/fluxbox-apps.txt b/doc/asciidoc/fluxbox-apps.txt
index 07bac0e..31a26fa 100644
--- a/doc/asciidoc/fluxbox-apps.txt
+++ b/doc/asciidoc/fluxbox-apps.txt
@@ -137,10 +137,10 @@ Specify the decoration state. There are several predefined 'value' sets:;;
                 Standard decorations
         *NONE*;;
                 No decorations
-        *TAB*
-                Like TAB except keep the tabs
-        *Border*;;
+        *BORDER*;;
                 Like NONE except keep the X window border
+        *TAB*;;
+                Like BORDER except keep external tabs (if enabled)
         *TINY*;;
                 Titlebar with only an iconify button
         *TOOL*;;
@@ -150,8 +150,7 @@ Specify the decoration state. There are several predefined 'value' sets:;;
 +
 The 'value' may also be a bitmask for finer-grained control. The bits are, from
 (1<<0) to (1<<10): Titlebar, Handle/Grips, Border, Iconify Button, Maximize
-Button, Close Button, Menu Enabled, Sticky Button, Shade Button, Tabbing
-enabled, Focus Enabled.
+Button, Close Button, Menu Button, Sticky Button, Shade Button, External Tabs, Focus Enabled.
 
 *[Shaded]* {'bool'}::
         Whether the window is Shaded (rolled-up) or not.