Skip to content

Commit 52675f4

Browse files
committed
Merge branch 'main' into alvinashcraft/main-update-settings-uri-parameters
2 parents 9e3c459 + 0869e0f commit 52675f4

File tree

53 files changed

+656
-712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+656
-712
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "hub/apps/design/devices/kinect-for-windows.md",
5+
"redirect_url": "https://azure.microsoft.com/en-us/products/kinect-dk",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "uwp/xbox-apps/automate-launching-uwp-apps.md",
510
"redirect_url": "/previous-versions/windows/uwp/xbox-apps/automate-launching-uwp-apps",
@@ -8634,9 +8639,16 @@
86348639
"source_path": "hub/android/defender-settings.md",
86358640
"redirect_url": "/defender-endpoint/microsoft-defender-security-center-antivirus",
86368641
"redirect_document_id": false
8642+
},
8643+
{
8644+
"source_path": "hub/apps/get-started/client-frameworks-faq.yml",
8645+
"redirect_url": "/windows/apps/get-started/windows-developer-faq",
8646+
"redirect_document_id": false
8647+
},
8648+
{
8649+
"source_path": "hub/apps/publish/in-app-ads.md",
8650+
"redirect_url": "/windows/apps/publish/attract-customers-and-promote-your-apps",
8651+
"redirect_document_id": false
86378652
}
86388653
]
86398654
}
8640-
8641-
8642-

hub/apps/design/controls/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Detailed information about specific controls and patterns.
131131

132132
## WinUI Gallery
133133

134-
Get the _WinUI Gallery_ apps from the Microsoft Store to see these controls and the Fluent Design System in action. The **WinUI 3 Gallery** and **WinUI 2 Gallery** apps include interactive examples of most WinUI 3 and WinUI 2 controls, features, and functionality. The apps are an interactive companion to this website. When you have them installed, you can use links on individual control pages to launch the app and see the control in action.
134+
Get the *WinUI Gallery* apps from the Microsoft Store to see XAML controls and the [Fluent Design System](https://developer.microsoft.com/fluentui#/) in action. The **WinUI 3 Gallery** and **WinUI 2 Gallery** apps include interactive examples of most WinUI 3 and WinUI 2 controls, features, and functionality. The apps are an interactive companion to this website. When you have them installed, you can use links on individual control pages to launch the app and see the control in action.
135135

136136
> [!div class="checklist"]
137137
>

hub/apps/design/devices/kinect-for-windows.md

Lines changed: 0 additions & 75 deletions
This file was deleted.
6.5 KB
Loading
5.7 KB
Loading
74.6 KB
Loading
-2.64 KB
Loading
4.69 KB
Loading
7.91 KB
Loading
-4.81 KB
Loading

0 commit comments

Comments
 (0)