Skip to content

Commit

Permalink
Merge pull request #16634 from dougeby/ebycp
Browse files Browse the repository at this point in the history 
moved toc for copilot
  • Loading branch information
@dougeby
dougeby authored Nov 13, 2024
2 parents b6cc2dc + 5ee90fa commit d7b8d3d
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 74 deletions.
2 changes: 1 addition & 1 deletion memdocs/intune/fundamentals/deployment-guide-enrollment-ios-ipados.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ This list provides an overview of the tasks required of administrators.

- **Web based device enrollment**: Starting with iOS 15 and newer. This option is just like device enrollment with Company Portal, but enrollment takes place on the web version of Intune Company Portal, eliminating the need for the app. Additionally, this option enables employees and students without managed Apple IDs to enroll devices and access volume-purchased apps.

- **Determine based on user choice**: Gives end users a choice when they enroll. Depending on their selection, **User enrollment** or **Device enrollment** is used.
- **Determine based on user choice**: Gives end users a choice when they enroll. Depending on their selection, **Account driven user enrollment** or **Device enrollment** is used.

- **Account driven user enrollment**: Starting with iOS 13 and newer. This option configures a specific set of features and organization apps, like password, per-app VPN, Wi-Fi, and Siri. If you use this method, and to help secure apps and their data, then we recommend also using app protection policies.

Expand Down
14 changes: 2 additions & 12 deletions memdocs/intune/toc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,6 @@ items:
href: ./configuration/tutorial-walkthrough-administrative-templates.md
displayName: admx, administrative template, gpo, windows

- name: Microsoft Copilot + Intune
items:
- name: Copilot in Intune
href: ./copilot/copilot-intune-overview.md
- name: Troubleshoot a device using Copilot
href: ./copilot/copilot-devices.md
- name: FAQ
href: ./copilot/copilot-intune-faq.md
- name: Intune plugin in Security Copilot
href: ./copilot/security-copilot.md

- name: Plan
items:
- name: Planning guide
Expand Down Expand Up @@ -198,8 +187,9 @@ items:
href: ./copilot/copilot-devices.md
- name: FAQ
href: ./copilot/copilot-intune-faq.md
- name: Intune plugin in Copilot for Security
- name: Intune plugin in Security Copilot
href: ./copilot/security-copilot.md

- name: Endpoint analytics
items:
- name: Overview
Expand Down
98 changes: 37 additions & 61 deletions memdocs/intune/user-help/enroll-android-device-entrust-datacard.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ms.collection:

Enroll your device with the Microsoft Intune app to gain secure, mobile access to your work or school mail, files, and apps. After your device is enrolled, it becomes *managed*, meaning your organization can assign policies and apps to the device through a mobile device management (MDM) provider, such as Microsoft Intune.

During enrollment, you'll also install a derived credential on your device. Your organization might require you to use the derived credential as an authentication method when accessing resources, or for signing and encrypting emails.
During enrollment, you also install a derived credential on your device. Your organization might require you to use the derived credential as an authentication method when accessing resources, or for signing and encrypting emails.

You likely need to set up a derived credential if you use a smart card to:

Expand All @@ -48,7 +48,7 @@ In this article, you will:

## What are derived credentials?

A derived credential is a certificate that's derived from your smart card credentials and installed on your device. It grants you remote access to work resources, while preventing unauthorized users from accessing sensitive information.
A derived credential is a certificate derived from your smart card credentials and installed on your device. It grants you remote access to work resources, while preventing unauthorized users from accessing sensitive information.

Derived credentials are used to:

Expand All @@ -69,107 +69,83 @@ Derived credentials are an implementation of the National Institute of Standards
## Enroll device

