Skip to content

Commit cdb419c

Browse files
Merge pull request #4202 from MicrosoftDocs/main638485442411734204sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 5d9e5c2 + 5934a4c commit cdb419c

21 files changed

+25
-25
lines changed

hub/apps/design/controls/web-view.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ webView1.NavigationStarting += webView1_NavigationStarting;
106106

107107
private void webView1_NavigationStarting(object sender, WebViewNavigationStartingEventArgs args)
108108
{
109-
// Cancel navigation if URL is not allowed. (Implemetation of IsAllowedUri not shown.)
109+
// Cancel navigation if URL is not allowed. (Implementation of IsAllowedUri not shown.)
110110
if (!IsAllowedUri(args.Uri))
111111
args.Cancel = true;
112112
}

hub/apps/design/layout/layout-panels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ The default column width is "*", so you don't need to explicitly set this value
197197
<ColumnDefinition Width="44"/>
198198
<ColumnDefinition Width="2*"/>
199199
</Grid.ColumnDefinitions>
200-
<TextBlock Text="Column 1 sizes to its conent." FontSize="24"/>
200+
<TextBlock Text="Column 1 sizes to its content." FontSize="24"/>
201201
</Grid>
202202
```
203203

hub/apps/design/widgets/widgets-design-fundamentals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ For accessibility, the following table presents the text of the table shown in t
8080
| Body (for hyperlinks) | 14/20 epx | Default, Lighter, Accent |
8181
| Body Strong | 14/20 epx | Default, Bolder |
8282
| Body Large | 18/24 epx | Medium, Lighter |
83-
| Body Larget | 18/24 epx | Medium, Bolder |
83+
| Body Largest | 18/24 epx | Medium, Bolder |
8484
| Subtitle | 20/28 epx | Large, Bolder |
8585
| Title | 28/36 epx | Extra Large, Bolder |
8686

hub/apps/develop/audio-video-camera.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ The .NET SDK also provides APIs related to audio, video, and camera scenarios fo
5050
| Article | Description |
5151
|---------|-------------|
5252
| [Graphics (WPF)](/dotnet/framework/wpf/graphics-multimedia/graphics) | Learn about support for multimedia, vector graphics, animation, and content composition in WPF apps. |
53-
| [Mutimedia (WPF)](/dotnet/framework/wpf/graphics-multimedia/multimedia-overview) | Learn about integrating audio and video into your WPF apps. |
53+
| [Multimedia (WPF)](/dotnet/framework/wpf/graphics-multimedia/multimedia-overview) | Learn about integrating audio and video into your WPF apps. |
5454
| [Graphics and drawing (Windows Forms)](/dotnet/framework/winforms/advanced/graphics-and-drawing-in-windows-forms) | Learn how to create graphics, draw text, and manipulate graphical images in Windows Forms apps. |
5555
| [SoundPlayer class (Windows Forms)](/dotnet/framework/winforms/controls/soundplayer-class-overview) | Learn how to include sounds in your Windows Forms applications. |

hub/apps/develop/ui-input/visual-tree.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ For more specific information on how to use Spy++ from Visual Studio, see [Spy++
115115

116116
Spy++ displays a graphical tree of relationships among system objects, with the current desktop window at the top of the tree and child nodes representing all other windows listed according to the standard window hierarchy. It can provide valuable insight into an application's behavior that is not available through the Visual C++ debugger.
117117

118-
:::image type="content" source="images/spy++-app-window.png" alt-text="Screenshot of the Spy++ applciation window.":::
118+
:::image type="content" source="images/spy++-app-window.png" alt-text="Screenshot of the Spy++ application window.":::
119119

120120
With Spy++ you can:
121121

hub/apps/develop/user-interface.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Note that Windows Forms does not have animations built in, unlike the other UI f
193193
- API Reference: [.NET API Reference](/dotnet/api)
194194
- Controls: [Overview of using controls (Windows Forms .NET)](/dotnet/desktop/winforms/controls/overview)
195195
- Input: [User input (Windows Forms)](/dotnet/framework/winforms/user-input-in-windows-forms)
196-
- Accessibility: [Windows Forms Acessibility](/dotnet/desktop/winforms/advanced/windows-forms-accessibility)
196+
- Accessibility: [Windows Forms Accessibility](/dotnet/desktop/winforms/advanced/windows-forms-accessibility)
197197
- Samples: [Winforms Samples GitHub repo](https://github.com/dotnet/samples/tree/main/windowsforms)
198198

199199
### [Other](#tab/other)

hub/apps/publish/partner-center/associate-existing-azure-ad-tenant-with-partner-center-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If your organization already uses Azure AD, follow these steps to link your Part
2424

2525
:::image type="content" source="../images/partner-center-connect-azure-ad.png" alt-text="Screenshot showing option to Associate Azure AD with your Partner Center account.":::
2626

27-
3. A the Microsoft Partner Center sign in page, enter the Azure AD credentials for the tenant that you want to associate.
27+
3. On the Microsoft Partner Center sign in page, enter the Azure AD credentials for the tenant that you want to associate.
2828

2929
:::image type="content" source="../images/partner-center-signin-azure-ad-credentials.png" alt-text="Screenshot showing Microsoft Partner Center sign-in dialog where you should sign in using Azure AD credentials for your tenant.":::
3030

hub/dev-environment/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Learn more in the [Windows Terminal docs](/windows/terminal).
198198
199199
## Transitioning between Mac and Windows
200200

201-
Check out our [guide to transitioning between between a Mac and Windows](./mac-to-windows.md) (or Windows Subsystem for Linux) development environment. It can help you map the difference between:
201+
Check out our [guide to transitioning between a Mac and Windows](./mac-to-windows.md) (or Windows Subsystem for Linux) development environment. It can help you map the difference between:
202202

203203
- [Keyboard shortcuts](./mac-to-windows.md#keyboard-shortcuts)
204204
- [Trackpad shortcuts](./mac-to-windows.md#trackpad-shortcuts)

uwp/audio-video-camera/basic-photo-video-and-audio-capture-with-MediaCapture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ All of the capture methods described in this article require the first step of i
3636
:::code language="csharp" source="~/../snippets-windows/windows-uwp/audio-video-camera/SimpleCameraPreview_Win10/cs/MainPage.xaml.cs" id="SnippetInitMediaCapture":::
3737

3838
## Set up the camera preview
39-
It's possible to capture photos, videos, and audio using **MediaCapture** without showing the camera preview, but typically you want to show the preview stream so that the user can see what's being captured. Also, a few **MediaCapture** features require the preview stream to be running before they can be enbled, including auto focus, auto exposure, and auto white balance. To see how to set up the camera preview, see [**Display the camera preview**](simple-camera-preview-access.md).
39+
It's possible to capture photos, videos, and audio using **MediaCapture** without showing the camera preview, but typically you want to show the preview stream so that the user can see what's being captured. Also, a few **MediaCapture** features require the preview stream to be running before they can be enabled, including auto focus, auto exposure, and auto white balance. To see how to set up the camera preview, see [**Display the camera preview**](simple-camera-preview-access.md).
4040

4141
## Capture a photo to a SoftwareBitmap
4242
The [**SoftwareBitmap**](/uwp/api/Windows.Graphics.Imaging.SoftwareBitmap) class was introduced in Windows 10 to provide a common representation of images across multiple features. If you want to capture a photo and then immediately use the captured image in your app, such as displaying it in XAML, instead of capturing to a file, then you should capture to a **SoftwareBitmap**. You still have the option of saving the image to disk later.

uwp/audio-video-camera/custom-audio-effects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ If your audio effect class is declared is a different namespace, be sure to incl
124124
:::code language="csharp" source="~/../snippets-windows/windows-uwp/audio-video-camera/AudioGraph/cs/MainPage.xaml.cs" id="SnippetUsingAudioEffectComponent":::
125125

126126
### Add your custom effect to an AudioGraph node
127-
For general information about using audio graphs, see [Audio garphs](audio-graphs.md). The following code snippet shows you how to add the example echoe effect shown in this article to an audio graph node. First, a [**PropertySet**](/uwp/api/Windows.Foundation.Collections.PropertySet) is created and a value for the **Mix** property, defined by the effect, is set. Next, the [**AudioEffectDefinition**](/uwp/api/Windows.Media.Effects.AudioEffectDefinition) constructor is called, passing in the full class name of the custom effect type and the property set. Finally, the effect definition is added to the [**EffectDefinitions**](/uwp/api/windows.media.audio.audiofileinputnode.effectdefinitions) property of an existing [**FileInputNode**](/uwp/api/windows.media.audio.createaudiofileinputnoderesult.fileinputnode), causing the audio emitted to be processed by the custom effect.
127+
For general information about using audio graphs, see [Audio graphs](audio-graphs.md). The following code snippet shows you how to add the example echoe effect shown in this article to an audio graph node. First, a [**PropertySet**](/uwp/api/Windows.Foundation.Collections.PropertySet) is created and a value for the **Mix** property, defined by the effect, is set. Next, the [**AudioEffectDefinition**](/uwp/api/Windows.Media.Effects.AudioEffectDefinition) constructor is called, passing in the full class name of the custom effect type and the property set. Finally, the effect definition is added to the [**EffectDefinitions**](/uwp/api/windows.media.audio.audiofileinputnode.effectdefinitions) property of an existing [**FileInputNode**](/uwp/api/windows.media.audio.createaudiofileinputnoderesult.fileinputnode), causing the audio emitted to be processed by the custom effect.
128128

129129
:::code language="csharp" source="~/../snippets-windows/windows-uwp/audio-video-camera/AudioGraph/cs/MainPage.xaml.cs" id="SnippetAddCustomEffect":::
130130

0 commit comments

Comments
 (0)