Skip to content

Commit 1e1d251

Browse files
Merge pull request #5583 from MicrosoftDocs/main638878519398095553sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 128c203 + fb2ed4c commit 1e1d251

File tree

12 files changed

+15
-15
lines changed

12 files changed

+15
-15
lines changed

hub/apps/design/input/windows-wheel-interactions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ The Surface Dial cannot detect which hand is being used, but the user can set th
326326

327327
**Locale should be considered for all rotation interactions**
328328

329-
Maximize customer satisfaction by accomodating and adapting your interactions to locale and right-to-left layouts.
329+
Maximize customer satisfaction by accommodating and adapting your interactions to locale and right-to-left layouts.
330330

331331
The built-in tools and commands on the Dial menu follow these guidelines for rotation-based interactions:
332332

hub/apps/design/shell/tiles-and-notifications/toast-schema.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Text style controls font size, weight, and opacity. Subtle opacity is 60% opaque
140140

141141

142142
### AdaptiveTextAlign
143-
Controls the horizontal alignmen of text.
143+
Controls the horizontal alignment of text.
144144

145145
| Value | Meaning |
146146
|---|---|
@@ -182,7 +182,7 @@ Specifies the horizontal alignment for an image.
182182
| **Default** | Default value. Alignment behavior determined by renderer. |
183183
| **Stretch** | Image stretches to fill available width (and potentially available height too, depending on where the image is placed). |
184184
| **Left** | Align the image to the left, displaying the image at its native resolution. |
185-
| **Center** | Align the image in the center horizontally, displayign the image at its native resolution. |
185+
| **Center** | Align the image in the center horizontally, displaying the image at its native resolution. |
186186
| **Right** | Align the image to the right, displaying the image at its native resolution. |
187187

188188

hub/apps/develop/security/use-cases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ If the user instead clicks on "Try another way", then you should offer them othe
261261
262262
### 2.2: Expired sessions and logout
263263
264-
Now we'll examine the case where the reauthentication is triggered because the user logged themself out, or the relying party (RP) expired the user's session. To facilitate that, the RP would have to keep some form of user session state reminding them of the account that was formerly signed in, even when they consider the user signed-out (that could be achieved using browser artifacts such as cookies or local storage).
264+
Now we'll examine the case where the reauthentication is triggered because the user logged themselves out, or the relying party (RP) expired the user's session. To facilitate that, the RP would have to keep some form of user session state reminding them of the account that was formerly signed in, even when they consider the user signed-out (that could be achieved using browser artifacts such as cookies or local storage).
265265
266266
> [!NOTE]
267267
> A relying party (RP) might choose to treat signing out as a comprehensive action, and thus delete all references to the user's identity. Such an RP should treat a subsequent sign-in like an account bootstrap, and repeat the steps explained previously.

hub/apps/develop/win2d/choosing-control-resolution.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This scenario may arise, for instance, on a 2D sprite game that should always re
4141

4242
Solving this doesn't strictly require writing any new Win2D code at all.
4343

44-
The [`Viewbox`](/uwp/api/Windows.UI.Xaml.Controls.Viewbox) XAML object lets you constrain the sizes of its child visual elements, automatically adding scaling, with letterboxing or pillarboxing to preseve aspect ratios as necessary.
44+
The [`Viewbox`](/uwp/api/Windows.UI.Xaml.Controls.Viewbox) XAML object lets you constrain the sizes of its child visual elements, automatically adding scaling, with letterboxing or pillarboxing to preserve aspect ratios as necessary.
4545

4646
Simply ensure your `CanvasControl`, `CanvasVirtualControl` or `CanvasAnimatedControl` is a child element of a `ViewBox`, and restrict the size of that control.
4747

@@ -96,6 +96,6 @@ if(control.Dpi > dpiLimit)
9696

