Skip to content

Commit f035b8a

Browse files
Merge pull request #4684 from MicrosoftDocs/main638582093702639081sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents cf89d84 + 581771e commit f035b8a

26 files changed

+41
-41
lines changed

hub/apps/design/input/enable-continuous-dictation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ When people converse, they often rely on context to fully understand what is bei
203203

204204
This can result in a less than ideal experience for the user as they continue speaking and no results are provided until the recognizer has high enough confidence to raise the [**ResultGenerated**](/uwp/api/windows.media.speechrecognition.speechcontinuousrecognitionsession.resultgenerated) event.
205205

206-
Handle the [**HypothesisGenerated**](/uwp/api/windows.media.speechrecognition.speechrecognizer.hypothesisgenerated) event to improve this apparent lack of responsiveness. This event is raised whenever the recognizer generates a new set of potential matches for the word being processed. The event argument provides an [**Hypothesis**](/uwp/api/windows.media.speechrecognition.speechrecognitionhypothesisgeneratedeventargs.hypothesis) property that contains the current matches. Show these to the user as they continue speaking and reassure them that processing is still active. Once confidence is high and a recognition result has been determined, replace the interim **Hypothesis** results with the final [**Result**](/uwp/api/windows.media.speechrecognition.speechcontinuousrecognitionresultgeneratedeventargs.result) provided in the [**ResultGenerated**](/uwp/api/windows.media.speechrecognition.speechcontinuousrecognitionsession.resultgenerated) event.
206+
Handle the [**HypothesisGenerated**](/uwp/api/windows.media.speechrecognition.speechrecognizer.hypothesisgenerated) event to improve this apparent lack of responsiveness. This event is raised whenever the recognizer generates a new set of potential matches for the word being processed. The event argument provides a [**Hypothesis**](/uwp/api/windows.media.speechrecognition.speechrecognitionhypothesisgeneratedeventargs.hypothesis) property that contains the current matches. Show these to the user as they continue speaking and reassure them that processing is still active. Once confidence is high and a recognition result has been determined, replace the interim **Hypothesis** results with the final [**Result**](/uwp/api/windows.media.speechrecognition.speechcontinuousrecognitionresultgeneratedeventargs.result) provided in the [**ResultGenerated**](/uwp/api/windows.media.speechrecognition.speechcontinuousrecognitionsession.resultgenerated) event.
207207

208208
Here, we append the hypothetical text and an ellipsis ("…") to the current value of the output [**TextBox**](/uwp/api/Windows.UI.Xaml.Controls.TextBox). The contents of the text box are updated as new hypotheses are generated and until the final results are obtained from the [**ResultGenerated**](/uwp/api/windows.media.speechrecognition.speechcontinuousrecognitionsession.resultgenerated) event.
209209

hub/apps/design/shell/tiles-and-notifications/WNS-Notification-Priorities.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ More specific recommended behaviors for each priority are listed below. This is
5757
| Battery Saver enabled | If user exempted: deliver Else: cache | If user exempted: deliver Else: cache | If user exempted: deliver Else: cache | Cache |
5858
| On battery + battery saver enabled + screen off | If user exempted: deliver Else: cache | If user exempted: deliver Else: cache | If user exempted: deliver Else: cache | Cache |
5959

60-
Note that low priority notifications will be delivered by default for screen off and battery only for Windows Phone based devices. This is to maintian compatibility with preexisting MPNS policy. Also note that the fourth and fifth rows are the same, just calling out different scenarios.
60+
Note that low priority notifications will be delivered by default for screen off and battery only for Windows Phone based devices. This is to maintain compatibility with preexisting MPNS policy. Also note that the fourth and fifth rows are the same, just calling out different scenarios.
6161

