Skip to content

Commit

Permalink
Merge master into live (#362)
Browse files Browse the repository at this point in the history
Co-authored-by: Matt Wojciakowski <mattwoj@microsoft.com>
Co-authored-by: Kayla Cinnamon <cinnamon@microsoft.com>
Co-authored-by: Mike Griese <migrie@microsoft.com>
Co-authored-by: Don-Vito <khvitaly@gmail.com>
Co-authored-by: Mark Iannucci <mark.iannucci@dhha.org>
Co-authored-by: Pankaj Bhojwani <pabhojwa@microsoft.com>
Co-authored-by: Samuel Bronson <naesten@gmail.com>
Co-authored-by: LSC <schad.lucas@gmail.com>
Co-authored-by: skycommand <jadangerbrooks@hotmail.com>
Co-authored-by: Cameron Durham <cdurham@usc.edu>
Co-authored-by: Søren Fuglede Jørgensen <github@fuglede.dk>
Co-authored-by: Janne Mareike Koschinski <janne@kuschku.de>
Co-authored-by: Meenal Patel <42360097+v-mepa@users.noreply.github.com>
Co-authored-by: Jan De Dobbeleer <2492783+JanDeDobbeleer@users.noreply.github.com>
Co-authored-by: Dakkaron <dak1st@gmx.at>
Co-authored-by: Ibrahim Rouis <73853380+rouisibra@users.noreply.github.com>
Co-authored-by: Michael James <mike@mjjames.co.uk>
Co-authored-by: Mark Iannucci <mark.iannucci@gmail.com>
Co-authored-by: lpotherat <l.potherat@planetb.fr>
Co-authored-by: Sean Jacobs <Sophismata@users.noreply.github.com>
Co-authored-by: superfaz <16510828+superfaz@users.noreply.github.com>
Co-authored-by: Hiroshi Yoshioka <40815708+hyoshioka0128@users.noreply.github.com>
Co-authored-by: Eugene Samoylov <eugenesmlv@gmail.com>
Co-authored-by: PankajBhojwani <pankaj.d.bhoj@gmail.com>
Co-authored-by: Leon Liang <lelian@microsoft.com>
Co-authored-by: Ian O'Neill <ianjoneill@users.noreply.github.com>
Co-authored-by: Gaein_nidb <36162655+nidbCN@users.noreply.github.com>
Co-authored-by: Casper Verhaar <casper.verhaar@gmail.com>
  • Loading branch information
1 parent 88445b8 commit 5391d48
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 27 deletions.
17 changes: 7 additions & 10 deletions TerminalDocs/customize-settings/actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Windows Terminal Actions
description: Learn how to create custom actions for Windows Terminal.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 05/25/2021
ms.date: 07/14/2021
ms.topic: how-to
ms.localizationpriority: high
---
Expand Down Expand Up @@ -296,6 +296,9 @@ This closes the tab at a given index. If no index is provided, use the focused t
| ---- | --------- | ------- | ----------- |
| `index` | Optional | Integer | Position of the tab to close. |

> [!IMPORTANT]
> This `index` property is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
### Close all other tabs

This closes all tabs except for the one at an index. If no index is provided, use the focused tab's index.
Expand Down Expand Up @@ -694,7 +697,7 @@ _This command is not currently bound in the default settings_.
> [!IMPORTANT]
> This feature is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
### Minimize To Tray ([Preview](https://aka.ms/terminal-preview))
### Minimize to tray ([Preview](https://aka.ms/terminal-preview))

This will hide the currently focused window from the Taskbar and instead will be accessible from the system tray icon. This action will only be useable when the tray icon is visible through one of the two global settings `minimizeToTray` or `alwaysShowTrayIcon`.

Expand Down Expand Up @@ -1055,7 +1058,7 @@ ___

## Global commands

### Global summon ([Preview](https://aka.ms/terminal-preview))
### Global summon

This is a special action that works globally in the OS, rather than only in the context of the terminal window. When pressed, this action will summon the terminal window. Which window is summoned, where the window is summoned to, and how the window behaves when summoning it, is controlled by the properties on this action.

Expand Down Expand Up @@ -1138,10 +1141,7 @@ The `desktop` and `monitor` properties can be combined in the following ways:
{ "keys": "ctrl+7", "command": { "action": "globalSummon", "name": "_quake" } }
```

> [!IMPORTANT]
> This feature is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
### Open the quake mode window ([Preview](https://aka.ms/terminal-preview))
### Open the quake mode window

:::row:::
:::column span="":::
Expand Down Expand Up @@ -1178,9 +1178,6 @@ If you'd like to change the behavior of the `quakeMode` action, we recommended c
:::column-end:::
:::row-end:::

> [!IMPORTANT]
> This feature is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
<br />

___
Expand Down
17 changes: 16 additions & 1 deletion TerminalDocs/customize-settings/appearance.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Windows Terminal Appearance Settings
description: Learn how to customize appearance settings within Windows Terminal.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 04/14/2021
ms.date: 07/14/2021
ms.topic: how-to
ms.localizationpriority: high
---
Expand All @@ -12,6 +12,21 @@ ms.localizationpriority: high

The properties listed below affect the entire terminal window, regardless of the profile settings. These should be placed at the root of your settings.json file.

## Language ([Preview](https://aka.ms/terminal-preview))

This sets an override for the application's preferred language.

**Property name:** `language`

**Necessity:** Optional

**Accepts:** A BCP-47 language tag like `"en-US"`

> [!IMPORTANT]
> This feature is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
<br />

## Theme

:::row:::
Expand Down
16 changes: 5 additions & 11 deletions TerminalDocs/customize-settings/interaction.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Windows Terminal Interaction Settings
description: Learn how to customize interaction settings within Windows Terminal.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 05/25/2021
ms.date: 07/14/2021
ms.topic: how-to
ms.localizationpriority: high
---
Expand Down Expand Up @@ -44,7 +44,7 @@ When this is set to `true`, the color and font formatting of the selected text i

___

## Remove trailing white-space in rectangular selection ([Preview](https://aka.ms/terminal-preview))
## Remove trailing white-space in rectangular selection

When this is set to `true` and you copy text in a rectangular (block) selection to the clipboard, trailing white-spaces are removed from each line. When it's set to `false`, the white-spaces are preserved, ensuring that all lines have the same length. To copy text in a rectangular (block) selection, hold down the <kbd>Alt</kbd> key, right-click, and drag your mouse over the text area you want to select. This can be useful for selecting text columns, etc.

Expand All @@ -56,9 +56,6 @@ When this is set to `true` and you copy text in a rectangular (block) selection

**Default value:** `false`

> [!IMPORTANT]
> This feature is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
<br />

___
Expand Down Expand Up @@ -108,7 +105,7 @@ When this is set to `true`, the window will snap to the nearest character bounda

___

## Minimize To Tray ([Preview](https://aka.ms/terminal-preview))
## Minimize to tray ([Preview](https://aka.ms/terminal-preview))

When this is set to `true`, minimizing a window will hide it from the taskbar, making it inaccessible from that area. It will instead be accessible from Terminal's system tray icon. If either this global setting or the `minimizeToTray` global setting is set to true, Terminal will place an icon in the system tray. The user will also be able to utilize the `minimizeToTray` _action_.

Expand All @@ -127,7 +124,7 @@ When this is set to `true`, minimizing a window will hide it from the taskbar, m

___

## Always Show Tray Icon ([Preview](https://aka.ms/terminal-preview))
## Always show tray icon ([Preview](https://aka.ms/terminal-preview))

When this is set to `true`, the Terminal will place its icon in the system tray. If either this global setting or the `minimizeToTray` global setting is set to true, Terminal will place an icon in the system tray. The user will also be able to utilize the `minimizeToTray` _action_.

Expand Down Expand Up @@ -210,7 +207,7 @@ When this is set to `true`, the terminal will move focus to the pane on mouse ho

___

## Automatically detect URLs and make them clickable ([Preview](https://aka.ms/terminal-preview))
## Automatically detect URLs and make them clickable

When this is set to `true`, URLs will be detected by the terminal. This will cause URLs to underline on hover and be clickable by pressing <kbd>Ctrl</kbd>. This is an experimental feature and its continued existence is not guaranteed.

Expand All @@ -222,9 +219,6 @@ When this is set to `true`, URLs will be detected by the terminal. This will cau

**Default value:** `true`

> [!IMPORTANT]
> This feature is only available in [Windows Terminal Preview](https://aka.ms/terminal-preview).
<br />

___
Expand Down
4 changes: 2 additions & 2 deletions TerminalDocs/customize-settings/profile-appearance.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Windows Terminal Appearance Profile Settings
description: Learn how to customize the appearance profile settings within Windows Terminal.
author: cinnamon-msft
ms.author: cinnamon
ms.date: 05/25/2021
ms.date: 07/14/2021
ms.topic: how-to
ms.localizationpriority: high
---
Expand Down Expand Up @@ -45,7 +45,7 @@ This is the structure within which the other font settings must be defined. An e

**Necessity:** Optional

### Font Face
### Font face

This is the name of the font face used in the profile. The terminal will try to fallback to Consolas if this can't be found or is invalid. To learn about the other variants of the default font, Cascadia Mono, visit the [Cascadia Code page](./../cascadia-code.md).

Expand Down
6 changes: 3 additions & 3 deletions TerminalDocs/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ You can open a new tab of the default profile by pressing <kbd>Ctrl</kbd>+<kbd>S

## Invoke the command palette

You can invoke most features of Windows Terminal through the [command palette](./command-palette.md). The default key combination to invoke it is <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>. You can also open it using the **Command palette** button in the dropdown menu.
You can invoke most features of Windows Terminal through the [command palette](./command-palette.md). The default key combination to invoke it is <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>. You can also open it using the **Command palette** button in the dropdown menu in [Windows Terminal Preview](https://aka.ms/terminal-preview).

![Example of the command palette in use](./images/command-palette-iterable-commands.gif)

Expand All @@ -71,10 +71,10 @@ You can run multiple shells side-by-side using panes. To open a pane, you can us

## Configuration

To customize the settings of your Windows Terminal, select **Settings** in the dropdown menu. This will open the settings UI to configure your settings. You can learn how to open the settings UI on the [Actions page](./customize-settings/actions.md#application-level-commands).
To customize the settings of your Windows Terminal, select **Settings** in the dropdown menu. This will open the settings UI to configure your settings. You can learn how to open the settings UI with keyboard shortcuts on the [Actions page](./customize-settings/actions.md#application-level-commands).

> [!TIP]
> If you prefer to configure your settings by edit file, click the "setting" icon, This will open the `settings.json` file in your default text editor. (The default text editor is defined in your [Windows settings](ms-settings:defaultapps).)
> If you prefer to configure your settings by editing a JSON file, select **Settings** in the dropdown menu while holding <kbd>Shift</kbd>. This will open the `settings.json` file in your default text editor. (The default text editor is defined in your [Windows settings](ms-settings:defaultapps).)
> The terminal supports customization of global properties that affect the whole application, [profile properties](./customize-settings/profile-general.md) that affect the settings of each profile, and [actions](./customize-settings/actions.md) that allow you to interact with the terminal using your keyboard or the command palette.
## Command line arguments
Expand Down

0 comments on commit 5391d48

Please sign in to comment.