Merge remote-tracking branch 'upstream/next' into wayland

doc/rofi.1.markdown

@@ -1,4 +1,4 @@
-# ROFI 1 rofi
+# rofi(1)
 
 ## NAME
 
@@ -312,7 +312,7 @@ launched.
 The time (in ms) boundary filter may take before switch from instant to delayed
 filter mode.
 
-  Default: 300
+Default: 300
 
 A fallback icon can be specified for each mode:
 
@@ -385,7 +385,7 @@ The format string for the `drun` dialog:
 
 Pango markup can be used to formatting the output.
 
-Default: {name} [<span weight='light' size='small'><i>({generic})</i></span>]
+Default: `{name} [<span weight='light' size='small'><i>({generic})</i></span>]`
 
 Note: Only fields enabled in `-drun-match-fields` can be used in the format
 string.
@@ -426,8 +426,7 @@ Default: '-'
 
 ### Filtered menu sort
 
-`-sort` to enable  
-`-no-sort` to disable
+`-[no]-sort`
 
 Enable, disable sort for filtered menu.
 This setting can be changed at runtime (see `-kb-toggle-sort`).
@@ -498,10 +497,7 @@ Default: *1*
 
 When one entry is left, automatically select it.
 
-`-m` *num*  
-`-m` *name*  
-`-monitor` *num*  
-`-monitor` *name*  
+`-m` *num*,  `-m` *name*, `-monitor` *num*, `-monitor` *name*
 
 Select monitor to display **rofi** on. It accepts as input: *primary* (if
 primary output is set), the *xrandr* output name, or integer number (in order
@@ -595,8 +591,7 @@ Parse the `/etc/hosts` file for entries.
 
 Default: *disabled*
 
-`-parse-known-hosts`  
-`-no-parse-known-hosts`
+`-[no-]parse-known-hosts`
 
 Parse the `~/.ssh/known_hosts` file for entries.
 
@@ -730,10 +725,9 @@ Note: This setting is ignored if `combi-hide-mode-prefix` is enabled.
 
 ### History
 
-`-disable-history`  
-`-no-disable-history` (re-enable history)
+`-[no-]disable-history`
 
-Disable history
+Disable or re-enable history
 
 `-max-history-size` *number*
 
@@ -861,8 +855,7 @@ configuration {
 }
 ```
 
-`-click-to-exit`
-`-no-click-to-exit`
+`-[no-]click-to-exit`
 
 Click the mouse outside the **rofi** window to exit.