summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Egger <christoph@debian.org>2018-08-18 18:27:06 +0200
committerChristoph Egger <christoph@debian.org>2018-08-18 18:38:24 +0200
commit8728a7422ea09df6eb2b181cf806a2b017c9dbc0 (patch)
tree68bed38ca6b71783da77cf50f36e34a0bd9ba0c2
parent1417514afc1f2b01d9208145c434216bb0597d7c (diff)
* New upstream release * Move to salsa's Debian group from collab-maint
-rw-r--r--Makefile11
-rw-r--r--debian/changelog7
-rw-r--r--debian/compat2
-rw-r--r--debian/control8
-rw-r--r--debian/patches/series3
-rw-r--r--debian/patches/spelling48
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/watch2
-rw-r--r--doc/herbstclient.18
-rw-r--r--doc/herbstclient.html6
-rw-r--r--doc/herbstluftwm-tutorial.714
-rw-r--r--doc/herbstluftwm-tutorial.html10
-rw-r--r--doc/herbstluftwm.133
-rw-r--r--doc/herbstluftwm.html30
-rw-r--r--ipc-client/main.c2
-rw-r--r--src/globals.h2
-rw-r--r--version.mk2
-rw-r--r--www/faq.txt2
18 files changed, 137 insertions, 55 deletions
diff --git a/Makefile b/Makefile
index bbe7fd8b..7849896e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,15 +18,6 @@ HERBSTCLIENTDOC = doc/herbstclient.txt
HERBSTLUFTWMDOC = doc/herbstluftwm.txt
TUTORIAL = doc/herbstluftwm-tutorial.txt
-DATE_FMT = %Y-%m-%d
-ifdef SOURCE_DATE_EPOCH
- BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)")
-else
- BUILD_DATE ?= $(shell date "+$(DATE_FMT)")
-endif
-
-export CPPFLAGS += -DBUILD_DATE="\"$(BUILD_DATE)\""
-
.PHONY: depend all all-nodoc doc install install-nodoc info www
.PHONY: cleandoc cleanwww cleandeps clean
@@ -102,7 +93,7 @@ tar: doc
doc/%.1 doc/%.7: doc/%.txt version.mk
$(call colorecho,DOC,$@)
- $(VERBOSE) $(A2X) -f manpage -a "herbstluftwmversion=herbstluftwm $(VERSION)" -a "date=$(BUILD_DATE)" $<
+ $(VERBOSE) $(A2X) -f manpage -a "herbstluftwmversion=herbstluftwm $(VERSION)" -a "date=`date +%Y-%m-%d`" $<
doc/%.html: doc/%.txt version.mk
$(call colorecho,DOC,$@)
diff --git a/debian/changelog b/debian/changelog
index b04936fe..023de837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+herbstluftwm (0.7.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Move to salsa's Debian group from collab-maint
+
+ -- Christoph Egger <christoph@debian.org> Sat, 18 Aug 2018 18:26:34 +0200
+
herbstluftwm (0.7.0-2) unstable; urgency=medium
* Import patch by Fabian Wolff to make build reproducible (Closes:
diff --git a/debian/compat b/debian/compat
index ec635144..b4de3947 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index a5724f47..6e261d82 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Christoph Egger <christoph@debian.org>
Build-Depends:
- debhelper (>= 9~),
+ debhelper (>= 11~),
libglib2.0-dev,
libx11-dev,
libxinerama-dev,
@@ -12,10 +12,10 @@ Build-Depends:
docbook-xml,
docbook-xsl,
xsltproc
-Standards-Version: 4.1.0
+Standards-Version: 4.1.4
Homepage: https://herbstluftwm.org
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/herbstluftwm.git
-Vcs-Browser: https://anonscm.debian.org/git/collab-maint/herbstluftwm.git;a=summary
+Vcs-Git: https://salsa.debian.org/debian/herbstluftwm.git
+Vcs-Browser: https://salsa.debian.org/debian/herbstluftwm
Package: herbstluftwm
Architecture: any
diff --git a/debian/patches/series b/debian/patches/series
index 7418fb23..d6231c29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-reproducible.diff
+#reproducible.diff
+spelling
diff --git a/debian/patches/spelling b/debian/patches/spelling
new file mode 100644
index 00000000..7fc31241
--- /dev/null
+++ b/debian/patches/spelling
@@ -0,0 +1,48 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ herbstluftwm (0.7.1-1) unstable; urgency=medium
+ .
+ * New upstream release
+ * Move to salsa's Debian group from collab-maint
+Author: Christoph Egger <christoph@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2018-08-18
+
+--- herbstluftwm-0.7.1.orig/doc/herbstluftwm.txt
++++ herbstluftwm-0.7.1/doc/herbstluftwm.txt
+@@ -829,8 +829,8 @@ mktemp [*bool*|*int*|*string*|*uint*] 'I
+ then. The exit status of 'COMMAND' is returned.
+
+ compare 'ATTRIBUTE' 'OPERATOR' 'VALUE'::
+- Compares the value of 'ATTRIBUTE' with 'VALUE' using the comparation method
+- 'OPERATOR'. If the comparation succeeds, it returns 0, else 1. The operators
++ Compares the value of 'ATTRIBUTE' with 'VALUE' using the comparison method
++ 'OPERATOR'. If the comparison succeeds, it returns 0, else 1. The operators
+ are:
+ - *=*: __ATTRIBUTE__'s value equals 'VALUE'
+ - *!=*: __ATTRIBUTE__'s value does not equal 'VALUE'
+@@ -1531,7 +1531,7 @@ urgent [on|off] 'WINID'::
+ The urgent state of client with given 'WINID' has been changed to [on|off].
+
+ rule 'NAME' 'WINID'::
+- A window with the id 'WINID' appeared which triggerd a rule with the
++ A window with the id 'WINID' appeared which triggered a rule with the
+ consequence hook='NAME'.
+
+ There are also other useful hooks, which never will be emitted by herbstluftwm
diff --git a/debian/rules b/debian/rules
index afd140dd..4a7a7106 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --parallel
+ dh $@
override_dh_auto_clean:
dh_auto_clean -- VERBOSE= COLOR=0
diff --git a/debian/watch b/debian/watch
index e2c65240..f28c3fde 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
opts=pgpsigurlmangle=s/$/.sig/ \
-http://herbstluftwm.org/tarballs/herbstluftwm-([\d.]+).tar.gz
+https://herbstluftwm.org/tarballs/herbstluftwm-([\d.]+).tar.gz
diff --git a/doc/herbstclient.1 b/doc/herbstclient.1
index 33454002..e95af457 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.79.1 <http://docbook.sf.net/>
-.\" Date: 2016-02-04
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Date: 2018-08-09
.\" Manual: \ \&
-.\" Source: \ \& herbstluftwm 0.7.0\e \e(c179281\e)
+.\" Source: \ \& herbstluftwm 0.7.1\e \e(6fea00f\e)
.\" Language: English
.\"
-.TH "HERBSTCLIENT" "1" "2016\-02\-04" "\ \& herbstluftwm 0\&.7\&.0\e" "\ \&"
+.TH "HERBSTCLIENT" "1" "2018\-08\-09" "\ \& herbstluftwm 0\&.7\&.1\e" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/doc/herbstclient.html b/doc/herbstclient.html
index eaa89994..6416613f 100644
--- a/doc/herbstclient.html
+++ b/doc/herbstclient.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>herbstclient(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -931,7 +932,8 @@ details.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-10-14 15:27:40 CEST
+Last updated
+ 2018-03-15 00:05:23 CET
</div>
</div>
</body>
diff --git a/doc/herbstluftwm-tutorial.7 b/doc/herbstluftwm-tutorial.7
index f22a1a1e..a9f1bd32 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.79.1 <http://docbook.sf.net/>
-.\" Date: 2016-02-04
+.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Date: 2018-08-09
.\" Manual: \ \&
-.\" Source: \ \& herbstluftwm 0.7.0\e \e(c179281\e)
+.\" Source: \ \& herbstluftwm 0.7.1\e \e(6fea00f\e)
.\" Language: English
.\"
-.TH "HERBSTLUFTWM\-TUTORI" "7" "2016\-02\-04" "\ \& herbstluftwm 0\&.7\&.0\e" "\ \&"
+.TH "HERBSTLUFTWM\-TUTORI" "7" "2018\-08\-09" "\ \& herbstluftwm 0\&.7\&.1\e" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -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://github\&.com/herbstluftwm/herbstluftwm
+git clone https://github\&.com/herbstluftwm/herbstluftwm
cd herbstluftwm
make # build the binaries
@@ -388,7 +388,7 @@ $ herbstclient layout
.RE
.\}
.sp
-Just play with it a bit to how it works\&. You also can permanently save the layout using the dump command:
+Just play with it a bit to understand how it works\&. You also can permanently save the layout using the dump command:
.sp
.if n \{\
.RS 4
diff --git a/doc/herbstluftwm-tutorial.html b/doc/herbstluftwm-tutorial.html
index 85101302..bbbc1929 100644
--- a/doc/herbstluftwm-tutorial.html
+++ b/doc/herbstluftwm-tutorial.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>herbstluftwm-tutorial(7)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -812,7 +813,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://github.com/herbstluftwm/herbstluftwm
+<pre><code>git clone https://github.com/herbstluftwm/herbstluftwm
cd herbstluftwm
make # build the binaries
@@ -1015,7 +1016,7 @@ command:</p></div>
│ └─╼ vertical:
└─╼ max: 0x1a00009 [FOCUS]</code></pre>
</div></div>
-<div class="paragraph"><p>Just play with it a bit to how it works. You also can permanently save the
+<div class="paragraph"><p>Just play with it a bit to understand how it works. You also can permanently save the
layout using the <code>dump</code> command:</p></div>
<div class="listingblock">
<div class="content">
@@ -1093,7 +1094,8 @@ you like.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-10-14 15:27:40 CEST
+Last updated
+ 2018-03-15 00:05:23 CET
</div>
</div>
</body>
diff --git a/doc/herbstluftwm.1 b/doc/herbstluftwm.1
index f81146f4..07552538 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.79.1 <http://docbook.sf.net/>
-.\" Date: 2016-02-04
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
+.\" Date: 2018-08-09
.\" Manual: \ \&
-.\" Source: \ \& herbstluftwm 0.7.0\e \e(c179281\e)
+.\" Source: \ \& herbstluftwm 0.7.1\e \e(6fea00f\e)
.\" Language: English
.\"
-.TH "HERBSTLUFTWM" "1" "2016\-02\-04" "\ \& herbstluftwm 0\&.7\&.0\e" "\ \&"
+.TH "HERBSTLUFTWM" "1" "2018\-08\-09" "\ \& herbstluftwm 0\&.7\&.1\e" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -58,7 +58,9 @@ Initially set the monitors_locked setting to 1
.PP
\fB\-\-verbose\fR
.RS 4
-print verbose information to stderr
+print verbose information to stderr\&. This can be switched at run\-time by the
+\fIverbose\fR
+setting\&.
.RE
.sp
This manual documents the scripting and configuration interface\&. For a more verbose introduction see \fBherbstluftwm\-tutorial\fR(7)\&.
@@ -857,7 +859,7 @@ defaults to 1\&. If there are multiple windows within on frame, then it acts sim
\fIcycle\fR
command\&. (The
\fIcycle_all\fR
-command focuses the next/previous leave in the
+command focuses the next/previous leaf in the
\fIlayout\fR
tree\&.)\&. If
\fB\-\-skip\-invisible\fR
@@ -886,7 +888,11 @@ defaults to 1\&. You can find a
list of layout algorithms
above\&. If a list of
\fILAYOUTS\fR
-is given, cycle_layout will cycle through those instead of the default layout algorithm list\&. Each layout name should occur at most once\&. Example:
+is given, cycle_layout will cycle through those instead of the default layout algorithm list\&. This is done by finding the first occurrence of the current layout in
+\fILAYOUTS\fR
+and picking the next layout according to
+\fIDELTA\fR\&. If the current layout doesn\(cqt occur in
+\fILAYOUTS\fR, the first entry is picked\&. Example:
.sp
.RS 4
.ie n \{\
@@ -1310,7 +1316,8 @@ command\&. If the focused client is floated instead of being tiled, then client
shift_to_monitor \fIMONITOR\fR
.RS 4
Moves the focused window to the tag on the specified
-\fIMONITOR\fR\&.
+\fIMONITOR\fR\&. See the
+MONITORS section, how to address a monitor\&.
.RE
.PP
remove
@@ -1392,7 +1399,8 @@ defaults to 1\&.
.PP
focus_monitor \fIMONITOR\fR
.RS 4
-Puts focus to the specified monitor\&.
+Puts focus to the specified monitor\&. See the
+MONITORS section, how to address a monitor\&.
.RE
.PP
add \fITAG\fR
@@ -2613,6 +2621,13 @@ update_dragged_clients (Int)
.RS 4
If set, a client\(cqs window content is resized immediately during resizing it with the mouse\&. If unset, the client\(cqs content is resized after the mouse button are released\&.
.RE
+.PP
+verbose (Int)
+.RS 4
+If set, verbose output is logged to herbstluftwm\(cqs stderr\&. The default value is controlled by the
+\fB\-\-verbose\fR
+command line flag\&.
+.RE
.SH "RULES"
.sp
Rules are used to change default properties for certain clients when they appear\&. Each rule matches against a certain subset of all clients and defines a set of properties for them (called \fICONSEQUENCE\fRs)\&. A rule can be defined with this command:
diff --git a/doc/herbstluftwm.html b/doc/herbstluftwm.html
index 8e83bec3..2a569d04 100644
--- a/doc/herbstluftwm.html
+++ b/doc/herbstluftwm.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 8.6.10" />
<title>herbstluftwm(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -787,7 +788,8 @@ of available <a href="#COMMANDS"><strong>COMMANDS</strong></a> is listed below.<
</dt>
<dd>
<p>
- print verbose information to stderr
+ print verbose information to stderr. This can be switched at run-time by
+ the <em>verbose</em> setting.
</p>
</dd>
</dl></div>
@@ -1393,7 +1395,7 @@ cycle_all [<strong>--skip-invisible</strong>] [<em>DIRECTION</em>]
means forward, <em>DIRECTION</em> = -1 means backward, <em>DIRECTION</em> = 0 has no
effect. <em>DIRECTION</em> defaults to 1. If there are multiple windows within on
frame, then it acts similar to the <em>cycle</em> command. (The <em>cycle_all</em> command
- focuses the next/previous leave in the <em>layout</em> tree.). If
+ focuses the next/previous leaf in the <em>layout</em> tree.). If
<strong>--skip-invisible</strong> is given, then this only cycles through all visible
windows and skips invisible windows in the max layout. The focused window
is raised.
@@ -1416,8 +1418,10 @@ cycle_layout [<em>DELTA</em> [<em>LAYOUTS</em> &#8230;]]
<p>
Cycles the layout algorithm in the current frame by <em>DELTA</em>. <em>DELTA</em>
defaults to 1. You can find a <a href="#LIST_LAYOUT_ALGORITHMS">list of layout algorithms</a> above. If a list of <em>LAYOUTS</em> is given, cycle_layout will cycle
- through those instead of the default layout algorithm list. Each layout name
- should occur at most once. Example:
+ through those instead of the default layout algorithm list. This is done by
+ finding the first occurrence of the current layout in <em>LAYOUTS</em> and picking
+ the next layout according to <em>DELTA</em>. If the current layout doesn&#8217;t occur in
+ <em>LAYOUTS</em>, the first entry is picked. Example:
</p>
<div class="ulist"><ul>
<li>
@@ -1736,6 +1740,7 @@ shift_to_monitor <em>MONITOR</em>
<dd>
<p>
Moves the focused window to the tag on the specified <em>MONITOR</em>.
+ See the <a href="#MONITORS">MONITORS section</a>, how to address a monitor.
</p>
</dd>
<dt class="hdlist1">
@@ -1819,7 +1824,8 @@ focus_monitor <em>MONITOR</em>
</dt>
<dd>
<p>
- Puts focus to the specified monitor.
+ Puts focus to the specified monitor. See the <a href="#MONITORS">MONITORS section</a>,
+ how to address a monitor.
</p>
</dd>
<dt class="hdlist1">
@@ -2971,6 +2977,15 @@ update_dragged_clients (Int)
button are released.
</p>
</dd>
+<dt class="hdlist1">
+verbose (Int)
+</dt>
+<dd>
+<p>
+ If set, verbose output is logged to herbstluftwm&#8217;s stderr. The default value
+ is controlled by the <strong>--verbose</strong> command line flag.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -4099,7 +4114,8 @@ details.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2015-10-14 15:27:40 CEST
+Last updated
+ 2018-03-15 00:05:23 CET
</div>
</div>
</body>
diff --git a/ipc-client/main.c b/ipc-client/main.c
index fca5b446..8b683013 100644
--- a/ipc-client/main.c
+++ b/ipc-client/main.c
@@ -17,7 +17,7 @@
#include "client-utils.h"
#define HERBSTCLIENT_VERSION_STRING \
- "herbstclient " HERBSTLUFT_VERSION " (built on " BUILD_DATE ")\n"
+ "herbstclient " HERBSTLUFT_VERSION " (built on " __DATE__ ")\n"
void print_help(char* command, FILE* file);
void init_hook_regex(int argc, char* argv[]);
diff --git a/src/globals.h b/src/globals.h
index d7965142..4fbd6a15 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -12,7 +12,7 @@
#define HERBSTLUFT_AUTOSTART "herbstluftwm/autostart"
#define WINDOW_MANAGER_NAME "herbstluftwm"
#define HERBSTLUFT_VERSION_STRING \
- WINDOW_MANAGER_NAME " " HERBSTLUFT_VERSION " (built on " BUILD_DATE ")"
+ WINDOW_MANAGER_NAME " " HERBSTLUFT_VERSION " (built on " __DATE__ ")"
#define HERBST_FRAME_CLASS "_HERBST_FRAME"
#define HERBST_DECORATION_CLASS "_HERBST_DECORATION"
diff --git a/version.mk b/version.mk
index 0eec4b69..9db5018c 100644
--- a/version.mk
+++ b/version.mk
@@ -3,7 +3,7 @@
VERSION_MAJOR = 0
VERSION_MINOR = 7
# patch level
-VERSION_PATCH = 0
+VERSION_PATCH = 1
# git version
ifneq (,$(wildcard .git))
ifneq (,$(shell which git 2>/dev/null))
diff --git a/www/faq.txt b/www/faq.txt
index 4855bdbd..6a12c1f5 100644
--- a/www/faq.txt
+++ b/www/faq.txt
@@ -62,7 +62,7 @@ rules apply:
herbstclient spawn xterm
herbstclient spawn xev
----
-
++
does *not* guarantee that the +xterm+ window will appear before the
+xev+ window! It only guarantees that the +xterm+ is executed before +xev+ will
be executed. +