9797
To ensure this setting works across DPI changes, the application should subscribe to [`DisplayInformation.DpiChanged`](https://msdn.microsoft.com/library/windows/apps/windows.graphics.display.displayinformation.dpichanged) and use this logic in the handler to set the DPI scale against the new DPI.
9898

99-
This saves the app some perf overhead, exploiting the fact that users may not be able to easily percieve the reduced resolution on a high-DPI display.
99+
This saves the app some perf overhead, exploiting the fact that users may not be able to easily perceive the reduced resolution on a high-DPI display.
100100

101101
The scaling performed in having a lower-than-native resolution control resource cannot guarantee control over the interpolation mode, similar to `ViewBox` mentioned above. If your app needs a particular interpolation mode, use an intermediate instead.

hub/apps/publish/publish-your-app/msix/app-package-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generally speaking, later OS versions can run packages that target previous OS v
1818

1919
## Removing an app from the Store
2020

21-
At times, you may want to stop offering an app to customers, effectively "unpublishing" it. To do so, navigate to the **Store presence** card on the **App overview** page. You will see that your product is currently available in the Microsoft Store. Click on **Modify availabilty**, select **Make product unavailable** and click on **Apply**. After you confirm that you want to make the app unavailable, within a few hours it will no longer be visible in the Store, and no new customers will be able to get it (unless they have a [promotional code](../../generate-promotional-codes.md) and are using a Windows 10 or Windows 11 device).
21+
At times, you may want to stop offering an app to customers, effectively "unpublishing" it. To do so, navigate to the **Store presence** card on the **App overview** page. You will see that your product is currently available in the Microsoft Store. Click on **Modify availability**, select **Make product unavailable** and click on **Apply**. After you confirm that you want to make the app unavailable, within a few hours it will no longer be visible in the Store, and no new customers will be able to get it (unless they have a [promotional code](../../generate-promotional-codes.md) and are using a Windows 10 or Windows 11 device).
2222

2323
:::image type="content" source="images/new-overview-make-product-unavailable.png" lightbox="images/new-overview-make-product-unavailable.png" alt-text="A screenshot of the new msix overview page showing how to make product unavailable in Store":::
2424

hub/apps/publish/publish-your-app/pwa/create-app-submission.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 10/30/2022
1010
> [!NOTE]
1111
> This section of the documentation describes how to create an app submission in Partner Center. Alternatively, you can use the [Microsoft Store submission API](/windows/uwp/monetize/create-and-manage-submissions-using-windows-store-services) to automate app submissions.
1212
13-
Once you've [created your app by reserving a name](reserve-your-apps-name.md), you can start working on getting it published. The first step is to create a submission. After you have reserved your app name, you will be redirected to your app's application oveview page. From the Product release section, click on **Start submission**. A product submission in draft status will appear. This draft includes all the submission steps that need to be completed. Refer the app submission checklist below to complete the steps:
13+
Once you've [created your app by reserving a name](reserve-your-apps-name.md), you can start working on getting it published. The first step is to create a submission. After you have reserved your app name, you will be redirected to your app's application overview page. From the Product release section, click on **Start submission**. A product submission in draft status will appear. This draft includes all the submission steps that need to be completed. Refer the app submission checklist below to complete the steps:
1414

1515
## App submission checklist
1616

hub/apps/windows-app-sdk/applifecycle/applifecycle-restart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This Restart API enables Win32 applications to terminate and restart on command,
4141

4242
## Restarting With Command Line Arguments
4343

44-
Simply call the Restart method and specify an arbitrary command-line string for the restarted instance to restart with. The restart is completedly synchronously and no further action or handling is required. If the restart fails for some reason, the Restart method returns a failure reason.
44+
Simply call the Restart method and specify an arbitrary command-line string for the restarted instance to restart with. The restart is completely synchronously and no further action or handling is required. If the restart fails for some reason, the Restart method returns a failure reason.
4545

4646
## Examples
4747

uwp/audio-video-camera/audio-graphs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ To receive a notification when playback has reached the end of the **MediaSource
115115

116116
:::code language="csharp" source="~/../snippets-windows/windows-uwp/audio-video-camera/AudioGraph/cs/MainPage.xaml.cs" id="SnippetMediaSourceCompleted":::
117117

118-
While playing a file from diskis likely to always complete successfully, media streamed from a network source may fail during playback due to a change in network connection or other issues that are outside the control of the audio graph. If a **MediaSource** becomes unplayable during playback, the audio graph will raise the [**UnrecoverableErrorOccurred**](/uwp/api/windows.media.audio.audiograph.unrecoverableerroroccurred) event. You can use the handler for this event to stop and dispose of the audio graph and then reinitialize your graph.
118+
While playing a file from disk is likely to always complete successfully, media streamed from a network source may fail during playback due to a change in network connection or other issues that are outside the control of the audio graph. If a **MediaSource** becomes unplayable during playback, the audio graph will raise the [**UnrecoverableErrorOccurred**](/uwp/api/windows.media.audio.audiograph.unrecoverableerroroccurred) event. You can use the handler for this event to stop and dispose of the audio graph and then reinitialize your graph.
119119

120120
:::code language="csharp" source="~/../snippets-windows/windows-uwp/audio-video-camera/AudioGraph/cs/MainPage.xaml.cs" id="SnippetRegisterUnrecoverableError":::
121121

uwp/devices-sensors/enable-usermode-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ Use the following samples to validate that devices work from UWP.
803803

804804
### Run the HLK Tests
805805

806-
Download the [Hardware Lab Kit (HLK)](/windows-hardware/test/hlk/windows-hardware-lab-kit). The following tests are availble:
806+
Download the [Hardware Lab Kit (HLK)](/windows-hardware/test/hlk/windows-hardware-lab-kit). The following tests are available:
807807

808808
- [GPIO WinRT Functional and Stress Tests](/windows-hardware/test/hlk/testref/f1fc0922-1186-48bd-bfcd-c7385a2f6f96)
809809
- [I2C WinRT Write Tests (EEPROM Required)](/windows-hardware/test/hlk/testref/2ab0df1b-3369-4aaf-a4d5-d157cb7bf578)

uwp/get-started/universal-application-platform-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ For more introductory material, see [An Introduction to Building Windows Apps fo
154154
## How the Universal Windows Platform relates to Windows Runtime APIs
155155
If you're building a Universal Windows Platform (UWP) app, then you can get a lot of mileage and convenience out of treating the terms "Universal Windows Platform (UWP)" and "Windows Runtime (WinRT)" as more or less synonymous. But it *is* possible to look under the covers of the technology, and determine just what the difference is between those ideas. If you're curious about that, then this last section is for you.
156156

157-
The Windows Runtime, and WinRT APIs, are an evolution of Windows APIs. Originally, Windows apps were writen using flat, C-style Win32 APIs and to those were added COM APIs—[DirectX](/windows/desktop/directx) being a prominent example. Later technologies such as Windows Forms, WPF, .NET, and managed languages also providing a unique way of writing Windows apps with their own flavor of API technology. Under the covers, the Windows Runtime is the next stage of COM. At the actual application binary interface (ABI) layer, its roots in COM become visible. But unlike COM, the Windows Runtime was designed to be callable from a wide variety of programming languages in a more natural way. As a result, access to the Windows Runtime is made available via what are known as language projections. A projection hides the COM details, and provides a more natural programming experience for a given language. There is a Windows Runtime language projection into C#, Visual Basic, standard C++, JavaScript, and so on. Furthermore, once packaged appropriately—see [Desktop Bridge](/windows/msix/desktop/source-code-overview)—you can call WinRT APIs from an app built in a variety of application models: Win32, .NET, WinForms, WPF, and UWP.
157+
The Windows Runtime, and WinRT APIs, are an evolution of Windows APIs. Originally, Windows apps were written using flat, C-style Win32 APIs and to those were added COM APIs—[DirectX](/windows/desktop/directx) being a prominent example. Later technologies such as Windows Forms, WPF, .NET, and managed languages also providing a unique way of writing Windows apps with their own flavor of API technology. Under the covers, the Windows Runtime is the next stage of COM. At the actual application binary interface (ABI) layer, its roots in COM become visible. But unlike COM, the Windows Runtime was designed to be callable from a wide variety of programming languages in a more natural way. As a result, access to the Windows Runtime is made available via what are known as language projections. A projection hides the COM details, and provides a more natural programming experience for a given language. There is a Windows Runtime language projection into C#, Visual Basic, standard C++, JavaScript, and so on. Furthermore, once packaged appropriately—see [Desktop Bridge](/windows/msix/desktop/source-code-overview)—you can call WinRT APIs from an app built in a variety of application models: Win32, .NET, WinForms, WPF, and UWP.
158158

159159
UWP is an application model built on top of the Windows Runtime. Technically, the UWP application model is based on [CoreApplication](/uwp/api/windows.applicationmodel.core.coreapplication), although that detail may be hidden from you depending on your chosen programming language. The UWP lends itself to writing a single binary that can, should you choose, be published to the Microsoft Store and run on a wide range of device form factors as covered above. The device reach of your UWP app depends on the subset of Windows Runtime APIs that you limit your app to calling, or that you call conditionally.
160160

0 commit comments

Comments
 (0)