Imported Upstream version 0.7.0

9 files changed, 288 insertions, 89 deletions

diff --git a/doc/herbstclient.1 b/doc/herbstclient.1
index 061ada06..33454002 100644
--- a/doc/herbstclient.1
+++ b/doc/herbstclient.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: herbstclient
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2014-03-27
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 2016-02-04
 .\"    Manual: \ \&
-.\"    Source: \ \& herbstluftwm 0.6.2\e \e(80c5fe4\e)
+.\"    Source: \ \& herbstluftwm 0.7.0\e \e(c179281\e)
 .\"  Language: English
 .\"
-.TH "HERBSTCLIENT" "1" "2014\-03\-27" "\ \& herbstluftwm 0\&.6\&.2\e" "\ \&"
+.TH "HERBSTCLIENT" "1" "2016\-02\-04" "\ \& herbstluftwm 0\&.7\&.0\e" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -48,6 +48,19 @@ If \fI\-\-wait\fR or \fI\-\-idle\fR is passed, then it waits for hooks from \fBh
 Do not print a newline if output does not end with a newline\&.
 .RE
 .PP
+\fB\-0\fR, \fB\-\-print0\fR
+.RS 4
+Use the null character as delimiter between the output of hooks\&.
+.RE
+.PP
+\fB\-l\fR, \fB\-\-last\-arg\fR
+.RS 4
+When using
+\fB\-i\fR
+or
+\fB\-w\fR, only print the last argument of the hook\&.
+.RE
+.PP
 \fB\-i\fR, \fB\-\-idle\fR
 .RS 4
 Wait for hooks instead of executing commands\&.
@@ -127,7 +140,7 @@ Feel free to join the IRC channel \fI#herbstluftwm\fR on \fIirc\&.freenode\&.net
 .sp
 Homepage: http://herbstluftwm\&.org
 .sp
-Gitweb: http://git\&.cs\&.fau\&.de/?p=re06huxa/herbstluftwm
+Github page: http://github\&.com/herbstluftwm/herbstluftwm
 .sp
 Patch submission and bug reporting:
 .sp
diff --git a/doc/herbstclient.html b/doc/herbstclient.html
index 27d8d3f1..eaa89994 100644
--- a/doc/herbstclient.html
+++ b/doc/herbstclient.html
@@ -778,6 +778,22 @@ regular expressions. For a list of available hooks see <strong>herbstluftwm</str
 </p>

 </dd>

 <dt class="hdlist1">

+<strong>-0</strong>, <strong>--print0</strong>

+</dt>

+<dd>

+<p>

+    Use the null character as delimiter between the output of hooks.

+</p>

+</dd>

+<dt class="hdlist1">

+<strong>-l</strong>, <strong>--last-arg</strong>

+</dt>

+<dd>

+<p>

+    When using <strong>-i</strong> or <strong>-w</strong>, only print the last argument of the hook.

+</p>

+</dd>

+<dt class="hdlist1">

 <strong>-i</strong>, <strong>--idle</strong>

 </dt>

 <dd>

@@ -895,7 +911,7 @@ the <strong>herbstluftwm</strong> distribution AUTHORS file.</p></div>
 <h2 id="_resources">RESOURCES</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>Homepage: <a href="http://herbstluftwm.org">http://herbstluftwm.org</a></p></div>

-<div class="paragraph"><p>Gitweb: <a href="http://git.cs.fau.de/?p=re06huxa/herbstluftwm">http://git.cs.fau.de/?p=re06huxa/herbstluftwm</a></p></div>

+<div class="paragraph"><p>Github page: <a href="http://github.com/herbstluftwm/herbstluftwm">http://github.com/herbstluftwm/herbstluftwm</a></p></div>

 <div class="paragraph"><p>Patch submission and bug reporting:</p></div>

 <div class="literalblock">

 <div class="content">

@@ -915,7 +931,7 @@ details.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-03-27 00:54:22 CET

