1 files changed, 55 insertions, 35 deletions

diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 927bf55c..3202d517 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -19,6 +19,24 @@ bindsym Shift+XF86AudioRaiseVolume exec \\
         pactl set-sink-volume @DEFAULT_SINK@ -1%
 ```
 
+Commands can also be given as a block in the form *command { <subcommands...>
+}*. Anything before the opening *{* will be prepended to the lines inside the
+block. For example:
+
+```
+output eDP-1 {
+        background ~/wallpaper.png
+        resolution 1920x1080
+}
+```
+
+is identical to
+
+```
+output eDP-1 background ~/wallpaper.png
+output eDP-1 resolution 1920x1080
+```
+
 These commands can be executed in your config file, via *swaymsg*(1), or via
 the bindsym command.
 
@@ -37,10 +55,8 @@ which you may only select one. *[...]* is used for optional arguments, and
 
 The following commands may only be used in the configuration file.
 
-*bar {* <commands...> *}*
-        _commands..._ after *{* will be interpreted as bar commands. For
-        details, see *sway-bar*(5). A newline is required between *{* and the
-        first command, and *}* must be alone on a line.
+*bar* [<bar-id>] <bar-subcommands...>
+        For details on bar subcommands, see *sway-bar*(5).
 
 *default\_orientation* horizontal|vertical|auto
         Sets the default container layout for tiled containers.
@@ -51,10 +67,6 @@ The following commands may only be used in the configuration file.
         *wordexp*(3) for details). The same include file can only be included once;
         subsequent attempts will be ignored.
 
-*set* $<name> <value>
-        Sets variable $_name_ to _value_. You can use the new variable in the
-        arguments of future commands.
-
 *swaybg\_command* <command>
         Executes custom background _command_. Default is _swaybg_. Refer to
         *output* below for more information.
@@ -407,37 +419,30 @@ The default colors are:
         inner gap is nonzero. When _off_, gaps will only be added between views.
         _toggle_ cannot be used in the configuration file.
 
-*gaps* <amount>
-        Sets _amount_ pixels of gap between windows and around each workspace.
-
 *gaps* inner|outer <amount>
-        Sets default _amount_ pixels of _inner_ or _outer_ gap, where the former
-        affects spacing between views and the latter affects the space around each
-        workspace.
+        Sets default _amount_ pixels of _inner_ or _outer_ gap, where the inner
+        affects spacing around each view and outer affects the spacing around each
+        workspace. Outer gaps are in addition to inner gaps.
 
-*gaps* inner|outer all|workspace|current set|plus|minus <amount>
-        Changes the gaps for the _inner_ or _outer_ gap. _all_ changes the gaps for
-        all views or workspace, _workspace_ changes gaps for all views in current
-        workspace (or current workspace), and _current_ changes gaps for the current
-        view or workspace.
+        This affects new workspaces only, and is used when the workspace doesn't
+        have its own gaps settings (see: workspace <ws> gaps inner|outer <amount>).
 
-*hide\_edge\_borders* none|vertical|horizontal|both|smart
+*gaps* inner|outer all|current set|plus|minus <amount>
+        Changes the _inner_ or _outer_ gaps for either _all_ workspaces or the
+        _current_ workspace.
+
+*hide\_edge\_borders* none|vertical|horizontal|both|smart|smart\_no\_gaps
         Hides window borders adjacent to the screen edges. Default is _none_.
 
-*input* <input\_device> *{* <commands...> *}*
-        _commands..._ after *{* will be interpreted as input commands applying to
-        the specified input device. For details, see *sway-input*(5). A newline is
-        required between *{* and the first command, and *}* must be alone on a
-        line.
+*input* <input\_device> <input-subcommands...>
+        For details on input subcommands, see *sway-input*(5).
 
         \* may be used in lieu of a specific device name to configure all input
         devices. A list of input device names may be obtained via *swaymsg -t
         get\_inputs*.
 
-*seat* <seat> *{* <commands...> *}*
-        _commands..._ after *{* will be interpreted as seat commands applying to
-        the specified seat. For details, see *sway-input*(5). A newline is required
-        between *{* and the first command, and *}* must be alone on a line.
+*seat* <seat> <seat-subcommands...>
+        For details on seat subcommands, see *sway-input*(5).
 
 *seat* <seat> cursor move|set <x> <y>
         Move specified seat's cursor relative to current position or wrap to
@@ -451,6 +456,12 @@ The default colors are:
 *kill*
         Kills (closes) the currently focused container and all of its children.
 
+*smart\_borders* on|no\_gaps|off
+        If smart\_borders are _on_, borders will only be enabled if the workspace
+        only has one visible child (identical to _hide\_edge\_borders_ smart). If
+        smart\_borders is set to _no\_gaps_, borders will only be enabled if the
+        workspace only has one visible child and gaps greater than zero.
+
 *smart\_gaps* on|off
         If smart\_gaps are _on_ gaps will only be enabled if a workspace has more
         than one child.
@@ -465,10 +476,8 @@ The default colors are:
 *mode* <mode>
         Switches to the specified mode. The default mode _default_.
 
-*mode* [--pango\_markup] <mode> *{* <commands...> *}*
-        _commands..._ after *{* will be added to the specified mode. A newline is
-        required between *{* and the first command, and *}* must be alone on a
-        line. Only *bindsym* and *bindcode* commands are permitted in mode blocks.
+*mode* [--pango\_markup] <mode> <mode-subcommands...>
+        The only two valid _mode-subcommands..._ are *bindsym* and *bindcode*.
         If _--pango\_markup_ is given, then _mode_ will be interpreted as pango
         markup.
 
@@ -533,8 +542,15 @@ You may combine output commands into one, like so:
         output HDMI-A-1 mode 1920x1080 pos 1920,0 bg ~/wallpaper.png stretch
 
 You can get a list of output names with *swaymsg -t get\_outputs*. You may also
-match any output by using the output name "\*". Be sure to add this output
-config after the others, or it will be matched instead of the others.
+match any output by using the output name "\*".
+
+*set* $<name> <value>
+        Sets variable $_name_ to _value_. You can use the new variable in the
+        arguments of future commands. When the variable is used, it can be escaped
+        with an additional $ (ie $$_name_) to have the replacement happen at run
+        time instead of when reading the config. However, it does not always make
+        sense for the variable to be replaced at run time since some arguments do
+        need to be known at config time.
 
 *show\_marks* yes|no
         If *show\_marks* is yes, marks will be displayed in the window borders.
@@ -568,6 +584,10 @@ config after the others, or it will be matched instead of the others.
 *workspace* back_and_forth
         Switches to the previously focused workspace.
 
+*workspace* <name> gaps inner|outer <amount>
+        Specifies that workspace _name_ should have the given gaps settings when it
+        is created.
+
 *workspace* <name> output <output>
         Specifies that workspace _name_ should be shown on the specified _output_.