From 4dc262ad3c212f43ccf9798fbd04a76f36cc8ccd Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 15 Dec 2020 10:15:45 -0600
Subject: [PATCH 1/2] Documentation for microsoft/terminal#8565

---
 TerminalDocs/customize-settings/actions.md    | 13 +++++++-----
 .../customize-settings/profile-settings.md    | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/TerminalDocs/customize-settings/actions.md b/TerminalDocs/customize-settings/actions.md
index 0e0d2765..b0c45749 100644
--- a/TerminalDocs/customize-settings/actions.md
+++ b/TerminalDocs/customize-settings/actions.md
@@ -114,7 +114,7 @@ ___
 `ctrl+`, `shift+`, `alt+`
 
 > [!NOTE]
-> The `Windows` key is not supported as a modifier. 
+> The `Windows` key is not supported as a modifier.
 
 ### Modifier keys
 
@@ -767,18 +767,21 @@ This resets the text size to the default value.
 { "command": "resetFontSize", "keys": "ctrl+0" }
 ```
 
-### Toggle retro terminal effects
+### Toggle pixel shader effects
 
-This toggles the "retro terminal effect", which is enabled with the profile setting `experimental.retroTerminalEffect`.
+This toggles any pixel shader effects enabled on the Terminal. If the user specified a valid shader with `experimental.pixelShaderPath`, this action will toggle that shader on/off. This will also toggle the "retro terminal effect", which is enabled with the profile setting `experimental.retroTerminalEffect`.
 
-**Command name:** `toggleRetroEffect`
+**Command name:** `toggleShaderEffects`
 
 **Default binding:**
 
 ```json
-{ "command": "toggleRetroEffect" }
+{ "command": "toggleShaderEffects" }
 ```
 
+> [!IMPORTANT]
+> This action was renamed in [Windows Terminal Preview](https://aka.ms/terminal-preview) version 1.6. In previous versions, this was `toggleRetroEffect`.
+
 ### Set the color scheme
 
 Changes the active color scheme.
diff --git a/TerminalDocs/customize-settings/profile-settings.md b/TerminalDocs/customize-settings/profile-settings.md
index fd5922c5..d3920cbb 100644
--- a/TerminalDocs/customize-settings/profile-settings.md
+++ b/TerminalDocs/customize-settings/profile-settings.md
@@ -554,12 +554,33 @@ Controls what happens when the application emits a BEL character. When set to `"
 
 ___
 
+## Pixel Shader Effects
+
+:::row:::
+:::column span="":::
+This setting allows a user to specify the path to a custom pixel shader to use with the Terminal content. This is an experimental feature and its continued existence is not guaranteed. For more details on authoring custom pixel shaders for the Terminal, see [this documentation](https://github.com/microsoft/terminal/blob/main/samples/PixelShaders/README.md).
+
+If set, this will override the `experimental.retroTerminalEffect` setting.
+
+**Property name:** `experimental.pixelShaderPath`
+
+**Necessity:** Optional
+
+**Accepts:** A path to an `.hlsl` shader file, as a string.
+
+**Default value:** `(unset)`
+
+> [!IMPORTANT]
+> This feature is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview/), 1.6+.
+
 ## Retro terminal effects
 
 :::row:::
 :::column span="":::
 When this is set to `true`, the terminal will emulate a classic CRT display with scan lines and blurry text edges. This is an experimental feature and its continued existence is not guaranteed.
 
+If `experimental.pixelShaderPath` is set, it will override this setting.
+
 **Property name:** `experimental.retroTerminalEffect`
 
 **Necessity:** Optional

From 7d74eb30b2e5e3bc758224b7bd5bda48921790f5 Mon Sep 17 00:00:00 2001
From: cinnamon-msft <cinnamon@microsoft.com>
Date: Mon, 25 Jan 2021 15:55:13 -0800
Subject: [PATCH 2/2] fix warning

---
 TerminalDocs/customize-settings/actions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TerminalDocs/customize-settings/actions.md b/TerminalDocs/customize-settings/actions.md
index 6596c141..c9083d33 100644
--- a/TerminalDocs/customize-settings/actions.md
+++ b/TerminalDocs/customize-settings/actions.md
@@ -136,7 +136,7 @@ ___
 
 :::row:::
 :::column span="":::
-This closes the current window and all tabs within it. If `confirmCloseAllTabs` is set to `true`, a confirmation dialog will appear to ensure you'd like to close all your tabs. More information on this setting can be found on the [Global settings page](./global-settings.md#hide-close-all-tabs-popup).
+This closes the current window and all tabs within it. If `confirmCloseAllTabs` is set to `true`, a confirmation dialog will appear to ensure you'd like to close all your tabs. More information on this setting can be found on the [Appearance settings page](./appearance.md#show-close-all-tabs-popup).
 
 **Command name:** `closeWindow`