Skip to content

Commit 13addd8

Browse files
author
Thomas Raya
authored
Merge pull request #8547 from MicrosoftDocs/main
Publish main to live on 9/27 @ 10:30 am
2 parents 62d52d0 + 275f534 commit 13addd8

14 files changed

Lines changed: 56 additions & 67 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ We **want and encourage contributions** from our community (users, customers, pa
1515

1616
* **Use your browser**: There are two options:
1717

18-
**Option 1: Edit directly from Microsoft Docs**
18+
**Option 1: Edit directly from Microsoft Learn**
1919

2020
1. Browse to the [InTune](/mem/intune) article you want to edit.
2121
2. Select **Edit** (top right). This shows the markdown file in the GitHub repository.

memdocs/configmgr/core/misc/mms2019docathon.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ ms.localizationpriority: null
1414

1515
# MMS 2019 Docathon
1616

17-
During the Midwest Management Summit (MMS) 2019, the Microsoft content team for Configuration Manager and Microsoft Intune are running a docathon. If you're attending the [Microsoft Docs hands-on lab](https://sched.co/N6fd) session on Monday, 6 May, that time is to work on contributions with support from the Microsoft writers. The docathon runs the entirety of the conference, and any registered MMS 2019 attendee can participate.
17+
During the Midwest Management Summit (MMS) 2019, the Microsoft content team for Configuration Manager and Microsoft Intune are running a docathon. If you're attending the [Microsoft Learn hands-on lab](https://sched.co/N6fd) session on Monday, 6 May, that time is to work on contributions with support from the Microsoft writers. The docathon runs the entirety of the conference, and any registered MMS 2019 attendee can participate.
1818

19-
Why should you participate? Microsoft Docs is an open-source platform for Microsoft product documentation powered by GitHub. Microsoft encourages everyone to contribute to the docs! When you contribute, the platform recognizes you in the list of contributors on every article. The following contributions are some of the types that the community can provide:
19+
Why should you participate? Microsoft Learn is an open-source platform for Microsoft product documentation powered by GitHub. Microsoft encourages everyone to contribute to the documentation! When you contribute, the platform recognizes you in the list of contributors on every article. The following contributions are some of the types that the community can provide:
2020

2121
- Typos
2222
- Clarifications
@@ -43,7 +43,7 @@ Create a [GitHub account](https://github.com/join)
4343
> [!NOTE]
4444
> Larger contributions will require that you accept the Microsoft open source [Contributor License Agreement (CLA)](https://cla.opensource.microsoft.com/). Review this agreement in advance.
4545
46-
- Contributions to Microsoft Docs count toward MVP award consideration.
46+
- Contributions to Microsoft Learn count toward MVP award consideration.
4747

4848
- Microsoft employees have a few more required one-time steps, and a slightly different contribution process.
4949

@@ -131,13 +131,13 @@ The following awards are calculated by the number of legitimate contributions to
131131

132132
- [Microsoft Style](/style-guide/welcome/)
133133

134-
- [Quick start](/contribute/style-quick-start)
134+
- [Quickstart](/contribute/style-quick-start)
135135

136-
- [Top 10 tips for Microsoft style and voice](/style-guide/top-10-tips-style-voice)
136+
- [Top 10 tips for Microsoft style and voice](/style-guide/top-10-tips-style-voice)
137137

138138
- [Contributor Guide](/contribute)
139139

140-
- [How to use Markdown for writing Docs](/contribute/markdown-reference)
140+
- [How to use Markdown in Microsoft Learn articles](/contribute/markdown-reference)
141141

142142
## Official rules
143143

memdocs/intune/developer/app-sdk-android-phase1.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 2: The
240240
[Telemetry]:#telemetry
241241
[Exit Criteria]:#exit-criteria
242242

243-
<!-- Other SDK Guide Markdown docs -->
243+
<!-- Other SDK Guide Markdown documentation -->
244244
[Stage 2: The MSAL Prerequisite]:app-sdk-android-phase2.md
245245
[Default Enrollment]:app-sdk-android-appendix.md#default-enrollment
246246
[Stage 5: Multi-Identity]:app-sdk-android-phase5.md
@@ -252,7 +252,7 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 2: The
252252
[Support App Protection CA]:app-sdk-android-phase7.md#support-app-protection-ca
253253
[Providing a Custom Theme]:app-sdk-android-phase7.md#providing-a-custom-theme
254254

255-
<!-- Microsoft docs: Intune overview -->
255+
<!-- Microsoft Learn documentation: Intune overview -->
256256
[Intune App SDK overview]:/mem/intune/developer/app-sdk
257257
[What is Microsoft Intune app management]:/mem/intune/apps/app-management
258258
[Android app protection policy settings]:/mem/intune/apps/app-protection-policy-settings-android
@@ -266,7 +266,7 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 2: The
266266
[Prepare line-of-business apps for app protection policies]:/mem/intune/developer/apps-prepare-mobile-application-management
267267
[Turn off Microsoft usage data collection]:/mem/intune/user-help/turn-off-microsoft-usage-data-collection-android
268268

269-
<!-- Microsoft docs: Intune testing -->
269+
<!-- Microsoft Learn documentation: Intune testing -->
270270
[Microsoft partner]:https://partner.microsoft.com/business-opportunities/why-microsoft
271271
[Microsoft CDX tenant creation site]:https://cdx.transform.microsoft.com/my-tenants/create-tenant
272272
[Set up Intune]:/mem/intune/fundamentals/setup-steps

memdocs/intune/developer/app-sdk-android-phase2.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,17 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 3: Gett
158158
[Intune-specific MSAL configuration]:#intune-specific-msal-configuration
159159
[Exit Criteria]:#exit-criteria
160160

161-
<!-- Other SDK Guide Markdown docs -->
161+
<!-- Other SDK Guide Markdown documentation -->
162162
[Stage 1: Planning the Integration]:app-sdk-android-phase1.md
163163
[Stage 3: Getting Started with MAM]:app-sdk-android-phase3.md
164164

165-
<!-- Microsoft docs: AAD -->
165+
<!-- Microsoft Learn documentation: AAD -->
166166
[Microsoft Azure Active Directory (AAD)]:https://azure.microsoft.com/services/active-directory/
167167
[Microsoft accounts]:https://account.microsoft.com/
168168
[What is Azure Active Directory?]:/azure/active-directory/fundamentals/active-directory-whatis
169169
[register your application with Azure Active Directory]:/azure/active-directory/active-directory-app-registration
170170

171-
<!-- Microsoft docs: MSAL-->
171+
<!-- Microsoft Learn documentation: MSAL-->
172172
[Microsoft Authentication Library (MSAL)]:/azure/active-directory/develop/msal-overview
173173
[list of MSAL libraries]:/azure/active-directory/develop/reference-v2-libraries
174174
[MSAL Wiki]:https://github.com/AzureAD/
@@ -182,22 +182,21 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 3: Gett
182182
[Android Microsoft Authentication Library configuration file]:/azure/active-directory/develop/msal-configuration
183183
[MSAL repository on GitHub]: https://github.com/AzureAD/microsoft-authentication-library-for-android
184184

185-
<!-- Microsoft docs: ADAL -->
185+
<!-- Microsoft Learn documentation: ADAL -->
186186
[Azure Active Directory Authentication Library (ADAL)]:/azure/active-directory/azuread-dev/active-directory-authentication-libraries
187187

188-
<!-- Microsoft docs: ADAL to MSAL -->
188+
<!-- Microsoft Learn documentation: ADAL to MSAL -->
189189
[Update your applications to use Microsoft Authentication Library (MSAL)]:https://techcommunity.microsoft.com/t5/azure-active-directory-identity/update-your-applications-to-use-microsoft-authentication-library/ba-p/1257363
190190
[Migrate Android ADAL to MSAL]:/azure/active-directory/develop/migrate-android-adal-msal
191191
[Differences between ADAL and MSAL]:/azure/active-directory/develop/msal-overview#differences-between-adal-and-msal
192192

193-
<!-- Microsoft docs: CA -->
193+
<!-- Microsoft Learn documentation: CA -->
194194
[Conditional Access (CA)]:/azure/active-directory/develop/active-directory-conditional-access-developer
195195
[device-based CA]:/mem/intune/protect/conditional-access-intune-common-ways-use#device-based-conditional-access
196196
[app-based CA]:/mem/intune/conditional-access-intune-common-ways-use#app-based-conditional-access
197197
[configuring app-based CA]:/mem/intune/protect/app-based-conditional-access-intune-create
198198

199-
200-
<!-- Microsoft docs -->
199+
<!-- Microsoft Learn documentation -->
201200
[give your app access to the Intune app protection service]:/mem/intune/developer/app-sdk-get-started#give-your-app-access-to-the-intune-app-protection-service-optional
202201

203202
<!-- Other Microsoft links -->

memdocs/intune/developer/app-sdk-android-phase3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 4: MAM
394394
[Reporting]:#reporting
395395
[Verification]:#verification
396396

397-
<!-- Other SDK Guide Markdown docs -->
397+
<!-- Other SDK Guide Markdown documentation -->
398398
[Stage 1: Planning the Integration]:app-sdk-android-phase1.md
399399
[MSAL configuration]:app-sdk-android-phase2.md
400400
[Registering for App Protection Policy]:app-sdk-android-phase4.md#registering-for-app-protection-policy
@@ -404,7 +404,7 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 4: MAM
404404
[appendix]:app-sdk-android-appendix.md
405405
[class and method replacements]:app-sdk-android-appendix.md#class-and-method-replacements
406406

407-
<!-- Microsoft docs -->
407+
<!-- Microsoft Learn documentation -->
408408
[Download the SDK files]:/mem/intune/developer/app-sdk-get-started#download-the-sdk-files
409409
[Microsoft Authentication Library (MSAL)]:/azure/active-directory/develop/msal-overview#languages-and-frameworks
410410
[MSAL documentation]:https://github.com/AzureAD/microsoft-authentication-library-for-android

memdocs/intune/developer/app-sdk-android-phase4.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,6 @@ After you've completed all the [Exit Criteria] above, your app is now successful
648648
The subsequent sections, [Stage 5: Multi-Identity], [Stage 6: App Configuration], and [Stage 7: App Participation Features] may or may not be required, depending on your app's desired app protection policy support.
649649
If you're unsure if any of these sections apply to your app, revisit [Key Decisions for SDK integration].
650650

651-
652651
<!-- Stage 4 links -->
653652
<!-- internal links -->
654653
[Troubleshooting]:#troubleshooting
@@ -658,8 +657,7 @@ If you're unsure if any of these sections apply to your app, revisit [Key Decisi
658657
[Diagnostics Information]:#recommended-diagnostics-information
659658
[My app is not receiving or enforcing any policies]:#my-app-is-not-receiving-or-enforcing-any-policies
660659

661-
662-
<!-- Other SDK Guide Markdown docs -->
660+
<!-- Other SDK Guide Markdown documentation -->
663661
[Stage 1: Planning the Integration]:app-sdk-android-phase1.md
664662
[Creating a test Android app protection policy]:app-sdk-android-phase1.md#creating-a-test-android-app-protection-policy
665663
[Key Decisions for SDK integration]:app-sdk-android-phase1.md#key-decisions-for-sdk-integration
@@ -674,7 +672,7 @@ If you're unsure if any of these sections apply to your app, revisit [Key Decisi
674672
[MDM and MAM enrollment]:app-sdk-android-appendix.md#mdm-and-mam-enrollment
675673
[Quickly testing with changing policy]:app-sdk-android-appendix.md#quickly-testing-with-changing-policy
676674

677-
<!-- Microsoft docs -->
675+
<!-- Microsoft Learn documentation -->
678676
[Microsoft Privacy Policy]:https://go.microsoft.com/fwlink/?Linkid=857875
679677
[Taskr sample application]:https://github.com/msintuneappsdk/Taskr-Sample-Intune-Android-App/blob/ca9fa2f9b350ee0c3a8566cc4ac5dad4ad9fbbfc/ReactMAM/android/app/src/main/java/com/microsoft/intune/samples/taskr/MainApplication.java
680678
[How to validate your app protection policy setup in Microsoft Intune]:/mem/intune/apps/app-protection-policies-validate

memdocs/intune/developer/app-sdk-android-phase6.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,32 +52,32 @@ Application configurations, also referred to as managed configurations or applic
5252
For example, if your app is a browser, you may choose to add configurations that let administrators pre-set bookmarks, block certain web pages, or disable incognito modes.
5353
Application configuration is an entirely optional, but powerful, tool to enhance your app's management experience.
5454

55-
See [App configuration policies for Microsoft Intune] for more detail.
55+
See [App configuration policies for Microsoft Intune][] for more detail.
5656

5757
### Android's Built-In App Configurations
5858

5959
Android has app configuration built into the platform, called [managed configurations].
6060
These configurations have no dependency on the Intune App SDK and can be enabled on apps that don't integrate the Intune App SDK.
6161
These configurations only apply when your application is used on a device that is managed with one of Google's Android Enterprise modes.
62-
See [Enroll Android devices] for details on how to set up these Android Enterprise modes in Microsoft Endpoint Manager.
63-
Admins can configure these [application configuration policies for managed Android Enterprise devices] in Microsoft Endpoint Manager.
62+
See [Enroll Android devices][] for details on how to set up these Android Enterprise modes in Microsoft Endpoint Manager.
63+
Admins can configure these [application configuration policies for managed Android Enterprise devices][] in Microsoft Endpoint Manager.
6464

65-
Your app can retrieve these admin-configured values either through [Android's `RestrictionsManager`] or through the Intune App SDK.
66-
See [retrieving app configuration from the SDK] for more information.
65+
Your app can retrieve these admin-configured values either through [Android's `RestrictionsManager`][] or through the Intune App SDK.
66+
See [retrieving app configuration from the SDK][] for more information.
6767

6868
### Intune App SDK App Configurations
6969

7070
The Intune App SDK supports another mechanism for delivering app configurations, separate from Android Enterprise managed configurations.
7171
These configurations are exclusive to Microsoft Intune and only apply to apps that have integrated the Intune App SDK.
7272
However, these configurations aren't limited to devices with Android Enterprise management.
73-
Admins can configure these [application configuration policies for managed apps] in Microsoft Endpoint Manager.
73+
Admins can configure these [application configuration policies for managed apps][] in Microsoft Endpoint Manager.
7474

7575
> [!NOTE]
7676
> App config can also be configured using the Graph API.
77-
> For information, see the [Graph API docs for MAM Targeted Config].
77+
> For information, see the [Graph API documentation for MAM Targeted Config][].
7878
7979
Your app must retrieve these admin-configured values through the Intune App SDK.
80-
See [retrieving app configuration from the SDK] for more information.
80+
See [retrieving app configuration from the SDK][] for more information.
8181

8282
## What configurations should I add to my app?
8383

@@ -120,7 +120,7 @@ If your app supports both types of app configuration, use the API as described b
120120

121121
## Retrieving app configuration from the SDK
122122

123-
Applications can receive configurations from both channels using the [MAMAppConfigManager] and [MAMAppConfig] classes.
123+
Applications can receive configurations from both channels using the [MAMAppConfigManager][] and [MAMAppConfig][] classes.
124124

125125
```java
126126
MAMAppConfigManager configManager = MAMComponents.get(MAMAppConfigManager.class);
@@ -142,7 +142,7 @@ List<Map<String, String>> getFullData()
142142

143143
Your app can also register for the `REFRESH_APP_CONFIG` notification that informs the app that new app configuration data is available.
144144
If your app caches app configuration data, it **must** register for this notification and invalidate any cached data in the handler.
145-
See [Register for notifications from the SDK] for more detail.
145+
See [Register for notifications from the SDK][] for more detail.
146146

147147
## Resolving conflicts
148148

@@ -154,7 +154,7 @@ See [Register for notifications from the SDK] for more detail.
154154
If an admin configures conflicting values for the same key, Intune doesn't have any way of resolving this conflict automatically and will make all values available to your app.
155155
This type of conflict could happen if the admin targets different app config sets with the same key to multiple groups containing the same account.
156156

157-
Your app can request all values for a given key from a [MAMAppConfig] object, so you can resolve conflicts with your own business logic:
157+
Your app can request all values for a given key from a [MAMAppConfig][] object, so you can resolve conflicts with your own business logic:
158158

159159
```java
160160
List<Boolean> getAllBooleansForKey(String key)
@@ -190,7 +190,7 @@ To validate that Intune is properly delivering app configuration policy:
190190
- If your app supports app configuration for managed apps, see [application configuration policies for managed apps].
191191
- If your app supports both types of app configuration, create both types of policy for testing.
192192
2. Log in to your app with your test account.
193-
- For managed devices, see [Android enterprise app configuration policies] and [Enroll Android devices].
193+
- For managed devices, see [Android enterprise app configuration policies][] and [Enroll Android devices][].
194194
- For managed apps:
195195
1. Install both your app and the Intune Company Portal.
196196
2. Log in to your app with your test account.
@@ -210,7 +210,7 @@ When testing, consider the following:
210210

211211
## Next Steps
212212

213-
After you've completed all the [Exit Criteria] above, your app is now successfully integrated as with app configuration policy.
213+
After you've completed all the [Exit Criteria][] above, your app is now successfully integrated as with app configuration policy.
214214

215215
The subsequent section, [Stage 7: App Participation Features], may or may not be required, depending on your app's desired app protection policy support.
216216
If you're unsure if any of these features apply to your app, revisit [Key Decisions for SDK integration].
@@ -220,18 +220,18 @@ If you're unsure if any of these features apply to your app, revisit [Key Decisi
220220
[retrieving app configuration from the SDK]:#retrieving-app-configuration-from-the-sdk
221221
[Exit Criteria]:#exit-criteria
222222

223-
<!-- Other SDK Guide Markdown docs -->
223+
<!-- Other SDK Guide Markdown documentation -->
224224
[Stage 1: Planning the Integration]:app-sdk-android-phase1.md
225225
[Key Decisions for SDK integration]:app-sdk-android-phase1.md#key-decisions-for-sdk-integration
226226
[Register for notifications from the SDK]:app-sdk-android-phase7.md#register-for-notifications-from-the-sdk
227227
[Stage 7: App Participation Features]:app-sdk-android-phase7.md
228228

229-
<!-- Microsoft docs -->
229+
<!-- Microsoft Learn documentation -->
230230
[App configuration policies for Microsoft Intune]:/mem/intune/apps/app-configuration-policies-overview
231231
[Enroll Android devices]:/mem/intune/enrollment/android-enroll
232232
[application configuration policies for managed Android Enterprise devices]:/mem/intune/apps/app-configuration-policies-use-android
233233
[application configuration policies for managed apps]:/mem/intune/apps/app-configuration-policies-managed-app
234-
[Graph API docs for MAM Targeted Config]:/graph/api/resources/intune-mam-targetedmanagedappconfiguration
234+
[Graph API documentation for MAM Targeted Config]:/graph/api/resources/intune-mam-targetedmanagedappconfiguration
235235
[Validate the applied app configuration policy]:/mem/intune/apps/app-configuration-policies-overview#validate-the-applied-app-configuration-policy
236236
[Android enterprise app configuration policies]:/mem/intune/apps/app-configuration-policies-overview#android-enterprise-app-configuration-policies
237237

memdocs/intune/developer/app-sdk-android-phase7.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ Do continue to refer to this guide and the [Appendix] as you continue to develop
808808
[Exit Criteria]:#exit-criteria
809809
[Validating App Protection CA]:#validating-app-protection-ca
810810

811-
<!-- Other SDK Guide Markdown docs -->
811+
<!-- Other SDK Guide Markdown documentation -->
812812
[Stage 1: Planning the Integration]:app-sdk-android-phase1.md
813813
[Key Decisions for SDK integration]:app-sdk-android-phase1.md#key-decisions-for-sdk-integration
814814
[Stage 5: Multi-Identity]:app-sdk-android-phase5.md
@@ -820,7 +820,7 @@ Do continue to refer to this guide and the [Appendix] as you continue to develop
820820
[Appendix]:app-sdk-android-appendix.md
821821
[Quickly testing with changing policy]:app-sdk-android-appendix.md#quickly-testing-with-changing-policy
822822

823-
<!-- Microsoft docs -->
823+
<!-- Microsoft Learn documentation -->
824824
[App Protection CA]:/mem/intune/protect/app-based-conditional-access-intune
825825
[issuing a selective wipe]:/mem/intune/apps/apps-selective-wipe
826826
[Set up app-based Conditional Access policies with Intune]:/mem/intune/protect/app-based-conditional-access-intune-create

0 commit comments

Comments
 (0)