Merge pull request #3563 from CyberShadow/doc-mark-todo

userguide: Un-hide a TODO block completed in 2011

diff --combined docs/userguide
index 55e80ce18e41fba2626e5c55452fe916836727d7,073ffdf1a8eb97e26d69833bf2ec35d0f3930566..1f94748475ca7591b36935709fb0a8f6aab106ea
--- 1/docs/userguide
--- 2/docs/userguide
+++ b/docs/userguide
@@@ -2416,9 -2416,8 +2416,9 @@@ this mark or add it otherwise. Note tha
  combination with +--add+ (see below) as any other marks will otherwise be
  removed.
  
 -By default, a window can only have one mark. You can use the +--add+ flag to
 -put more than one mark on a window.
 +The +--replace+ flag causes i3 to remove any existing marks, which is also the
 +default behavior. You can use the +--add+ flag to put more than one mark on a
 +window.
  
  Refer to <<show_marks>> if you don't want marks to be shown in the window decoration.
  
@@@ -2429,6 -2428,21 +2429,21 @@@ mark [--add|--replace] [--toggle] <iden
  unmark <identifier>
  ----------------------------------------------
  
+ You can use +i3-input+ to prompt for a mark name, then use the +mark+
+ and +focus+ commands to create and jump to custom marks:
+ 
+ *Examples*:
+ ---------------------------------------
+ # read 1 character and mark the current window with this character
+ bindsym $mod+m exec i3-input -F 'mark %s' -l 1 -P 'Mark: '
+ 
+ # read 1 character and go to the window with the character
+ bindsym $mod+g exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Goto: '
+ ---------------------------------------
+ 
+ Alternatively, if you do not want to mess with +i3-input+, you could create
+ separate bindings for a specific set of labels and then only use those labels:
+ 
  *Example (in a terminal)*:
  ---------------------------------------------------------
  # marks the focused container
@@@ -2444,21 -2458,6 +2459,6 @@@ unmark irss
  [class="(?i)firefox"] unmark
  ---------------------------------------------------------
  
- ///////////////////////////////////////////////////////////////////
- TODO: make i3-input replace %s
- *Examples*:
- ---------------------------------------
- # Read 1 character and mark the current window with this character
- bindsym $mod+m exec i3-input -F 'mark %s' -l 1 -P 'Mark: '
- 
- # Read 1 character and go to the window with the character
- bindsym $mod+g exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Goto: '
- ---------------------------------------
- 
- Alternatively, if you do not want to mess with +i3-input+, you could create
- separate bindings for a specific set of labels and then only use those labels.
- ///////////////////////////////////////////////////////////////////
- 
  [[pango_markup]]
  === Window title format