Skip to content

Commit

Permalink
[BULK UPDATE] DocuTune - Rebranding
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbuckgit committed Sep 23, 2022
1 parent 058ce11 commit cc81deb
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 57 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ We **want and encourage contributions** from our community (users, customers, pa

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

**Option 1: Edit directly from Microsoft Docs**
**Option 1: Edit directly from Microsoft Learn**

1. Browse to the [InTune](/mem/intune) article you want to edit.
2. Select **Edit** (top right). This shows the markdown file in the GitHub repository.
Expand Down
12 changes: 6 additions & 6 deletions memdocs/configmgr/core/misc/mms2019docathon.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ ms.localizationpriority: null

# MMS 2019 Docathon

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.
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.

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:
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:

- Typos
- Clarifications
Expand All @@ -43,7 +43,7 @@ Create a [GitHub account](https://github.com/join)
> [!NOTE]
> 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.
- Contributions to Microsoft Docs count toward MVP award consideration.
- Contributions to Microsoft Learn count toward MVP award consideration.

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

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

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

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

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

- [Contributor Guide](/contribute)

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

## Official rules

Expand Down
6 changes: 3 additions & 3 deletions memdocs/intune/developer/app-sdk-android-phase1.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 2: The
[Telemetry]:#telemetry
[Exit Criteria]:#exit-criteria

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

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

<!-- Microsoft docs: Intune testing -->
<!-- Microsoft Learn documentation: Intune testing -->
[Microsoft partner]:https://partner.microsoft.com/business-opportunities/why-microsoft
[Microsoft CDX tenant creation site]:https://cdx.transform.microsoft.com/my-tenants/create-tenant
[Set up Intune]:/mem/intune/fundamentals/setup-steps
Expand Down
15 changes: 7 additions & 8 deletions memdocs/intune/developer/app-sdk-android-phase2.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,17 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 3: Gett
[Intune-specific MSAL configuration]:#intune-specific-msal-configuration
[Exit Criteria]:#exit-criteria

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

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

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

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

<!-- Microsoft docs: ADAL to MSAL -->
<!-- Microsoft Learn documentation: ADAL to MSAL -->
[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
[Migrate Android ADAL to MSAL]:/azure/active-directory/develop/migrate-android-adal-msal
[Differences between ADAL and MSAL]:/azure/active-directory/develop/msal-overview#differences-between-adal-and-msal

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


<!-- Microsoft docs -->
<!-- Microsoft Learn documentation -->
[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

<!-- Other Microsoft links -->
Expand Down
4 changes: 2 additions & 2 deletions memdocs/intune/developer/app-sdk-android-phase3.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ After you've completed all the [Exit Criteria] above, continue to [Stage 4: MAM
[Reporting]:#reporting
[Verification]:#verification

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

<!-- Microsoft docs -->
<!-- Microsoft Learn documentation -->
[Download the SDK files]:/mem/intune/developer/app-sdk-get-started#download-the-sdk-files
[Microsoft Authentication Library (MSAL)]:/azure/active-directory/develop/msal-overview#languages-and-frameworks
[MSAL documentation]:https://github.com/AzureAD/microsoft-authentication-library-for-android
Expand Down
6 changes: 2 additions & 4 deletions memdocs/intune/developer/app-sdk-android-phase4.md
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@ After you've completed all the [Exit Criteria] above, your app is now successful
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.
If you're unsure if any of these sections apply to your app, revisit [Key Decisions for SDK integration].


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


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

<!-- Microsoft docs -->
<!-- Microsoft Learn documentation -->
[Microsoft Privacy Policy]:https://go.microsoft.com/fwlink/?Linkid=857875
[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
[How to validate your app protection policy setup in Microsoft Intune]:/mem/intune/apps/app-protection-policies-validate
Expand Down
32 changes: 16 additions & 16 deletions memdocs/intune/developer/app-sdk-android-phase6.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,32 +52,32 @@ Application configurations, also referred to as managed configurations or applic
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.
Application configuration is an entirely optional, but powerful, tool to enhance your app's management experience.

See [App configuration policies for Microsoft Intune] for more detail.
See [App configuration policies for Microsoft Intune][] for more detail.

### Android's Built-In App Configurations

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

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

### Intune App SDK App Configurations

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

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

## What configurations should I add to my app?

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

## Retrieving app configuration from the SDK

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

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

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

## Resolving conflicts

Expand All @@ -154,7 +154,7 @@ See [Register for notifications from the SDK] for more detail.
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.
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.

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

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

## Next Steps

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

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions memdocs/intune/developer/app-sdk-android-phase7.md
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ Do continue to refer to this guide and the [Appendix] as you continue to develop
[Exit Criteria]:#exit-criteria
[Validating App Protection CA]:#validating-app-protection-ca

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

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

0 comments on commit cc81deb

Please sign in to comment.