1. Turn on your new or factory-reset device.
2. On the **Welcome** screen, select your language. If you've been instructed to enroll with a QR code or NFC, follow the step below that matches the method.
2. On the **Welcome** screen, select your language. If your organizations instructed you to enroll with a QR code or near-field communication (NFC), follow the step that matches the method.
* NFC: Tap your NFC-supported device against a programmer device to connect to your organization's network. Follow the onscreen prompts. When you reach the screen for Chrome's Terms of Service, continue to step 5.

* QR code: Complete the steps in [QR code enrollment](#qr-code-enrollment).

If you've been instructed to use another method, continue to step 3.
If your organization instructed you to use another method, continue to step 3.

3. Connect to Wi-Fi and tap **NEXT**. Follow the step that matches your enrollment method.

* Token: When you get to the Google sign-in screen, complete the steps in [Token enrollment](#token-enrollment).
* Google Zero Touch: After you connect to Wi-Fi, your device will be recognized by your organization. Continue to step 4 and follow the onscreen prompts until setup is complete.

![Example image of Google terms screen that you see if you're using Google Zero Touch, highlighting Accept & Continue button.](./media/enroll-android-device-disa-purebred/google-zero-touch-intune-app-01.png)

* Google Zero Touch: After you connect to Wi-Fi, your organization can recognize your device. Continue to step 4 and follow the onscreen prompts until setup is complete.

4. Review Google's terms. Then tap **ACCEPT & CONTINUE**.

![Example image of Google terms screen, highlighting Accept & Continue button.](./media/enroll-android-device-disa-purebred/fully-managed-intune-app-04.png)

5. Review Chrome's Terms of Service. Then tap **ACCEPT & CONTINUE**.

![Example image of Chrome Terms of Service screen, highlighting Accept & Continue button.](./media/enroll-android-device-disa-purebred/fully-managed-intune-app-06.png)

6. On the sign-in screen, tap **Sign-in options** and then **Sign in from another device**.

7. Write down the onscreen code.

8. Switch to your smart card-enabled device and go to the web address that's shown on your screen.

9. Enter the code you previously wrote down.
8. Switch to your smart card-enabled device and go to the web address shown on your screen.

> [!div class="mx-imgBorder"]
> ![Screenshot of the Company Portal website "Enter code" prompt.](./media/enroll-android-device-disa-purebred/enter-code-intercede.png)
9. Enter the code you previously wrote down.

10. Insert your smart card to sign in.

11. On the sign-in screen, select your work or school account. Then switch back to your mobile device.

12. Depending on your organization's requirements, you might be prompted to update settings, such as screen lock or encryption. If you see these prompts, tap **SET** and follow the onscreen instructions.

![Example image of Set up your work phone screen, highlighting Set button.](./media/enroll-android-device-disa-purebred/fully-managed-intune-app-10.png)

13. To install work apps on your device, tap **INSTALL**. After installation is complete, tap **NEXT**.
12. Depending on your organization's requirements, you might be prompted to update settings, such as screen lock or encryption. If you see these prompts, tap **SET** and follow the onscreen instructions.

![Example image of Set up your work phone screen, highlighting Install button.](./media/enroll-android-device-disa-purebred/fully-managed-intune-app-11.png)
13. To install work apps on your device, tap **INSTALL**. After installation is complete, tap **NEXT**.

14. Tap **START** to open the Microsoft Intune app.

![Example image of Set up your work phone screen, highlighting Start button.](./media/enroll-android-device-disa-purebred/fully-managed-intune-app-17.png)

15. Return to the Intune app on your mobile device and follow the onscreen instructions until enrollment is done.

![Example image of Set up access, register your device screen, highlighting Done button.](./media/enroll-android-device-disa-purebred/fully-managed-intune-app-19.png)
15. Return to the Intune app on your mobile device and follow the onscreen instructions until enrollment is done.

16. Continue to the [set up your smart card](enroll-android-device-entrust-datacard.md#set-up-smart-card) section in this article to finish setting up your device.

### QR code enrollment
In this section, you'll scan your company-provided QR code. When you're done, we'll redirect you back to the device enrollment steps.
In this section, you scan your company-provided QR code. When you're done, we'll redirect you back to the device enrollment steps.

1. On the **Welcome** screen, tap the screen five times to start QR code setup.

![Example image of device setup Welcome screen, highlighting instructions to tap screen.](./media/enroll-android-device-disa-purebred/qr-code-intune-app-01.png)

2. Follow any onscreen instructions to connect to Wi-Fi.
3. If your device doesn't have a QR code scanner, the setup screens will show the progress as a scanner is installed. Wait for installation to complete.
3. If your device doesn't have a QR code scanner, a scanner automatically installs. Wait for installation to complete.
4. When prompted, scan the enrollment profile QR code that your organization gave you.
5. Return to [Enroll device](#enroll-device), step 4 to continue setup.
5. Return to [Step 4: Enroll device](#enroll-device) to continue setup.

### Token enrollment
In this section, you'll enter your company-provided token. When you're done, we'll redirect you back to the device enrollment steps.

1. On the Google sign-in screen, in the **Email or phone** box, type **afw#setup**. Then tap **Next**.

![Example image of Google sign-in screen, showing that "afw#setup" is typed into field.](./media/enroll-android-device-disa-purebred/token-intune-app-01.png)
In this section, you enter your company-provided token. When you're done, we'll redirect you back to the device enrollment steps.

2. Choose **Install** for the **Android Device Policy** app. Continue through the installation. Depending on your device, you might need to review and accept additional terms.
1. On the Google sign-in screen, in the **Email or phone** box, type **afw#setup**. Then tap **Next**.

3. On the **Enroll this device** screen, select **Next**.
2. Choose **Install** for the **Android Device Policy** app. Continue through the installation. Depending on your device, you might need to review and accept other terms.

4. Select **Enter code**.
3. On the **Enroll this device** screen, tap **Next**.

5. On the **Scan or enter code** screen, type in the code that your organization gave you. Then click **Next**.
4. Tap **Enter code**.

![Example image of Scan or enter code screen, highlighting Next button.](./media/enroll-android-device-disa-purebred/token-intune-app-04.png)
5. On the **Scan or enter code** screen, enter the code that your organization gave you. Then tap **Next**.

6. Return to [Enroll device](#enroll-device), step 4 to continue setup.
6. Return to [Step 4: Enroll device](#enroll-device) to continue setup.

## Set up smart card

1. After enrollment is complete, the Intune app will notify you to set up your smart card. Tap the notification. If you don't get a notification, check your email.
1. After enrollment is complete, the Intune app prompts you to set up your smart card via notification. Tap the notification. If you don't get a notification, check your email.

> [!div class="mx-imgBorder"]
> ![Example screenshot of the Company Portal push notification on device home screen.](./media/enroll-android-device-disa-purebred/action-required-in-app-android.png)
> ![Screenshot of the Intune app push notification on device home screen.](./media/enroll-android-device-disa-purebred/action-required-in-app-android.png)
2. On the **Set up smart card** screen:

1. Tap the link to your organization's setup instructions. If your organization doesn't provide additional instructions, you'll be sent to this article.
1. Tap the link to your organization's instructions. If your organization doesn't provide more instruction, you are sent to this article.

2. Tap **BEGIN**.

> [!div class="mx-imgBorder"]
> ![Example screenshot of the Company Portal Set up mobile smart card access screen.](./media/enroll-android-device-entrust-datacard/smart-card-open-entrust-android.png)
> ![Screenshot of the Intune app Set up mobile smart card access screen.](./media/enroll-android-device-entrust-datacard/smart-card-open-entrust-android.png)
3. Switch to your smart card-enabled device and open IdentityGuard.

Expand All @@ -179,46 +155,46 @@ In this section, you'll enter your company-provided token. When you're done, we'

6. Enter your smart card PIN.

7. You'll be asked to choose from a list of actions. Select the one that lets you enroll for a derived mobile smart credential. The link or button might say **I'd like to enroll for a derived mobile smart card credential.**
7. Choose from the list of actions. Select the one that lets you enroll for a derived mobile smart credential. The link or button might say **I'd like to enroll for a derived mobile smart card credential.**

8. Select that you've successfully downloaded and installed the smart credential-enabled application. Then continue to the next screen.
8. Select the option that says you successfully downloaded and installed the smart credential-enabled application. Then continue to the next screen.

9. Enter information about your derived smart card credential:

1. For the identity name, enter any name, such as *Entrust Derived Cred*.
2. In the dropdown menu, select **Entrust IdentityGuard Mobile Smart Credential**.

3. Continue to the next screen. You'll see a QR code with a numerical password under it.
3. Continue to the next screen. The screen shows a QR code with a numerical password under it.

10. Return to your Android device. On the Intune app > **Get QR code** screen, tap **NEXT**.

> [!div class="mx-imgBorder"]
> ![Example screenshot of the Company Portal Get QR code screen.](./media/enroll-android-device-entrust-datacard/get-qr-code-entrust-android.png)
> ![Screenshot of the Intune app Get QR code screen.](./media/enroll-android-device-entrust-datacard/get-qr-code-entrust-android.png)
11. If you're prompted to allow the Intune app to use your camera, tap **Allow**.

12. Scan the image of the QR code that's on your smart card-enabled device.
12. Scan the image of the QR code shown on your smart card-enabled device.

13. On the **Password required** screen, enter the password that appears under the QR code.

> [!div class="mx-imgBorder"]
> ![Example screenshot of the Company Portal "Password required" screen.](./media/enroll-android-device-entrust-datacard/password-required-entrust-android.png)
> ![Screenshot of the Intune app Password required screen.](./media/enroll-android-device-entrust-datacard/password-required-entrust-android.png)
14. The Intune app will start downloading and installing the certificates needed to access work or school resources. Depending on your internet connection, this process might take some time. Don't close the app during this time.
14. The Intune app starts downloading and installing the certificates needed to access work or school resources. Depending on your internet connection, this process could take some time. Don't close the app during this time.

> [!div class="mx-imgBorder"]
> ![Example screenshot of the Company Portal "Downloading and installing certificates" screen](./media/enroll-android-device-entrust-datacard/install-certificates-entrust-android.png)
> ![Screenshot of the Intune app Downloading and installing certificates screen.](./media/enroll-android-device-entrust-datacard/install-certificates-entrust-android.png)
15. Once all of the certificates are processed, wait for the Intune app to finish setting up your device. You'll know setup is complete when you see the **You're all set!** screen.
15. Once all of the certificates are processed, wait for the Intune app to finish setting up your device. Setup is complete when you see the **You're all set!** screen.

> [!div class="mx-imgBorder"]
> ![Example screenshot of the "You're all set" screen](./media/enroll-android-device-disa-purebred/all-set-android.png)
> ![Screenshot of the Intune app You're all set screen.](./media/enroll-android-device-disa-purebred/all-set-android.png)
## Next steps

After enrollment is complete, you'll have access to work resources, such as email, Wi-Fi, and any apps that your organization makes available. For more information about how to get, search for, install, and uninstall apps in the Intune app see:
After enrollment is complete, you have access to work resources, such as email, Wi-Fi, and any apps that your organization makes available. For more information about how to get, search for, install, and uninstall apps in the Intune app see:

* [Use managed apps on your device](use-managed-apps-on-your-device-android.md)
* [Manage apps from the Company Portal website](manage-apps-cpweb.md)

Still need help? Contact your company support. For contact information, check the [Company Portal website](https://go.microsoft.com/fwlink/?linkid=2010980).
Still need help? Contact your company support. For contact information, check the [ website](https://go.microsoft.com/fwlink/?linkid=2010980).

0 comments on commit d7b8d3d

Please sign in to comment.