+Last updated 2015-10-14 15:27:40 CEST

 </div>

 </div>

 </body>

diff --git a/doc/herbstclient.txt b/doc/herbstclient.txt
index ceb32827..9bdb6bbb 100644
--- a/doc/herbstclient.txt
+++ b/doc/herbstclient.txt
@@ -35,6 +35,12 @@ OPTIONS
 *-n*, *--no-newline*::
     Do not print a newline if output does not end with a newline.
 
+*-0*, *--print0*::
+    Use the null character as delimiter between the output of hooks.
+
+*-l*, *--last-arg*::
+    When using *-i* or *-w*, only print the last argument of the hook.
+
 *-i*, *--idle*::
     Wait for hooks instead of executing commands.
 
@@ -92,7 +98,7 @@ RESOURCES
 ---------
 Homepage: <http://herbstluftwm.org>
 
-Gitweb: <http://git.cs.fau.de/?p=re06huxa/herbstluftwm>
+Github page: <http://github.com/herbstluftwm/herbstluftwm>
 
 Patch submission and bug reporting:
 
diff --git a/doc/herbstluftwm-tutorial.7 b/doc/herbstluftwm-tutorial.7
index c5a3a510..f22a1a1e 100644
--- a/doc/herbstluftwm-tutorial.7
+++ b/doc/herbstluftwm-tutorial.7
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: herbstluftwm-tutorial
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2014-03-27
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 2016-02-04
 .\"    Manual: \ \&
-.\"    Source: \ \& herbstluftwm 0.6.2\e \e(80c5fe4\e)
+.\"    Source: \ \& herbstluftwm 0.7.0\e \e(c179281\e)
 .\"  Language: English
 .\"
-.TH "HERBSTLUFTWM\-TUTORI" "7" "2014\-03\-27" "\ \& herbstluftwm 0\&.6\&.2\e" "\ \&"
+.TH "HERBSTLUFTWM\-TUTORI" "7" "2016\-02\-04" "\ \& herbstluftwm 0\&.7\&.0\e" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -87,7 +87,7 @@ Tags (or workspaces\&...)
 .sp -1
 .IP \(bu 2.3
 .\}
-Multi-Monitor handling
+Multi\-Monitor handling
 .RE
 .SH "BASIC INSTALLATION"
 .sp
@@ -118,7 +118,7 @@ If there is no package for your platform or if you want to use the current git v
 .RS 4
 .\}
 .nf
-git clone git://git\&.cs\&.fau\&.de/hlwm herbstluftwm
+git clone git://github\&.com/herbstluftwm/herbstluftwm
 cd herbstluftwm
 make # build the binaries
 
@@ -417,7 +417,7 @@ $ herbstclient load "$layout"       # mind the quotes!
 .if n \{\
 .RE
 .\}
-.SH "TAGS (OR WORKSPACES OR VIRTUAL DESKTOPS OR \&....)"
+.SH "TAGS (OR WORKSPACES OR VIRTUAL DESKTOPS OR \&...\&.)"
 .sp
 A tag consists of a name and a frame layout with clients on it\&. With the default autostart, there are nine tags named 1 to 9\&. You can switch to the ith tag using Mod\-i, e\&.g\&. Mod\-4 to switch to tag 4 or with the command use 4\&. A window can be move to tag i via Mod\-Shift\-i, i\&.e\&. with the move command\&.
 .SH "MONITORS"
diff --git a/doc/herbstluftwm-tutorial.html b/doc/herbstluftwm-tutorial.html
index 5b5d71c9..85101302 100644
--- a/doc/herbstluftwm-tutorial.html
+++ b/doc/herbstluftwm-tutorial.html
@@ -812,7 +812,7 @@ activating it).</p></div>
 version, then you can pull directly from the main repository:</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>git clone git://git.cs.fau.de/hlwm herbstluftwm

+<pre><code>git clone git://github.com/herbstluftwm/herbstluftwm

 cd herbstluftwm

 make # build the binaries

 