6262
To exempt an app in battery saver, users must go to the "Battery Usage by App" in Settings and select "Allow the app to run background tasks." This user selection exempts the app from battery saver for high, medium, and low priority notifications. You can also call [BackgroundExecutionManager API](/uwp/api/windows.applicationmodel.background.backgroundexecutionmanager.requestaccesskindasync#Windows_ApplicationModel_Background_BackgroundExecutionManager_RequestAccessKindAsync_Windows_ApplicationModel_Background_BackgroundAccessRequestKind_System_String_) to programmatically ask for the user's permission.
6363

hub/apps/design/style/iconography/visual-studio-asset-generation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ While handcrafting each icon file will create the best, most consistent user exp
1717
:::row:::
1818
:::column:::
1919
1. Use Visual Studio to open a WinUI or UWP project.
20-
2. In the **Solution Explorer**, double-click the Package.appmxanifest file.
20+
2. In the **Solution Explorer**, double-click the Package.appxmanifest file.
2121
:::column-end:::
2222
:::column:::
2323
:::image type="content" source="images/package-appmanifest.png" alt-text="A diagram that shows a view of solution explorer highlighting the Package.appxmanifest file.":::

hub/apps/design/style/writing-style.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ We couldn't upload the picture. If this happens again, try restarting the app. B
7070
:::column-end:::
7171
:::column:::
7272
![Don't](images/dont.svg)
73-
An error occured, and we weren't able to upload the picture. Please try again, and if you encounter this problem again, you may need to restart the app. But don't worry — we've saved your work locally, and it'll be waiting for you when you come back.
73+
An error occurred, and we weren't able to upload the picture. Please try again, and if you encounter this problem again, you may need to restart the app. But don't worry — we've saved your work locally, and it'll be waiting for you when you come back.
7474
:::column-end:::
7575
:::row-end:::
7676

@@ -244,7 +244,7 @@ You don't need to be a trained or experienced writer to provide your users with
244244

245245
* Imagine that you're talking to a friend about your app. How would you explain the app to them? How would you talk about its features or give them instructions? Better yet, explain the app to an actual person who hasn't used it yet.
246246

247-
* Imagine how you would describe a completely different app. For instance, if you're making a game, think of what you'd say or write to describe a financial or a news app. The contrast in the language and stucture you use can give you more insight into the right words for what you're actually writing about.
247+
* Imagine how you would describe a completely different app. For instance, if you're making a game, think of what you'd say or write to describe a financial or a news app. The contrast in the language and structure you use can give you more insight into the right words for what you're actually writing about.
248248

249249
* Take a look at similar apps for inspiration.
250250

hub/apps/develop/data-and-files.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ The .NET SDK also provides APIs related to data and files scenarios for WPF and
4747

4848
| Article | Description |
4949
|---------|-------------|
50-
| [Resources in .NET apps](/dotnet/framework/resources/) | Learn general strategies for managing app resouces in .NET apps. |
51-
| [Application resource, content, and data files (WPF)](/dotnet/framework/wpf/app-development/wpf-application-resource-content-and-data-files) | Learn how to manage app resouces in WPF apps. |
50+
| [Resources in .NET apps](/dotnet/framework/resources/) | Learn general strategies for managing app resources in .NET apps. |
51+
| [Application resource, content, and data files (WPF)](/dotnet/framework/wpf/app-development/wpf-application-resource-content-and-data-files) | Learn how to manage app resources in WPF apps. |
5252
| [Application settings (Windows Forms)](/dotnet/framework/winforms/advanced/application-settings-for-windows-forms) | Learn how to create, store, and maintain custom application and user preferences in Windows Forms apps. |
5353
| [LINQ](/dotnet/standard/linq/) | Learn how to use Language-Integrated Query (LINQ) to perform language-level data queries in .NET apps. |
5454
| [XML documents and data](/dotnet/standard/data/xml/) | Learn how to parse and write XML, edit XML data in memory, validate XML data, and perform XSLT transformations in .NET apps. |

hub/apps/develop/settings/settings-windows-11.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ This setting controls settings related to gaming and controls such as Game bar a
7676
| UseNexusForGameBarEnabled | REG_DWORD | 0 or 1 | Key associated with toggle Gaming -> Game Bar -> "Allow your controller to open Game Bar" |
7777
| AutoGameModeEnabled | REG_DWORD | 0 or 1 | Key associated with toggle Gaming -> Game Mode -> Game Mode. |
7878

79-
## Personalization - Start - Layout - Pins and recomendations
79+
## Personalization - Start - Layout - Pins and recommendations
8080

8181
Specifies the start layout type.
8282

@@ -236,7 +236,7 @@ This setting contains toggles and other settings related to touch keyboard, text
236236
| EnableDoubleTapSpace | REG_DWORD | 1 or 0 | Enables double-tap space. |
237237
| EnableAutocorrection | REG_DWORD | 1 or 0 | Enables auto-correction. |
238238
| IsVoiceTypingKeyEnabled | REG_DWORD | 1 or 0 | Indicates if voice typing key is enabled. |
239-
| MultilingualEnabled | REG_DWORD | 1 or 0 | Indicates in multingual is enabled. |
239+
| MultilingualEnabled | REG_DWORD | 1 or 0 | Indicates in multilingual is enabled. |
240240
| EnableHwkbTextPrediction | REG_DWORD | An integer. | ASCII Value for keys. |
241241

242242
## VPN

hub/apps/develop/widgets/widget-provider-manifest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Specifies activation information for the widget provider. If both **CreateInstan
107107

108108
## ActivateApplication
109109

110-
When **ActivateApplication** is specified, the widget provider is activated via the command line, with the arguments provided as [base64url encoded](https://datatracker.ietf.org/doc/html/rfc4648#section-5) JSON strings. It is recommended that widget providers use the **CreateInstance** activiation type. For information on the **ActivateApplication** command line format, see [Widget provider ActivateApplication protocol](widget-provider-activateapplication-protocol.md).
110+
When **ActivateApplication** is specified, the widget provider is activated via the command line, with the arguments provided as [base64url encoded](https://datatracker.ietf.org/doc/html/rfc4648#section-5) JSON strings. It is recommended that widget providers use the **CreateInstance** activation type. For information on the **ActivateApplication** command line format, see [Widget provider ActivateApplication protocol](widget-provider-activateapplication-protocol.md).
111111

112112
## Definitions
113113

@@ -125,7 +125,7 @@ Represents the registration for a single widget.
125125
| **AllowMultiple** | boolean | No | Set to false if only one instance of this widget is supported. This attribute is optional and the default value is true. | true |
126126
| **IsCustomizable** | boolean | No | Introduced in Windows App SDK 1.4. Set to true if your app supports widget customization. This causes the **Customize widget** button to be displayed in the widget's ellipsis menu. | false |
127127

128-
## Capablities
128+
## Capabilities
129129

130130
Optional. Specifies capabilities for a single widget. If no capabilities are declared, one capability specifying a "large" size is added by default.
131131

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
@@ -113,7 +113,7 @@ You can pause a video recording and then resume recording without creating a sep
113113

114114
Starting with Windows 10, version 1607, you can pause a video recording and receive the last frame captured before the recording was paused. You can then overlay this frame on the camera preview to allow the user to align the camera with the paused frame before resuming recording. Calling [**PauseWithResultAsync**](/uwp/api/windows.media.capture.lowlagmediarecording.pausewithresultasync) returns a [**MediaCapturePauseResult**](/uwp/api/Windows.Media.Capture.MediaCapturePauseResult) object. The [**LastFrame**](/uwp/api/windows.media.capture.mediacapturepauseresult.lastframe) property is a [**VideoFrame**](/uwp/api/Windows.Media.VideoFrame) object representing the last frame. To display the frame in XAML, get the **SoftwareBitmap** representation of the video frame. Currently, only images in BGRA8 format with premultiplied or empty alpha channel are supported, so call [**Convert**](/uwp/api/windows.graphics.imaging.softwarebitmap.convert) if necessary to get the correct format. Create a new [**SoftwareBitmapSource**](/uwp/api/Windows.UI.Xaml.Media.Imaging.SoftwareBitmapSource) object and call [**SetBitmapAsync**](/uwp/api/windows.ui.xaml.media.imaging.softwarebitmapsource.setbitmapasync) to initialize it. Finally, set the **Source** property of a XAML [**Image**](/uwp/api/Windows.UI.Xaml.Controls.Image) control to display the image. For this trick to work, your image must be aligned with the **CaptureElement** control and should have an opacity value less than one. Don't forget that you can only modify the UI on the UI thread, so make this call inside [**RunAsync**](/uwp/api/windows.ui.core.coredispatcher.runasync).
115115

116-
**PauseWithResultAsync** also returns the duration of the video that was recorded in the preceeding segment in case you need to track how much total time has been recorded.
116+
**PauseWithResultAsync** also returns the duration of the video that was recorded in the preceding segment in case you need to track how much total time has been recorded.
117117

118118
:::code language="csharp" source="~/../snippets-windows/windows-uwp/audio-video-camera/SimpleCameraPreview_Win10/cs/MainPage.xaml.cs" id="SnippetPauseCaptureWithResult":::
119119

uwp/audio-video-camera/capture-from-multiple-sources-simultaneously.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Starting with Windows 10, version 1803, in addition to audio and video you can e
4646

4747
Encoding metadata uses a pattern that is parallel to encoding audio or video. The [**TimedMetadataEncodingProperties**](/uwp/api/windows.media.mediaproperties.timedmetadataencodingproperties) class describes the type, subtype and encoding properties of the metadata, like **VideoEncodingProperties** does for video. The [**TimedMetadataStreamDescriptor**](/uwp/api/windows.media.core.timedmetadatastreamdescriptor) identifies a metadata stream, just as the **VideoStreamDescriptor** does for video streams.
4848

49-
The following example shows how to intialize a **TimedMetadataStreamDescriptor** object. First, a **TimedMetadataEncodingProperties** object is created and the **Subtype** is set to a GUID that identifies the type of metadata that will be included in the stream. This example uses the GUID for GoPro metadata (gpmd). The [**SetFormatUserData**](/uwp/api/windows.media.mediaproperties.timedmetadataencodingproperties.setformatuserdata) method is called to set format-specific data. For MP4 files, the format-specific data is stored in the SampleDescription box (stsd). Next, a new **TimedMetadataStreamDescriptor** is created from the encoding properties. The **Label** and **Name** properties are set to identify the stream to be encoded.
49+
The following example shows how to initialize a **TimedMetadataStreamDescriptor** object. First, a **TimedMetadataEncodingProperties** object is created and the **Subtype** is set to a GUID that identifies the type of metadata that will be included in the stream. This example uses the GUID for GoPro metadata (gpmd). The [**SetFormatUserData**](/uwp/api/windows.media.mediaproperties.timedmetadataencodingproperties.setformatuserdata) method is called to set format-specific data. For MP4 files, the format-specific data is stored in the SampleDescription box (stsd). Next, a new **TimedMetadataStreamDescriptor** is created from the encoding properties. The **Label** and **Name** properties are set to identify the stream to be encoded.
5050

5151
:::code language="csharp" source="~/../snippets-windows/windows-uwp/audio-video-camera/SimpleCameraPreview_Win10/cs/MainPage.MultiRecord.xaml.cs" id="SnippetGetStreamDescriptor":::
5252

0 commit comments

Comments
 (0)