Merge remote-tracking branch 'vendor/master' into graphics

4 files changed, 29 insertions, 26 deletions

diff --git a/extra/logo/alacritty-term.svg b/extra/logo/alacritty-term.svg
index 065df538..9798a3df 100644
--- a/extra/logo/alacritty-term.svg
+++ b/extra/logo/alacritty-term.svg
@@ -423,7 +423,6 @@
      transform="translate(-16,35.820639)"
      sodipodi:insensitive="true"><g
        id="g4199"><path
-         clip-path="none"
          sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
          id="path5352"
@@ -440,4 +439,4 @@
          d="M 19,32.395 31.5,0 6.5,0.13313911 Z"
          id="path9580"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" /></g></g></svg>
\ No newline at end of file
+         sodipodi:nodetypes="cccc" /></g></g></svg>
diff --git a/extra/man/alacritty-bindings.5.scd b/extra/man/alacritty-bindings.5.scd
index 3de2986e..7f0bdf34 100644
--- a/extra/man/alacritty-bindings.5.scd
+++ b/extra/man/alacritty-bindings.5.scd
@@ -2,7 +2,7 @@ ALACRITTY-BINDINGS(5)
 
 # NAME
 
-Alacritty Bindings - Default configuration file bindings.
+alacritty-bindings - Default configuration file bindings.
 
 # SYNOPSIS
 
diff --git a/extra/man/alacritty.1.scd b/extra/man/alacritty.1.scd
index b82ba08e..c8a67bb8 100644
--- a/extra/man/alacritty.1.scd
+++ b/extra/man/alacritty.1.scd
@@ -61,13 +61,17 @@ set of features with high performance.
 
 	Specify alternative configuration file.
 
-	Alacritty looks for the configuration file at the following paths:
+	Alacritty doesn't create the config file for you, but it looks for one in the
+	following locations on UNIX systems:
+
 		. _$XDG_CONFIG_HOME/alacritty/alacritty.toml_
 		. _$XDG_CONFIG_HOME/alacritty.toml_
 		. _$HOME/.config/alacritty/alacritty.toml_
 		. _$HOME/.alacritty.toml_
 
-	On Windows, the configuration file is located at _%APPDATA%\\alacritty\\alacritty.toml_.
+	On Windows, the config file will be looked for in:
+
+		. _%APPDATA%\\alacritty\\alacritty.toml_
 
 *--embed* _<PARENT>_
 
diff --git a/extra/man/alacritty.5.scd b/extra/man/alacritty.5.scd
index 718abfa3..8e92734a 100644
--- a/extra/man/alacritty.5.scd
+++ b/extra/man/alacritty.5.scd
@@ -14,18 +14,18 @@ can be found at _https://toml.io/en/v1.0.0_.
 Alacritty doesn't create the config file for you, but it looks for one in the
 following locations on UNIX systems:
 
-. `$XDG_CONFIG_HOME/alacritty/alacritty.toml`
-. `$XDG_CONFIG_HOME/alacritty.toml`
-. `$HOME/.config/alacritty/alacritty.toml`
-. `$HOME/.alacritty.toml`
+. _$XDG_CONFIG_HOME/alacritty/alacritty.toml_
+. _$XDG_CONFIG_HOME/alacritty.toml_
+. _$HOME/.config/alacritty/alacritty.toml_
+. _$HOME/.alacritty.toml_
 
 On Windows, the config file will be looked for in:
 
-. `%APPDATA%\alacritty\alacritty.toml`
+. _%APPDATA%\\alacritty\\alacritty.toml_
 
 # GENERAL
 
-This section documents the root level of the configuration file.
+This section documents the *[general]* table of the configuration file.
 
 *import* = [_"<string>"_,]
 
@@ -46,20 +46,6 @@ This section documents the root level of the configuration file.
 	_"alacritty-theme/themes/gruvbox_dark.toml"_,++
 ]
 
-*shell* = _"<string>"_ | { program = _"<string>"_, args = [_"<string>"_,] }
-
-	You can set _shell.program_ to the path of your favorite shell, e.g.
-	_/bin/zsh_. Entries in _shell.args_ are passed as arguments to the shell.
-
-	Default:
-		Linux/BSD/macOS: _$SHELL_ or the user's login shell, if _$SHELL_ is unset++
-Windows: _"powershell"_
-
-	Example:
-		*[shell]*++
-program = _"/bin/zsh"_++
-args = [_"-l"_]
-
 *working_directory* = _"<string>"_ | _"None"_
 
 	Directory the shell is started in. When this is unset, or _"None"_, the
@@ -605,6 +591,20 @@ This section documents the *[cursor]* table of the configuration file.
 
 This section documents the *[terminal]* table of the configuration file.
 
+*shell* = _"<string>"_ | { program = _"<string>"_, args = [_"<string>"_,] }
+
+	You can set _shell.program_ to the path of your favorite shell, e.g.
+	_/bin/zsh_. Entries in _shell.args_ are passed as arguments to the shell.
+
+	Default:
+		Linux/BSD/macOS: _$SHELL_ or the user's login shell, if _$SHELL_ is unset++
+Windows: _"powershell"_
+
+	Example:
+		*[shell]*++
+program = _"/bin/zsh"_++
+args = [_"-l"_]
+
 *osc52* = _"Disabled"_ | _"OnlyCopy"_ | _"OnlyPaste"_ | _"CopyPaste"_
 
 	Controls the ability to write to the system clipboard with the _OSC 52_
@@ -730,7 +730,7 @@ hyperlinks      = _true_++
 post_processing = _true_++
 persist         = _false_++
 mouse.enabled   = _true_++
-binding         = { key = _"U"_, mods = _"Control|Shift"_ }++
+binding         = { key = _"O"_, mods = _"Control|Shift"_ }++
 regex = _"(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file:|git://|ssh:|ftp://)[^\\u0000-\\u001F\\u007F-\\u009F<>\\"\\\\s{-}\\\\^⟨⟩`]+"_
 
 # KEYBOARD