@@ -1093,7 +1093,7 @@ you like.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-03-27 00:54:22 CET

+Last updated 2015-10-14 15:27:40 CEST

 </div>

 </div>

 </body>

diff --git a/doc/herbstluftwm-tutorial.txt b/doc/herbstluftwm-tutorial.txt
index 60624698..d4984fac 100644
--- a/doc/herbstluftwm-tutorial.txt
+++ b/doc/herbstluftwm-tutorial.txt
@@ -56,7 +56,7 @@ If there is no package for your platform or if you want to use the current git
 version, then you can pull directly from the main repository:
 
 ----
-git clone git://git.cs.fau.de/hlwm herbstluftwm
+git clone git://github.com/herbstluftwm/herbstluftwm
 cd herbstluftwm
 make # build the binaries
 
diff --git a/doc/herbstluftwm.1 b/doc/herbstluftwm.1
index afae5464..f81146f4 100644
--- a/doc/herbstluftwm.1
+++ b/doc/herbstluftwm.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: herbstluftwm
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 2014-03-27
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 2016-02-04
 .\"    Manual: \ \&
-.\"    Source: \ \& herbstluftwm 0.6.2\e \e(80c5fe4\e)
+.\"    Source: \ \& herbstluftwm 0.7.0\e \e(c179281\e)
 .\"  Language: English
 .\"
-.TH "HERBSTLUFTWM" "1" "2014\-03\-27" "\ \& herbstluftwm 0\&.6\&.2\e" "\ \&"
+.TH "HERBSTLUFTWM" "1" "2016\-02\-04" "\ \& herbstluftwm 0\&.7\&.0\e" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -930,6 +930,11 @@ close_or_remove
 Closes the focused window or removes the current frame if no window is focused\&.
 .RE
 .PP
+close_and_remove
+.RS 4
+Closes the focused window and removes the current frame if no other window is present in that frame\&.
+.RE
+.PP
 split \fIALIGN\fR [\fIFRACTION\fR]
 .RS 4
 Splits the focused frame into two subframes with a specified
@@ -1138,9 +1143,11 @@ can also be within the same frame\&. If there is no client within this frame or
 \fIDIRECTION\fR
 will be focused\&.
 
+
 The direction between frames is defined as follows: The focus is in a leaf of the binary tree\&. Each inner node in the tree remembers the last focus direction (child 0 or child 1)\&. The algorithm uses the shortest possible way from the leaf (the currently focused frame) to the root until it is possible to change focus in the specified
 \fIDIRECTION\fR\&. From there the focus goes back to the leaf\&.
 
+
 Example: The focus is at frame A\&. After executing
 \fIfocus right\fR
 focus will be at frame C\&.
@@ -1149,19 +1156,19 @@ focus will be at frame C\&.
 .RS 4
 .\}
 .nf
