Skip to content

Commit

Permalink
Merge branch 'master' into AdvancedEdiscovery
Browse files Browse the repository at this point in the history
  • Loading branch information
markjjo committed Aug 31, 2020
2 parents ef22c21 + f09298c commit 5015095
Show file tree
Hide file tree
Showing 154 changed files with 1,060 additions and 562 deletions.
2 changes: 1 addition & 1 deletion .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
{
"source_path": "microsoft-365/enterprise/using-microsoft-azure-active-directory-for-sharepoint-2013-authentication.md",
"redirect_url": "https://docs.microsoft.com/office365/enterprise/microsoft-azure-architectures-for-sharepoint-2013",
"redirect_url": "https://docs.microsoft.com/microsoft-365/enterprise/microsoft-azure-architectures-for-sharepoint-2013",
"redirect_document_id": false
},
{
Expand Down
6 changes: 5 additions & 1 deletion microsoft-365/admin/TOC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@
href: manage/set-password-expiration-policy.md
- name: Customize the app launcher
href: manage/customize-the-app-launcher.md
- name: Pin apps to users' app launcher
href: manage/pin-apps-to-app-launcher.md
- name: Upgrade users to the latest apps
href: setup/upgrade-users-to-latest-office-client.md
- name: Requirements for centralized deployment of add-ins
Expand All @@ -220,6 +222,8 @@
href: manage/manage-deployment-of-add-ins.md
- name: Manage add-ins in the admin center
href: manage/manage-addins-in-the-admin-center.md
- name: Manage Office Scripts settings
href: manage/manage-office-scripts-settings.md
- name: Centralized Deployment FAQ
href: manage/centralized-deployment-faq.md
- name: Find a partner or a re-seller
Expand Down Expand Up @@ -293,7 +297,7 @@
items:
- name: Validate settings on Android or iOS
href: ../business/validate-settings-on-android-or-ios.md
- name: Set device protection settings for Windows 10 PCs
- name: Edit or create device protection settings for Windows 10 PCs
href: ../business/protection-settings-for-windows-10-pcs.md
items:
- name: Validate settings on Windows 10 PCs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ To help you administer Microsoft 365, you can [assign](assign-admin-roles.md) us

Here are some of the key tasks users can do when they are assigned to the Exchange admin role:

- [Recover deleted items in a user mailbox - Admin Help](https://docs.microsoft.com/office365/enterprise/recover-deleted-items-in-a-mailbox)
- [Recover deleted items in a user mailbox - Admin Help](https://docs.microsoft.com/microsoft-365/enterprise/recover-deleted-items-in-a-mailbox)

- [Set up an archive and deletion policy for mailboxes in your organization](https://docs.microsoft.com/microsoft-365/compliance/set-up-an-archive-and-deletion-policy-for-mailboxes).

Expand Down
8 changes: 4 additions & 4 deletions microsoft-365/admin/add-users/add-users.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ You must be a Global, License, or a User admin to add users and assign licenses.

You can use any of the following methods to add multiple users at the same time:

- **Use a spreadsheet to add people in bulk.** See [Add several users at the same time](https://docs.microsoft.com/office365/enterprise/add-several-users-at-the-same-time).
- **Automate adding accounts and assigning licenses.** See [Create user accounts with Office 365 PowerShell](https://docs.microsoft.com/office365/enterprise/powershell/create-user-accounts-with-office-365-powershell). Choose this method if you're already familiar with using Windows PowerShell cmdlets.
- **Using ActiveDirectory?** [Set up directory synchronization for Office 365](https://docs.microsoft.com/office365/enterprise/set-up-directory-synchronization). Use the Azure AD Connect tool to replicate Active Directory user accounts (and other Active Directory objects) in Microsoft 365. The sync only adds the user accounts. You must assign licenses to the synced users before they can use email and other Office apps.
- **Use a spreadsheet to add people in bulk.** See [Add several users at the same time](https://docs.microsoft.com/microsoft-365/enterprise/add-several-users-at-the-same-time).
- **Automate adding accounts and assigning licenses.** See [Create user accounts with Microsoft 365 PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/create-user-accounts-with-microsoft-365-powershell). Choose this method if you're already familiar with using Windows PowerShell cmdlets.
- **Using ActiveDirectory?** [Set up directory synchronization for Microsoft 365](https://docs.microsoft.com/microsoft-365/enterprise/set-up-directory-synchronization). Use the Azure AD Connect tool to replicate Active Directory user accounts (and other Active Directory objects) in Microsoft 365. The sync only adds the user accounts. You must assign licenses to the synced users before they can use email and other Office apps.
- **Migrating from Exchange?** See [Ways to migrate multiple email accounts to Office 365](https://docs.microsoft.com/Exchange/mailbox-migration/mailbox-migration). When you migrate multiple mailboxes to Microsoft 365 by using either cutover, staged, or a hybrid Exchange method, you automatically add users as part of the migration. The migration only adds the user accounts. You must assign licenses to the users before they can use email and other Office apps. If you don't assign a license to a user, their mailbox is disabled after a grace period of 30 days. Learn how to [assign licenses to users](../manage/assign-licenses-to-users.md) in the Microsoft 365 admin center.

## Next steps
Expand All @@ -108,7 +108,7 @@ After you add a user, you get an email notification from Microsoft. The email co
## Related content

[Add a new employee to Microsoft 365](add-new-employee.md) (article)\
[Add several users at the same time to Microsoft 365](https://docs.microsoft.com/office365/enterprise/add-several-users-at-the-same-time) (article)\
[Add several users at the same time to Microsoft 365](https://docs.microsoft.com/microsoft-365/enterprise/add-several-users-at-the-same-time) (article)\
[Restore a user in Microsoft 365](restore-user.md) (article)\
[Assign licenses to users](../manage/assign-licenses-to-users.md) (article)\
[Delete a user from your organization](delete-a-user.md) (article)
2 changes: 1 addition & 1 deletion microsoft-365/admin/add-users/assign-admin-roles.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ You might not have the correct permissions to assign admin roles to other users.

[Administrator role permissions in Azure Active Directory](https://docs.microsoft.com/azure/active-directory/users-groups-roles/directory-assign-admin-roles#available-roles)

[Assign roles to user accounts with PowerShell](https://docs.microsoft.com/office365/enterprise/powershell/assign-roles-to-user-accounts-with-office-365-powershell)
[Assign roles to user accounts with PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/assign-roles-to-user-accounts-with-microsoft-365-powershell)

[Authorize or remove partner relationships](../misc/add-partner.md)
2 changes: 2 additions & 0 deletions microsoft-365/admin/add-users/azure-ad-roles-in-the-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ Here's a list of all the admin roles available in the Microsoft 365 admin center
|Groups admin |Creates groups and manages all groups settings across admin centers.|
|Guest inviter | Manages Azure Active Directory B2B guest user invitations. |
|Helpdesk admin | Resets passwords and re-authenticates for all non-admins and some admin roles, manages service requests, and monitors service health. |
|Insights admin | Manages all aspects of the Microsoft 365 Insights application, reads Azure Active Directory information, can monitor service health and create and manage service requests. |
|Insights business admin | Read reports and insights in the Microsoft 365 Insights application. |
|Intune admin | Full access to Intune, manages users and devices to associate policies, creates and manages groups. |
|Kaizala admin | Full access to all Kaizala management features and data, manages service requests. |
|License admin | Assigns and removes licenses from users and edits their usage location. |
Expand Down
2 changes: 1 addition & 1 deletion microsoft-365/admin/add-users/reset-passwords.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ These steps work for a business with tens of users. If you have hundreds or thou

Use PowerShell! Check out this post by Eyal Doron: [Managing passwords with PowerShell](https://go.microsoft.com/fwlink/?linkid=853696).

Here's a related article: [Set the passwords for multiple user accounts](https://docs.microsoft.com/office365/enterprise/powershell/manage-office-365-with-office-365-powershell).
Here's a related article: [Set the passwords for multiple user accounts](https://docs.microsoft.com/microsoft-365/enterprise/manage-microsoft-365-with-microsoft-365-powershell).

For overview information, see [PowerShell for Microsoft 365 administrators](https://support.microsoft.com/office/40fdcbd4-c34f-42ab-8678-8b3751137ef1).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Here are the features and settings you'll find in the left-hand navigation of th
|**Settings** <br/> |Manage global settings for apps like email, sites, and the Office suite. Change your password policy and expiration date. Add and update domain names like contoso.com. Change your organization profile and release preferences. And choose whether partners can access your admin center. <br/> |
|**Setup** <br/> |Manage existing domains, turn on and manage multi-factor authentication, manage admin access, migrate user mailboxes to Office 365, manage feature updates, and help users install their Office apps. |
|**Reports** <br/> |See at a glance how your organization is using Microsoft 365 with detailed reports on email use, Office activations, and more. Learn how to use the new [activity reports](../activity-reports/activity-reports.md). <br/> |
|**Health** <br/> |View the service health at a glance. You can also check out more details and the service health history. Check out [How to check service health](https://docs.microsoft.com/office365/enterprise/view-service-health). <br/> Use Message center to keep track of upcoming changes to features and services. We post announcements there with information that helps you plan for change and understand how it may affect users. Get more details in [Message center in Office 365](../manage/message-center.md). <br/> |
|**Health** <br/> |View the service health at a glance. You can also check out more details and the service health history. Check out [How to check service health](https://docs.microsoft.com/microsoft-365/enterprise/view-service-health). <br/> Use Message center to keep track of upcoming changes to features and services. We post announcements there with information that helps you plan for change and understand how it may affect users. Get more details in [Message center in Office 365](../manage/message-center.md). <br/> |
|**Admin centers** <br/> |Open separate admin centers for Exchange, Skype for Business, SharePoint, Yammer, and Azure AD. Each admin center includes all available settings for that service. <br/> For example, in the Exchange admin center, set up and manage email, calendars, distribution groups, and more. In the SharePoint admin center, create and manage site collections, site settings, and OneDrive for Business. In the Skype for Business admin center, set up instant messaging notifications, dial-in conferencing, and online presence. <br/> Learn more about the [Exchange admin center](https://go.microsoft.com/fwlink/p/?LinkID=271807) and [SharePoint Admin Center](https://docs.microsoft.com/sharepoint/sharepoint-online).<br/> **Note:** The admin centers available to you depend on your plan and region. |

## Common tasks in the admin center
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Office 365 Germany plan offerings are aligned with global offers as much as poss

The following services and features are available in some [Office 365 Germany subscription plans](https://go.microsoft.com/fwlink/p/?linkid=839016). Additionally, see the [Online Services Terms](http://microsoftvolumelicensing.com/DocumentSearch.aspx?Mode=3&amp;DocumentTypeId=46).

- Microsoft 365 Apps for enterprise, Office 2016, and Office 2013<sup>1</sup>. Note that Office 2013 requires [using Office 365 modern authentication with Office clients](https://docs.microsoft.com/office365/enterprise/modern-auth-for-office-2013-and-2016).
- Microsoft 365 Apps for enterprise, Office 2016, and Office 2013<sup>1</sup>. Note that Office 2013 requires [using Office 365 modern authentication with Office clients](https://docs.microsoft.com/microsoft-365/enterprise/modern-auth-for-office-2013-and-2016).

- Exchange Online

Expand Down Expand Up @@ -88,7 +88,7 @@ The following services and features are available in some [Office 365 Germany su
|-----|-----|
|Sign in portal <br/> |[https://portal.office.de](https://portal.office.de) <br/> |
|Subscriptions, billing, and technical support <br/> |Germany-based support available in German and English For details, see [Contact support for business products - Admin Help](../contact-support-for-business-products.md). <br/> |
|IP Addresses and URLs <br/> |See [Office 365 Germany endpoints](https://docs.microsoft.com/office365/enterprise/office-365-germany-endpoints). <br/> |
|IP Addresses and URLs <br/> |See [Office 365 Germany endpoints](https://docs.microsoft.com/microsoft-365/enterprise/microsoft-365-germany-endpoints). <br/> |
|Yammer <br/> |Not available. <br/> |
|Versions of Office older than Office 2013 or Microsoft 365 Apps for enterprise<sup>1</sup> <br/> |Not supported. <br/> |
|Office Lens <br/> |Not available. <br/> |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ms.date: 7/28/2020
> [!IMPORTANT]
> You must be an admin for a business subscription to use these support methods. If you're not a business admin, please use [this support page](https://support.microsoft.com/help/contactus).
Start by [checking the current health of your services](https://docs.microsoft.com/office365/enterprise/view-service-health). You can view detailed information about current and past issues on the <a href="https://go.microsoft.com/fwlink/p/?linkid=842900" target="_blank">Service health dashboard</a>. If you're experiencing an issue that isn't listed, you can get support in one of the following ways:
Start by [checking the current health of your services](https://docs.microsoft.com/microsoft-365/enterprise/view-service-health). You can view detailed information about current and past issues on the <a href="https://go.microsoft.com/fwlink/p/?linkid=842900" target="_blank">Service health dashboard</a>. If you're experiencing an issue that isn't listed, you can get support in one of the following ways:

## Online support

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,6 @@ By default, the person who created the group is the group owner. Often a group w

- [Manage guest access in Microsoft 365 groups](manage-guest-access-in-groups.md)

- [Manage Microsoft 365 groups with PowerShell](https://docs.microsoft.com/office365/enterprise/powershell/manage-office-365-groups-with-powershell): this article introduces you to key cmdlets and provides examples
- [Manage Microsoft 365 groups with PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/manage-microsoft-365-groups-with-powershell): this article introduces you to key cmdlets and provides examples

- [Microsoft 365 groups naming policy](groups-naming-policy.md)
2 changes: 1 addition & 1 deletion microsoft-365/admin/create-groups/manage-groups.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,4 +197,4 @@ This option is great if you want to have a company email address such as info@co

[Upgrade distribution lists to Microsoft 365 groups](../manage/upgrade-distribution-lists.md)

[Manage Microsoft 365 groups with PowerShell](https://docs.microsoft.com/office365/enterprise/powershell/manage-office-365-groups-with-powershell)
[Manage Microsoft 365 groups with PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/powershell/manage-office-365-groups-with-powershell)
4 changes: 2 additions & 2 deletions microsoft-365/admin/create-groups/office-365-groups.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ As an administrator, you can:

If you prefer a more automated way to manage the lifecycle of your Microsoft 365 groups, you can use expiration policies to expire groups at a specific time interval. The group's owners will get an email 30, 15 and 1 day before the group expiration that allows them to easily renew the group if it's still needed. See: [Microsoft 365 group Expiration Policy](office-365-groups-expiration-policy.md).

You can administer your groups from the Microsoft 365 admin center or [by using PowerShell](https://docs.microsoft.com/office365/enterprise/powershell/manage-office-365-groups-with-powershell).
You can administer your groups from the Microsoft 365 admin center or [by using PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/manage-microsoft-365-groups-with-powershel).

If you have a lot of users, such as in a large corporation or enterprise, you may have many users who create groups for various purposes. We highly recommend that you review [Plan for governance in Microsoft 365 groups](plan-for-groups-governance.md) for best practices.

Expand Down Expand Up @@ -115,6 +115,6 @@ Microsoft 365 groups work with Azure Active Directory (AAD). The groups features

[Upgrade distribution lists to Microsoft 365 Groups](../manage/upgrade-distribution-lists.md)

[Manage Microsoft 365 Groups with PowerShell](https://docs.microsoft.com/office365/enterprise/powershell/manage-office-365-groups-with-powershell)
[Manage Microsoft 365 Groups with PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/manage-microsoft-365-groups-with-powershell)

[SharePoint Online Limits](https://docs.microsoft.com/office365/servicedescriptions/sharepoint-online-service-description/sharepoint-online-limits)
2 changes: 1 addition & 1 deletion microsoft-365/admin/create-groups/restore-deleted-group.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Visit the [Microsoft Tech Community](https://techcommunity.microsoft.com/t5/Offi

## Related articles

[Manage Microsoft 365 Groups with PowerShell](https://docs.microsoft.com/office365/enterprise/powershell/manage-office-365-groups-with-powershell)
[Manage Microsoft 365 Groups with PowerShell](https://docs.microsoft.com/microsoft-365/enterprise/manage-microsoft-365-groups-with-powershell)

[Delete groups using the Remove-UnifiedGroup cmdlet](https://technet.microsoft.com/library/mt238270%28v=exchg.160%29.aspx)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ The additional CNAME records created in the following procedure enable Skype for
## Add a TXT record for SPF to help prevent email spam

> [!IMPORTANT]
> You cannot have more than one TXT record for SPF for a domain. If your domain has more than one SPF record, you'll get email errors, as well as delivery and spam classification issues. If you already have an SPF record for your domain, don't create a new one for Microsoft. Instead, add the required Microsoft values to the current record so that you have a *single* SPF record that includes both sets of values. Need examples? Check out these [External Domain Name System records for Microsoft](https://docs.microsoft.com/office365/enterprise/external-domain-name-system-records). To validate your SPF record, you can use one of these[SPF validation tools](../setup/domains-faq.md).
> You cannot have more than one TXT record for SPF for a domain. If your domain has more than one SPF record, you'll get email errors, as well as delivery and spam classification issues. If you already have an SPF record for your domain, don't create a new one for Microsoft. Instead, add the required Microsoft values to the current record so that you have a *single* SPF record that includes both sets of values. Need examples? Check out these [External Domain Name System records for Microsoft](https://docs.microsoft.com/microsoft-365/enterprise/external-domain-name-system-records). To validate your SPF record, you can use one of these[SPF validation tools](../setup/domains-faq.md).
Follow the steps below or [watch the video (start at 5:09)](https://docs.microsoft.com/microsoft-365/admin/dns/create-dns-records-at-1-1-internet).

Expand Down
Loading

0 comments on commit 5015095

Please sign in to comment.