diff --git a/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md b/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md index 30de0a2c97..a285c99103 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md +++ b/browsers/internet-explorer/ie11-deploy-guide/img-ie11-docmode-lg.md @@ -16,7 +16,7 @@ ms.author: dansimp Return to: [Deprecated document modes and Internet Explorer 11](deprecated-document-modes.md)
-

+

Full-sized flowchart detailing how document modes are chosen in IE11

diff --git a/education/trial-in-a-box/educator-tib-get-started.md b/education/trial-in-a-box/educator-tib-get-started.md index bbf1be6015..92cf989109 100644 --- a/education/trial-in-a-box/educator-tib-get-started.md +++ b/education/trial-in-a-box/educator-tib-get-started.md @@ -20,7 +20,7 @@ manager: dansimp ![Welcome, Educators!](images/Welocme-Educators.png) -This guide shows you how to quickly and easily try a few transformational tools from Microsoft Education in 5 quick steps. +This guide shows you how to quickly and easily try a few transformational tools from Microsoft Education in 5 quick steps. | Tool | Description | | :---: |:--- | diff --git a/education/trial-in-a-box/index.md b/education/trial-in-a-box/index.md index 5f1c865bce..2ea43581c9 100644 --- a/education/trial-in-a-box/index.md +++ b/education/trial-in-a-box/index.md @@ -30,7 +30,7 @@ Welcome to Microsoft Education Trial in a Box. We built this trial to make it ea | [![Get started for Educators.](images/teacher_rotated_resized.png)](educator-tib-get-started.md) | [![Get started for IT Admins](images/itadmin_rotated_resized.png)](itadmin-tib-get-started.md) | | :---: | :---: | -| **Educator**
Enhance students of all abilities by unleashing their creativity, collaboration, and improving problem-solving skills.
[Get started](educator-tib-get-started.md) | **IT Admin**
Quickly implement and deploy a full cloud infrastructure that's secure and easy to manage.
[Get started](itadmin-tib-get-started.md) | +| **Educator**
Enhance students of all abilities by unleashing their creativity, collaboration, and improving problem-solving skills.
[Get started](educator-tib-get-started.md) | **IT Admin**
Quickly implement and deploy a full cloud infrastructure that's secure and easy to manage.
[Get started](itadmin-tib-get-started.md) | diff --git a/education/trial-in-a-box/itadmin-tib-get-started.md b/education/trial-in-a-box/itadmin-tib-get-started.md index d0ba6a05b3..911f893986 100644 --- a/education/trial-in-a-box/itadmin-tib-get-started.md +++ b/education/trial-in-a-box/itadmin-tib-get-started.md @@ -20,7 +20,7 @@ manager: dansimp ![Welcome, IT Admins!](images/Welcome-IT-Admins.png) -Learn how to quickly deploy and manage devices for your school in 5 quick steps. +Learn how to quickly deploy and manage devices for your school in 5 quick steps. |  |  | | :---: |:--- | diff --git a/education/windows/chromebook-migration-guide.md b/education/windows/chromebook-migration-guide.md index d927aef072..2fb2324ddc 100644 --- a/education/windows/chromebook-migration-guide.md +++ b/education/windows/chromebook-migration-guide.md @@ -497,7 +497,7 @@ Table 6 is a decision matrix that lists the device, user, and app management pro Table 6. Device, user, and app management products and technologies - +
diff --git a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md index 97f22aae88..a65935c948 100644 --- a/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md +++ b/windows/client-management/mdm/azure-active-directory-integration-with-mdm.md @@ -195,24 +195,24 @@ The following table shows the required information to create an entry in the Azu - - + + - - + + - - + + - - + + - - + +

Application ID

The client ID of your MDM app that is configured within your tenant. This is the unique identifier for your multi-tenant app.

Application ID

The client ID of your MDM app that is configured within your tenant. This is the unique identifier for your multi-tenant app.

Publisher

A string that identifies the publisher of the app.

Publisher

A string that identifies the publisher of the app.

Application URL

A URL to the landing page of your app where your administrators can get more information about the MDM app and contains a link to the landing page of your app. This URL is not used for the actual enrollment.

Application URL

A URL to the landing page of your app where your administrators can get more information about the MDM app and contains a link to the landing page of your app. This URL is not used for the actual enrollment.

Description

A brief description of your MDM app, which must be under 255 characters.

Description

A brief description of your MDM app, which must be under 255 characters.

Icons

A set of logo icons for the MDM app. Dimensions: 45 X 45, 150 X 122, 214 X 215

Icons

A set of logo icons for the MDM app. Dimensions: 45 X 45, 150 X 122, 214 X 215

@@ -261,19 +261,19 @@ An MDM page must adhere to a predefined theme depending on the scenario that is -FRX -OOBE -Dark theme + blue background color -Filename: Ui-dark.css -Filename: oobe-dekstop.css +FRX +OOBE +Dark theme + blue background color +Filename: Ui-dark.css +Filename: oobe-dekstop.css -MOSET -Settings/ +MOSET +Settings/

Post OOBE

-Light theme -Filename: Ui-light.css -Filename: settings-desktop.css +Light theme +Filename: Ui-light.css +Filename: settings-desktop.css @@ -302,20 +302,20 @@ The following parameters are passed in the query string: -

redirect_uri

-

After the user accepts or rejects the Terms of Use, the user is redirected to this URL.

+

redirect_uri

+

After the user accepts or rejects the Terms of Use, the user is redirected to this URL.

-

client-request-id

-

A GUID that is used to correlate logs for diagnostic and debugging purposes. You use this parameter to log or trace the state of the enrollment request to help find the root cause in case of failures.