- Tree:  V,0     Screen: \&.\-\-\-\-\-\&.\&.\-\-\-\-\-\&. (before)
-        / \e             |  B  ||  C  |
-       /   \e            \*(Aq\-\-\-\-\-\*(Aq\*(Aq\-\-\-\-\-\*(Aq
-     H,1   H,0          \&.\-\-\-\-\-\&.\&.\-\-\-\-\-\&.
-     / \e   / \e          |  A* ||  D  |
-    A*  B C   D         \*(Aq\-\-\-\-\-\*(Aq\*(Aq\-\-\-\-\-\*(Aq
+ Tree:  V,0     Screen: ┌─────┐┌─────┐ (before)
+        ╱ ╲             │  B  ││  C  │
+       ╱   ╲            └─────┘└─────┘
+     H,1   H,0          ┌─────┐┌─────┐
+     ╱ ╲   ╱ ╲          │  A* ││  D  │
+    A*  B C   D         └─────┘└─────┘
 
- Tree:  V,0     Screen: \&.\-\-\-\-\-\&.\&.\-\-\-\-\-\&. (after focus right)
-        / \e             |  B  ||  C* |
-       /   \e            \*(Aq\-\-\-\-\-\*(Aq\*(Aq\-\-\-\-\-\*(Aq
-     H,1   H,0          \&.\-\-\-\-\-\&.\&.\-\-\-\-\-\&.
-     / \e   / \e          |  A  ||  D  |
-    A   B C*  D         \*(Aq\-\-\-\-\-\*(Aq\*(Aq\-\-\-\-\-\*(Aq
+ Tree:  V,0     Screen: ┌─────┐┌─────┐ (after focus right)
+        ╱ ╲             │  B  ││  C* │
+       ╱   ╲            └─────┘└─────┘
+     H,1   H,0          ┌─────┐┌─────┐
+     ╱ ╲   ╱ ╲          │  A  ││  D  │
+    A   B C*  D         └─────┘└─────┘
 .fi
 .if n \{\
 .RE
@@ -1192,6 +1199,7 @@ behave as specified at the
 \fIfocus\fR
 command\&.
 
+
 If
 \fI\-i\fR
 (internal) is given or default_direction_external_only is unset, then the window on the edge of the tag will be focused\&. Else, only the frame on the edge of the tag will be focused, and the window that was last focused in that frame will be focused\&.
@@ -1538,12 +1546,13 @@ In the above example two monitors are split into 5 monitors, which graphically m
 .RS 4
 .\}
 .nf
-11111111                 11111111
-1  222222222             333222224444
-1  2   1   2   disjoin   3 32   24  4
-11121111   2  \-\-\-\-\-\-\-\->  333222224444
-   2       2                555555555
-   222222222                555555555
+┌──────┐                  ┌──────┐
+│      │                  └──────┘
+│  ┌───┼───┐              ┌─┐┌───┐┌──┐
+│  │   │   │   disjoin    │ ││   ││  │
+└──┼───┘   │  ─────────>  └─┘└───┘└──┘
+   │       │                 ┌───────┐
+   └───────┘                 └───────┘
 .fi
 .if n \{\
 .RE
@@ -2099,6 +2108,7 @@ also is replaced by the attribute value if it equals
 .IP \(bu 2.3
 .\}
 substitute MYTITLE clients\&.focus\&.title echo MYTITLE
+
 Prints the title of the currently focused window\&.
 .RE
 .RE
@@ -2129,6 +2139,7 @@ stands for the value of the next attribute in
 .IP \(bu 2.3
 .\}
 sprintf STR title=%s clients\&.focus\&.title echo STR
+
 Prints the title of the currently focused window prepended by
 title=\&.
 .RE
@@ -2142,6 +2153,7 @@ title=\&.
 .IP \(bu 2.3
 .\}
 sprintf X tag=%s tags\&.focus\&.name rule once X
+
 Moves the next client that appears to the tag that is currently focused\&.
 .RE
 .sp
@@ -2154,6 +2166,7 @@ Moves the next client that appears to the tag that is currently focused\&.
 .IP \(bu 2.3
 .\}
 sprintf X %s/%s tags\&.focus\&.index tags\&.count echo X
+
 Tells which tag is focused and how many tags there are
 .RE
 .sp
@@ -2166,6 +2179,7 @@ Tells which tag is focused and how many tags there are
 .IP \(bu 2.3
 .\}
 sprintf l somelongstring echo l l l
+
 Prints
 somelongstring
 three times, separated by spaces\&.
@@ -2275,7 +2289,8 @@ using the comparation method
 .PP
 .RS 4
 The
-\fIOPERATORs\fR\fBle\fR,\fBlt\fR,\fBge\fR,\fBgt\fR
+\fIOPERATORs\fR
+\fBle\fR,\fBlt\fR,\fBge\fR,\fBgt\fR
 can only be used if
 \fIATTRIBUTE\fR
 is of the type integer or unsigned integer\&. Note that the first parameter must always be an attribute and the second a constant value\&. If you want to compare two attributes, use the substitute command:
@@ -2508,6 +2523,7 @@ focus_follows_mouse (Integer)
 .RS 4
 If set and a window is focused by mouse cursor, this window is focused (this feature is also known as sloppy focus)\&. If unset, you need to click to change the window focus by mouse\&.
 
+
 If another window is hidden by the focus change (e\&.g\&. when having pseudotiled windows in the max layout) then an extra click is required to change the focus\&.
 .RE
 .PP
@@ -2825,7 +2841,9 @@ or
 hook
 .RS 4
 emits the custom hook
-rule\fIVALUE\fR\fIWINID\fR
+rule
+\fIVALUE\fR
+\fIWINID\fR
 when this rule is triggered by a new window with the id
 \fIWINID\fR\&. This consequence can be used multiple times, which will cause a hook to be emitted for each occurrence of a hook consequence\&.
 .RE
@@ -2905,6 +2923,7 @@ Examples:
 .IP \(bu 2.3
 .\}
 rule \-\-class=Netscape \-\-tag=6 \-\-focus=off
+
 Moves all Netscape instances to tag 6, but doesn\(cqt give focus to them\&.
 .RE
 .sp
@@ -2917,6 +2936,7 @@ Moves all Netscape instances to tag 6, but doesn\(cqt give focus to them\&.
 .IP \(bu 2.3
 .\}
 rule not class~\&.*[Tt]erm tag=2
+
 Moves all clients to tag 2, if their class does not end with
 term
 or
@@ -2932,6 +2952,7 @@ Term\&.
 .IP \(bu 2.3
 .\}
 rule class=Thunderbird index=/0
+
 Insert all Thunderbird instances in the tree that has no focus and there in the first child\&.
 .RE
 .sp
@@ -2944,6 +2965,7 @@ Insert all Thunderbird instances in the tree that has no focus and there in the
 .IP \(bu 2.3
 .\}
 rule \-\-windowtype=_NET_WM_WINDOW_TYPE_DIALOG \-\-focus=on
+
 Sets focus to new dialogs which set their
 _NET_WM_WINDOW_TYPE
 correctly\&.
@@ -3258,6 +3280,18 @@ T}
 .sp -1
 .IP \(bu 2.3
 .\}
+\fIindex\fR: the object of the tag with index
+\fIindex\fR\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 by\-name
 .sp
 .RS 4
@@ -3268,7 +3302,7 @@ by\-name
 .sp -1
 .IP \(bu 2.3
 .\}
-\fITAG\fR: a object for each tag with the name
+\fITAG\fR: an object for each tag with the name
 \fITAG\fR
 .TS
 allbox tab(:);
@@ -3954,6 +3988,44 @@ frame decorations
 .RE
 .sp
 All monitors are managed in one large stack which only consists of the stacks of the visible tags put above each other\&. The stacking order of these monitors is independent from their indices and can be modified using the \fBraise_monitor\fR command\&. The current stack is illustrated by the \fBstack\fR command\&.
+.SH "EWMH"
+.sp
+As far as possible, herbstluftwm tries to be EWMH compliant\&. That includes:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Information about tag names and client lists is provided\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Desktop windows from desktop environments are not managed and kept below the other windows\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Client requests like getting focused are only processed if the setting
+\fIfocus_stealing_prevention\fR
+is disabled\&.
+.RE
 .SH "ENVIRONMENT VARIABLES"
 .PP
 DISPLAY
@@ -3962,6 +4034,21 @@ Specifies the
 \fIDISPLAY\fR
 to use\&.
 .RE
+.SH "FILES"
+.sp
+The following files are used by herbstluftwm:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fIautostart\fR, see section
+\fBAUTOSTART FILE\fR\&.
+.RE
 .SH "EXIT STATUS"
 .sp
 Returns \fB0\fR on success\&. Returns EXIT_FAILURE if it cannot startup or if \fIwmexec\fR fails\&.
@@ -3978,7 +4065,7 @@ Feel free to join the IRC channel \fI#herbstluftwm\fR on \fIirc\&.freenode\&.net
 .sp
 Homepage: http://herbstluftwm\&.org
 .sp
-Gitweb: http://git\&.cs\&.fau\&.de/?p=re06huxa/herbstluftwm
+Github page: http://github\&.com/herbstluftwm/herbstluftwm
 .sp
 Patch submission and bug reporting:
 .sp
diff --git a/doc/herbstluftwm.html b/doc/herbstluftwm.html
index 324b598a..8e83bec3 100644
--- a/doc/herbstluftwm.html
+++ b/doc/herbstluftwm.html
@@ -1461,6 +1461,15 @@ close_or_remove
 </p>

 </dd>

 <dt class="hdlist1">

+close_and_remove

+</dt>

+<dd>

+<p>

+    Closes the focused window and removes the current frame if no other window

+    is present in that frame.

+</p>

+</dd>

+<dt class="hdlist1">

 split <em>ALIGN</em> [<em>FRACTION</em>]

 </dt>

 <dd>

@@ -1591,19 +1600,19 @@ d[own]
 </p>

 <div class="listingblock">

 <div class="content">

-<pre><code> Tree:  V,0     Screen: .-----..-----. (before)

-        / \             |  B  ||  C  |

-       /   \            '-----''-----'

-     H,1   H,0          .-----..-----.

-     / \   / \          |  A* ||  D  |

-    A*  B C   D         '-----''-----'

-

- Tree:  V,0     Screen: .-----..-----. (after focus right)

-        / \             |  B  ||  C* |

-       /   \            '-----''-----'

-     H,1   H,0          .-----..-----.

-     / \   / \          |  A  ||  D  |

-    A   B C*  D         '-----''-----'</code></pre>

+<pre><code> Tree:  V,0     Screen: ┌─────┐┌─────┐ (before)

+        ╱ ╲             │  B  ││  C  │

+       ╱   ╲            └─────┘└─────┘

+     H,1   H,0          ┌─────┐┌─────┐

+     ╱ ╲   ╱ ╲          │  A* ││  D  │

+    A*  B C   D         └─────┘└─────┘

+

+ Tree:  V,0     Screen: ┌─────┐┌─────┐ (after focus right)

+        ╱ ╲             │  B  ││  C* │

+       ╱   ╲            └─────┘└─────┘

+     H,1   H,0          ┌─────┐┌─────┐

+     ╱ ╲   ╱ ╲          │  A  ││  D  │

+    A   B C*  D         └─────┘└─────┘</code></pre>

 </div></div>

 </dd>

 <dt class="hdlist1">

@@ -1948,12 +1957,13 @@ In the above example two monitors are split into 5 monitors, which
 </p>

 <div class="listingblock">

 <div class="content">

-<pre><code>11111111                 11111111

-1  222222222             333222224444

-1  2   1   2   disjoin   3 32   24  4

-11121111   2  --------&gt;  333222224444

-   2       2                555555555

-   222222222                555555555</code></pre>

+<pre><code>┌──────┐                  ┌──────┐

+│      │                  └──────┘

+│  ┌───┼───┐              ┌─┐┌───┐┌──┐

+│  │   │   │   disjoin    │ ││   ││  │

+└──┼───┘   │  ─────────&gt;  └─┘└───┘└──┘

+   │       │                 ┌───────┐

+   └───────┘                 └───────┘</code></pre>

 </div></div>

 </li>

 </ul></div>

@@ -3464,12 +3474,17 @@ cellspacing="0" cellpadding="4">
 <div class="ulist"><ul>

 <li>

 <p>

+<em>index</em>: the object of the tag with index <em>index</em>.

+</p>

+</li>

+<li>

+<p>

 <code>by-name</code>

 </p>

 <div class="ulist"><ul>

 <li>

 <p>

-<em>TAG</em>: a object for each tag with the name <em>TAG</em><br />

+<em>TAG</em>: an object for each tag with the name <em>TAG</em><br />

 </p>

 <div class="tableblock">

 <table rules="all"

@@ -3825,7 +3840,7 @@ respective attribute of the <code>tiling</code> and the <code>floating</code> ob
 </div>

 </div>

 <div class="sect1">

-<h2 id="_autostart_file">AUTOSTART FILE</h2>

+<h2 id="AUTOSTART">AUTOSTART FILE</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>There is no configuration file but an autostart file, which is executed on

 startup. It is also executed on command <em>reload</em>. If not specified by the

@@ -3982,6 +3997,31 @@ command. The current stack is illustrated by the <strong>stack</strong> command.
 </div>

 </div>

 <div class="sect1">

+<h2 id="EWMH">EWMH</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>As far as possible, herbstluftwm tries to be EWMH compliant. That includes:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+Information about tag names and client lists is provided.

+</p>

+</li>

+<li>

+<p>

+Desktop windows from desktop environments are not managed and kept below the

+    other windows.

+</p>

+</li>

+<li>

+<p>

+Client requests like getting focused are only processed if the setting

+    <em>focus_stealing_prevention</em> is disabled.

+</p>

+</li>

+</ul></div>

+</div>

+</div>

+<div class="sect1">

 <h2 id="_environment_variables">ENVIRONMENT VARIABLES</h2>

 <div class="sectionbody">

 <div class="dlist"><dl>

@@ -3997,6 +4037,19 @@ DISPLAY
 </div>

 </div>

 <div class="sect1">

+<h2 id="_files">FILES</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>The following files are used by herbstluftwm:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+<em>autostart</em>, see section <a href="#AUTOSTART"><strong>AUTOSTART FILE</strong></a>.

+</p>

+</li>

+</ul></div>

+</div>

+</div>

+<div class="sect1">

 <h2 id="_exit_status">EXIT STATUS</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>Returns <strong>0</strong> on success. Returns <code>EXIT_FAILURE</code> if it cannot startup or if

@@ -4026,7 +4079,7 @@ the <strong>herbstluftwm</strong> distribution AUTHORS file.</p></div>
 <h2 id="_resources">RESOURCES</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>Homepage: <a href="http://herbstluftwm.org">http://herbstluftwm.org</a></p></div>

-<div class="paragraph"><p>Gitweb: <a href="http://git.cs.fau.de/?p=re06huxa/herbstluftwm">http://git.cs.fau.de/?p=re06huxa/herbstluftwm</a></p></div>

+<div class="paragraph"><p>Github page: <a href="http://github.com/herbstluftwm/herbstluftwm">http://github.com/herbstluftwm/herbstluftwm</a></p></div>

 <div class="paragraph"><p>Patch submission and bug reporting:</p></div>

 <div class="literalblock">

 <div class="content">

@@ -4046,7 +4099,7 @@ details.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-03-27 00:54:22 CET

+Last updated 2015-10-14 15:27:40 CEST

 </div>

 </div>

 </body>

diff --git a/doc/herbstluftwm.txt b/doc/herbstluftwm.txt
index ea44a63c..96b36976 100644
--- a/doc/herbstluftwm.txt
+++ b/doc/herbstluftwm.txt
@@ -353,6 +353,10 @@ close_or_remove::
     Closes the focused window or removes the current frame if no window is
     focused.
 
+close_and_remove::
+    Closes the focused window and removes the current frame if no other window
+    is present in that frame.
+
 split 'ALIGN' ['FRACTION']::
     Splits the focused frame into two subframes with a specified 'FRACTION'
     between 0 and 1 which defaults to 0.5. 'ALIGN' is one of
@@ -405,19 +409,19 @@ focus ['-i'|'-e'] 'DIRECTION'::
     be at frame C.
 +
 ----
- Tree:  V,0     Screen: .-----..-----. (before)
-        / \             |  B  ||  C  |
-       /   \            '-----''-----'
-     H,1   H,0          .-----..-----.
-     / \   / \          |  A* ||  D  |
-    A*  B C   D         '-----''-----'
-
- Tree:  V,0     Screen: .-----..-----. (after focus right)
-        / \             |  B  ||  C* |
-       /   \            '-----''-----'
-     H,1   H,0          .-----..-----.
-     / \   / \          |  A  ||  D  |
-    A   B C*  D         '-----''-----'
+ Tree:  V,0     Screen: ┌─────┐┌─────┐ (before)
+        ╱ ╲             │  B  ││  C  │
+       ╱   ╲            └─────┘└─────┘
+     H,1   H,0          ┌─────┐┌─────┐
+     ╱ ╲   ╱ ╲          │  A* ││  D  │
+    A*  B C   D         └─────┘└─────┘
+
+ Tree:  V,0     Screen: ┌─────┐┌─────┐ (after focus right)
+        ╱ ╲             │  B  ││  C* │
+       ╱   ╲            └─────┘└─────┘
+     H,1   H,0          ┌─────┐┌─────┐
+     ╱ ╲   ╱ ╲          │  A  ││  D  │
+    A   B C*  D         └─────┘└─────┘
 ----
  ::
     If the currently focused client is floated, then the next floating window in
@@ -583,12 +587,13 @@ disjoin_rects 'RECTS' ...::
           graphically means:
 +
 ----
-11111111                 11111111
-1  222222222             333222224444
-1  2   1   2   disjoin   3 32   24  4
-11121111   2  -------->  333222224444
-   2       2                555555555
-   222222222                555555555
+┌──────┐                  ┌──────┐
+│      │                  └──────┘
+│  ┌───┼───┐              ┌─┐┌───┐┌──┐
+│  │   │   │   disjoin    │ ││   ││  │
+└──┼───┘   │  ─────────>  └─┘└───┘└──┘
+   │       │                 ┌───────┐
+   └───────┘                 └───────┘
 ----
 
 set_monitors 'RECTS' ...::
@@ -1348,8 +1353,9 @@ listed as follows:
 |===========================
  u - count                , number of tags
 |===========================
+    ** 'index': the object of the tag with index 'index'.
     ** +by-name+
-        *** 'TAG': a object for each tag with the name 'TAG' +
+        *** 'TAG': an object for each tag with the name 'TAG' +
 +
 [format="csv",cols="m,"]
 |===========================
@@ -1466,7 +1472,7 @@ respective attribute of the +tiling+ and the +floating+ object.
    ** +urgent+ propagates the attribute values to +tiling.urgent+ and
       +floating.urgent+
 
-
+[[AUTOSTART]]
 AUTOSTART FILE
 --------------
 
@@ -1548,11 +1554,29 @@ the visible tags put above each other. The stacking order of these monitors is
 independent from their indices and can be modified using the *raise_monitor*
 command. The current stack is illustrated by the *stack* command.
 
+[[EWMH]]
+EWMH
+----
+As far as possible, herbstluftwm tries to be EWMH compliant. That includes:
+
+  - Information about tag names and client lists is provided.
+  - Desktop windows from desktop environments are not managed and kept below the
+    other windows.
+  - Client requests like getting focused are only processed if the setting
+    'focus_stealing_prevention' is disabled.
+
 ENVIRONMENT VARIABLES
 ---------------------
 DISPLAY::
     Specifies the 'DISPLAY' to use.
 
+
+FILES
+-----
+The following files are used by herbstluftwm:
+
+  - 'autostart', see section <<AUTOSTART,*AUTOSTART FILE*>>.
+
 EXIT STATUS
 -----------
 Returns *0* on success. Returns +EXIT_FAILURE+ if it cannot startup or if
@@ -1575,7 +1599,7 @@ RESOURCES
 ---------
 Homepage: <http://herbstluftwm.org>
 
-Gitweb: <http://git.cs.fau.de/?p=re06huxa/herbstluftwm>
+Github page: <http://github.com/herbstluftwm/herbstluftwm>
 
 Patch submission and bug reporting: