Skip to content

Commit 8df9523

Browse files
committed
Merge remote-tracking branch 'origin/main' into dev/migrie/fhl/non-terminal-panes-2023
2 parents fd06409 + d0d3039 commit 8df9523

File tree

25 files changed

+751
-567
lines changed

25 files changed

+751
-567
lines changed

.github/actions/spelling/expect/expect.txt

+2
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ coordnew
303303
COPYCOLOR
304304
CORESYSTEM
305305
cotaskmem
306+
countof
306307
CPG
307308
cpinfo
308309
CPINFOEX
@@ -1775,6 +1776,7 @@ stdafx
17751776
STDAPI
17761777
stdc
17771778
stdcpp
1779+
STDEXT
17781780
STDMETHODCALLTYPE
17791781
STDMETHODIMP
17801782
STGM

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ winget install --id Microsoft.WindowsTerminal -e
7373
```
7474

7575
> **Note**\
76-
> Due to [a dependency issue](https://github.com/microsoft/terminal/issues/15663), Terminal's current versions cannot be installed via the Windows Package Manager CLI. To install the stable release 1.17 or later, or the Preview release 1.18 or later, please use an alternative installation method.
76+
> Dependency support is available in WinGet version [1.6.2631 or later](https://github.com/microsoft/winget-cli/releases). To install the Terminal stable release 1.18 or later, please make sure you have the updated version of the WinGet client.
7777
7878
#### Via Chocolatey (unofficial)
7979

@@ -123,11 +123,11 @@ Windows Terminal Canary is a nightly build of Windows Terminal. This build has t
123123

124124
Windows Terminal Canary is our least stable offering, so you may discover bugs before we have had a chance to find them.
125125

126-
Windows Terminal Canary is available as an App Installer distribution and a Portable ZIP distribution.
126+
Windows Terminal Canary is available as an App Installer distribution and a Portable ZIP distribution.
127127

128-
The App Installer distribution supports automatic updates. Due to platform limitations, this installer only works on Windows 11.
128+
The App Installer distribution supports automatic updates. Due to platform limitations, this installer only works on Windows 11.
129129

130-
The Portable ZIP distribution is a portable application. It will not automatically update and will not automatically check for updates. This portable ZIP distribution works on Windows 10 (19041+) and Windows 11.
130+
The Portable ZIP distribution is a portable application. It will not automatically update and will not automatically check for updates. This portable ZIP distribution works on Windows 10 (19041+) and Windows 11.
131131

132132
| Distribution | Architecture | Link |
133133
|---------------|:---------------:|------------------------------------------------------|

0 commit comments

Comments
 (0)