+

client-request-id

+

A GUID that is used to correlate logs for diagnostic and debugging purposes. You use this parameter to log or trace the state of the enrollment request to help find the root cause in case of failures.

-

api-version

-

Specifies the version of the protocol requested by the client. This provides a mechanism to support version revisions of the protocol.

+

api-version

+

Specifies the version of the protocol requested by the client. This provides a mechanism to support version revisions of the protocol.

-

mode

-

Specifies that the device is corporate owned when mode=azureadjoin. This parameter is not present for BYOD devices.

+

mode

+

Specifies that the device is corporate owned when mode=azureadjoin. This parameter is not present for BYOD devices.

@@ -342,20 +342,20 @@ The following claims are expected in the access token passed by Windows to the T -

Object ID

-

Identifier of the user object corresponding to the authenticated user.

+

Object ID

+

Identifier of the user object corresponding to the authenticated user.

-

UPN

-

A claim containing the user principal name (UPN) of the authenticated user.

+

UPN

+

A claim containing the user principal name (UPN) of the authenticated user.

-

TID

-

A claim representing the tenant ID of the tenant. In the example above, it's Fabrikam.

+

TID

+

A claim representing the tenant ID of the tenant. In the example above, it's Fabrikam.

-

Resource

-

A sanitized URL representing the MDM application. Example, https://fabrikam.contosomdm.com.

+

Resource

+

A sanitized URL representing the MDM application. Example, https://fabrikam.contosomdm.com.

@@ -438,28 +438,28 @@ The following table shows the error codes. -

api-version

-

302

-

invalid_request

-

unsupported version

+

api-version

+

302

+

invalid_request

+

unsupported version

-

Tenant or user data are missing or other required prerequisites for device enrollment are not met

-

302

-

unauthorized_client

-

unauthorized user or tenant

+

Tenant or user data are missing or other required prerequisites for device enrollment are not met

+

302

+

unauthorized_client

+

unauthorized user or tenant

-

Azure AD token validation failed

-

302

-

unauthorized_client

-

unauthorized_client

+

Azure AD token validation failed

+

302

+

unauthorized_client

+

unauthorized_client

-

internal service error

-

302

-

server_error

-

internal service error

+

internal service error

+

302

+

server_error

+

internal service error

@@ -486,104 +486,104 @@ With Azure integrated MDM enrollment, there is no discovery phase and the discov -

MDM auto-discovery using email address to retrieve MDM discovery URL

-

Enrollment

-

Not applicable

+

MDM auto-discovery using email address to retrieve MDM discovery URL

+

Enrollment

+

Not applicable

Discovery URL provisioned in Azure

-

+

-

Uses MDM discovery URL

-

Enrollment

+

Uses MDM discovery URL

+

Enrollment

Enrollment renewal

ROBO

-

Enrollment

+

Enrollment

Enrollment renewal

ROBO

-

Enrollment

+

Enrollment

Enrollment renewal

ROBO

-

Is MDM enrollment required?

-

Yes

-

Yes

-

No

+

Is MDM enrollment required?

+

Yes

+

Yes

+

No

User can decline.

-

Authentication type

-

OnPremise

+

Authentication type

+

OnPremise

Federated

Certificate

-

Federated

-

Federated

+

Federated

+

Federated

-

EnrollmentPolicyServiceURL

-

Optional (all auth)

-

Optional (all auth)

+

EnrollmentPolicyServiceURL

+

Optional (all auth)

+

Optional (all auth)

-

Optional (all auth)

+

Optional (all auth)

-

EnrollmentServiceURL

-

Required (all auth)

-

Used (all auth)

-

Used (all auth)

+

EnrollmentServiceURL

+

Required (all auth)

+

Used (all auth)

+

Used (all auth)

-

EnrollmentServiceURL includes OS Version, OS Platform, and other attributes provided by MDM discovery URL

-

Highly recommended

-

Highly recommended

-

Highly recommended

+

EnrollmentServiceURL includes OS Version, OS Platform, and other attributes provided by MDM discovery URL

+

Highly recommended

+

Highly recommended

+

Highly recommended

-

AuthenticationServiceURL used

-

Used (Federated auth)

-

Skipped

-

Skipped

+

AuthenticationServiceURL used

+

Used (Federated auth)

+

Skipped

+

Skipped

-

BinarySecurityToken

-

Custom per MDM

-

Azure AD issued token

-

Azure AD issued token

+

BinarySecurityToken

+

Custom per MDM

+

Azure AD issued token

+

Azure AD issued token

-

EnrollmentType

-

Full

-

Device

-

Full

+

EnrollmentType

+

Full

+

Device

+

Full

-

Enrolled certificate type

-

User certificate

-

Device certificate

-

User certificate

+

Enrolled certificate type

+

User certificate

+

Device certificate

+

User certificate

-

Enrolled certificate store

-

My/User

-

My/System

-

My/User

+

Enrolled certificate store

+

My/User

+

My/System

+

My/User

-

CSR subject name

-

User Principal Name

-

Device ID

-

User Principal Name

+

CSR subject name

+

User Principal Name

+

Device ID

+

User Principal Name

-

EnrollmentData Terms of Use binary blob as AdditionalContext for EnrollmentServiceURL

-

Not supported

-

Supported

-

Supported

+

EnrollmentData Terms of Use binary blob as AdditionalContext for EnrollmentServiceURL

+

Not supported

+

Supported

+

Supported

-

CSPs accessible during enrollment

-

Windows 10 support:

+

CSPs accessible during enrollment

+

Windows 10 support: