Merge branch 'upstream'

2 files changed, 16 insertions, 7 deletions

diff --git a/doc/herbstluftwm-tutorial.txt b/doc/herbstluftwm-tutorial.txt
index d4984fac..52cbdcbf 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://github.com/herbstluftwm/herbstluftwm
+git clone https://github.com/herbstluftwm/herbstluftwm
 cd herbstluftwm
 make # build the binaries
 
@@ -236,7 +236,7 @@ $ herbstclient layout
   └─╼ max: 0x1a00009 [FOCUS]
 ----
 
-Just play with it a bit to how it works. You also can permanently save the
+Just play with it a bit to understand how it works. You also can permanently save the
 layout using the +dump+ command:
 
 ----
diff --git a/doc/herbstluftwm.txt b/doc/herbstluftwm.txt
index 96b36976..c5154b94 100644
--- a/doc/herbstluftwm.txt
+++ b/doc/herbstluftwm.txt
@@ -29,7 +29,8 @@ of available <<COMMANDS,*COMMANDS*>> is listed below.
     *-l*, *--locked*::
         Initially set the monitors_locked setting to 1
     *--verbose*::
-        print verbose information to stderr
+        print verbose information to stderr. This can be switched at run-time by
+        the 'verbose' setting.
 
 This manual documents the scripting and configuration interface. For a more
 verbose introduction see
@@ -319,7 +320,7 @@ cycle_all [*--skip-invisible*] ['DIRECTION']::
     means forward, 'DIRECTION' = -1 means backward, 'DIRECTION' = 0 has no
     effect. 'DIRECTION' defaults to 1. If there are multiple windows within on
     frame, then it acts similar to the 'cycle' command. (The 'cycle_all' command
-    focuses the next/previous leave in the 'layout' tree.). If
+    focuses the next/previous leaf in the 'layout' tree.). If
     *--skip-invisible* is given, then this only cycles through all visible
     windows and skips invisible windows in the max layout. The focused window
     is raised.
@@ -333,8 +334,10 @@ cycle_layout ['DELTA' ['LAYOUTS' ...]]::
     Cycles the layout algorithm in the current frame by 'DELTA'. 'DELTA'
     defaults to 1. You can find a <<LIST_LAYOUT_ALGORITHMS,list of layout
     algorithms>> above. If a list of 'LAYOUTS' 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 'LAYOUTS' and picking
+    the next layout according to 'DELTA'. If the current layout doesn't occur in
+    'LAYOUTS', the first entry is picked. Example:
 
       * cycle_layout -1
       * cycle_layout 1 vertical grid
@@ -482,6 +485,7 @@ shift ['-i'|'-e'] 'DIRECTION'::
 
 shift_to_monitor 'MONITOR'::
     Moves the focused window to the tag on the specified 'MONITOR'.
+    See the <<MONITORS,MONITORS section>>, how to address a monitor.
 
 remove::
     Removes focused frame and merges its windows to its neighbour frame.
@@ -516,7 +520,8 @@ cycle_monitor ['DELTA']::
     Cycles monitor focused by 'DELTA'. 'DELTA' defaults to 1.
 
 focus_monitor 'MONITOR'::
-    Puts focus to the specified monitor.
+    Puts focus to the specified monitor. See the <<MONITORS,MONITORS section>>,
+    how to address a monitor.
 
 add 'TAG'::
     Creates a new empty tag named 'TAG'.
@@ -1065,6 +1070,10 @@ update_dragged_clients (Int)::
     it with the mouse. If unset, the client's content is resized after the mouse
     button are released.
 
+verbose (Int)::
+    If set, verbose output is logged to herbstluftwm's stderr. The default value
+    is controlled by the *--verbose* command line flag.
+
 [[RULES]]
 RULES
 -----