diff --git a/doc/Niksa.md b/doc/Niksa.md index c3f8a1fa1af..40ffb1a0ec7 100644 --- a/doc/Niksa.md +++ b/doc/Niksa.md @@ -145,7 +145,7 @@ Our only backport successes really come from corporations with massive addressab It's also costly in terms of time, effort, and testing for us to validate a modification to a released OS. We have a mindbogglingly massive amount of automated machinery dedicated to processing and validating the things that we check in while developing the current OS builds. But it's a special costly ask to spin up some to all of those activities to validate backported fixes. We do it all the time for Patch Tuesday, but in those patches, they only pass through the minimum number of fixes required to maximize the restoration of productivity/security/revenue/etc. because every additional fix adds additional complexity and additional risk. -So from our little team working hard to make developers happy, we virtually never make the cut for servicing. We're sorry, but we hope you can understand. It's just the reality of the situation to say "nope" when people ask for a backport. In our team's ideal world, you would all be running the latest console bits everywhere everytime we make a change. But that's just not how it is today. +So from our little team working hard to make developers happy, we virtually never make the cut for servicing. We're sorry, but we hope you can understand. It's just the reality of the situation to say "nope" when people ask for a backport. In our team's ideal world, you would all be running the latest console bits everywhere every time we make a change. But that's just not how it is today. Original Source: https://github.com/microsoft/terminal/issues/279#issuecomment-439179675 diff --git a/doc/specs/drafts/#997 Non-Terminal-Panes.md b/doc/specs/drafts/#997 Non-Terminal-Panes.md index 6fb539cf33c..279f451cbc2 100644 --- a/doc/specs/drafts/#997 Non-Terminal-Panes.md +++ b/doc/specs/drafts/#997 Non-Terminal-Panes.md @@ -60,7 +60,7 @@ it could host any arbitrary content. ### Security -I don't forsee this implementation by itself raising security concerns. This +I don't foresee this implementation by itself raising security concerns. This feature is mostly concerned with adding support for arbitrary controls, not actually implementing some arbitrary controls. diff --git a/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj b/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj index 30a36c91fe9..e17243bfc6e 100644 --- a/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj +++ b/scratch/ScratchIslandApp/WindowExe/WindowExe.vcxproj @@ -90,7 +90,7 @@ Particularly tricky is Microsoft.Terminal.Core.winmd. That winmd doesn't have its own DLL (it doesn't have any activatable classes, only structs and interfaces). However, it too is necessary for Terminal.Control to be able to - marshall the Core types across the boundary. + marshal the Core types across the boundary. --> $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd diff --git a/src/cascadia/Remoting/WindowManager.cpp b/src/cascadia/Remoting/WindowManager.cpp index d96bbd09b7e..8c0b8d5a900 100644 --- a/src/cascadia/Remoting/WindowManager.cpp +++ b/src/cascadia/Remoting/WindowManager.cpp @@ -310,7 +310,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation } // This right here will just tell us to stash the args away for the - // future. The AppHost hasnt yet set up the callbacks, and the rest + // future. The AppHost hasn't yet set up the callbacks, and the rest // of the app hasn't started at all. We'll note them and come back // later. _peasant.ExecuteCommandline(args); diff --git a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp index 5f9f31386fd..12ca43475d2 100644 --- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp @@ -191,8 +191,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation // * If json is a string, we'll attempt to treat it as an action name, // without arguments. // * If json is an object, we'll attempt to retrieve the action name from - // its "action" property, and we'll use that name to fine a deserializer - // to precess the rest of the arguments in the json object. + // its "action" property, and we'll use that name to find a deserializer + // to process the rest of the arguments in the json object. // - If the action name is null or "unbound", or we don't understand the // action name, or we failed to parse the arguments to this action, we'll // return null. This should indicate to the caller that the action should diff --git a/src/host/ft_host/CJK_DbcsTests.cpp b/src/host/ft_host/CJK_DbcsTests.cpp index 8802812b66c..cccc42b3c0d 100644 --- a/src/host/ft_host/CJK_DbcsTests.cpp +++ b/src/host/ft_host/CJK_DbcsTests.cpp @@ -2046,7 +2046,7 @@ void DbcsTests::TestDbcsStdCoutScenario() // Read/WriteConsoleOutput allow a user to implement a restricted form of buffer "backup" and "restore". // But what if the saved region clips ("bisects") a wide character? This test ensures that we restore proper // wide characters when given an unpaired trailing/leading CHAR_INFO in the first/last column of the given region. -// In other words, writing a trailing CHAR_INFO will also automatically write a leading CHAR_INFO in the preceeding cell. +// In other words, writing a trailing CHAR_INFO will also automatically write a leading CHAR_INFO in the preceding cell. void DbcsTests::TestDbcsBackupRestore() { const auto out = GetStdHandle(STD_OUTPUT_HANDLE); diff --git a/src/host/ft_uia/Common/ShortcutHelper.cs b/src/host/ft_uia/Common/ShortcutHelper.cs index 2b99d53c158..77606070f8d 100644 --- a/src/host/ft_uia/Common/ShortcutHelper.cs +++ b/src/host/ft_uia/Common/ShortcutHelper.cs @@ -88,7 +88,7 @@ public WinConP.NT_CONSOLE_PROPS GetConsoleProps() { sldl.CopyDataBlock(WinConP.NT_CONSOLE_PROPS_SIG, out ppDataBlock); - // The marshaler doesn't like using the existing instance that we made above because it's a value type and + // The marshaller doesn't like using the existing instance that we made above because it's a value type and // there are potential string pointers here. Give it the type instead and it can handle setting everything up. props = (WinConP.NT_CONSOLE_PROPS)Marshal.PtrToStructure(ppDataBlock, typeof(WinConP.NT_CONSOLE_PROPS)); } diff --git a/src/renderer/atlas/AtlasEngine.h b/src/renderer/atlas/AtlasEngine.h index 238f1e02b01..f463a000575 100644 --- a/src/renderer/atlas/AtlasEngine.h +++ b/src/renderer/atlas/AtlasEngine.h @@ -816,7 +816,7 @@ namespace Microsoft::Console::Render u16x2 _size; u16x2 _limit; // Since _pos starts at {0, 0}, it'll result in the first allocate()d tile to be at {_tileSize.x, 0}. - // Coincidentially that's exactly what we want as the cursor texture lives at {0, 0}. + // Coincidentally that's exactly what we want as the cursor texture lives at {0, 0}. u16x2 _pos; u16 _originX = 0; // Indicates whether we've exhausted our Z pattern across the atlas texture.