Skip to content

Commit b9786bd

Browse files
authored
Merge pull request #46918 from MicrosoftDocs/master
7/18 AM Publish
2 parents 7827d43 + a74b0ee commit b9786bd

File tree

168 files changed

+1628
-1300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+1628
-1300
lines changed

.openpublishing.redirection.json

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
},
192192
{
193193
"source_path": "articles/marketplace-consumer/mytemplates-getstarted.md",
194-
"redirect_url": "/azure/azure-resource-manager/resource-manager-create-first-template",
194+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
195195
"redirect_document_id": true
196196
},
197197
{
@@ -1786,7 +1786,7 @@
17861786
},
17871787
{
17881788
"source_path": "articles/resource-manager-template-walkthrough.md",
1789-
"redirect_url": "/azure/azure-resource-manager/resource-manager-create-first-template",
1789+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
17901790
"redirect_document_id": false
17911791
},
17921792
{
@@ -1806,7 +1806,7 @@
18061806
},
18071807
{
18081808
"source_path": "articles/resource-manager-vs-code.md",
1809-
"redirect_url": "/azure/azure-resource-manager/resource-manager-create-first-template",
1809+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
18101810
"redirect_document_id": false
18111811
},
18121812
{
@@ -6921,7 +6921,7 @@
69216921
},
69226922
{
69236923
"source_path": "articles/azure-resource-manager/resource-manager-template-walkthrough.md",
6924-
"redirect_url": "/azure/azure-resource-manager/resource-manager-create-first-template",
6924+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
69256925
"redirect_document_id": false
69266926
},
69276927
{
@@ -6956,14 +6956,24 @@
69566956
},
69576957
{
69586958
"source_path": "articles/azure-resource-manager/resource-manager-vs-code.md",
6959-
"redirect_url": "/azure/azure-resource-manager/resource-manager-create-first-template",
6959+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
69606960
"redirect_document_id": false
69616961
},
69626962
{
69636963
"source_path": "articles/azure-resource-manager/solution-dev-test-environments.md",
69646964
"redirect_url": "/azure/devtest-lab/devtest-lab-overview",
69656965
"redirect_document_id": false
69666966
},
6967+
{
6968+
"source_path": "articles/azure-resource-manager/resource-manager-create-first-template.md",
6969+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
6970+
"redirect_document_id": false
6971+
},
6972+
{
6973+
"source_path": "articles/azure-resource-manager/resource-manager-vscode-extension.md",
6974+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
6975+
"redirect_document_id": false
6976+
},
69676977
{
69686978
"source_path": "articles/billing/billing-buy-sign-up-azure-subscription.md",
69696979
"redirect_url": "https://azure.microsoft.com/pricing/",
@@ -17532,7 +17542,7 @@
1753217542
},
1753317543
{
1753417544
"source_path": "articles/azure-resource-manager/resource-manager-quickstart-deploy.md",
17535-
"redirect_url": "/azure/azure-resource-manager/resource-manager-create-first-template",
17545+
"redirect_url": "/azure/azure-resource-manager/resource-manager-quickstart-create-templates-use-the-portal",
1753617546
"redirect_document_id": false
1753717547
},
1753817548
{

articles/active-directory-domain-services/active-directory-ds-suspension.md

Lines changed: 25 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.devlang: na
1616
ms.topic: article
17-
ms.date: 07/16/2018
17+
ms.date: 07/18/2018
1818
ms.author: ergreenl
1919

2020
---
2121
# Suspended domains
22-
When Azure AD Domain Services is unable to service a managed domain for a long period of time, the managed domain is put into a suspended state. This article will explain why managed domains are suspended, the length of suspension, and how to remediate a suspended domain.
22+
When Azure AD Domain Services is unable to service a managed domain for a long period of time, the managed domain is put into a suspended state. This article explains why managed domains are suspended, and how to remediate a suspended domain.
2323

2424

2525
## States your managed domain can be in
2626

2727
![Suspended domain timeline](media\active-directory-domain-services-suspension\suspension-timeline.PNG)
2828

29-
The preceding graphic outlines how a domain is suspended, how long it will be suspended, and ultimately, the deletion of a managed domain. The following sections detail the reasons why a domain can be suspended and how to unsuspend a managed domain.
29+
The preceding graphic outlines the possible states an Azure AD Domain Services managed domain can be in.
3030

3131
### 'Running' state
3232
A managed domain that is configured correctly and operating regularly is in the **Running** state.
3333

3434
**What you can expect:**
35-
* Microsoft is able to regularly monitor the health of your managed domain.
35+
* Microsoft can regularly monitor the health of your managed domain.
3636
* Domain controllers for your managed domain are patched and updated regularly.
3737
* Changes from Azure Active Directory are regularly synchronized to your managed domain.
3838
* Regular backups are taken for your managed domain.
@@ -47,66 +47,59 @@ For more information, see [how to troubleshoot alerts on a managed domain](activ
4747

4848
**What you can expect:**
4949

50-
In some instances (for example, if you have an invalid network configuration), the domain controllers for your managed domain may be unreachable. Therefore, Microsoft cannot guarantee your managed domain is monitored, patched, updated or backed-up on a regular basis in this state.
50+
In some instances (for example, if you have an invalid network configuration), the domain controllers for your managed domain may be unreachable. Microsoft can't guarantee your managed domain is monitored, patched, updated, or backed-up on a regular basis in this state.
5151

52-
* Your managed domain is in an unhealthy state and ongoing health monitoring may be impacted, until the alert is resolved.
52+
* Your managed domain is in an unhealthy state and ongoing health monitoring may stop, until the alert is resolved.
5353
* Domain controllers for your managed domain may not be patched or updated.
5454
* Changes from Azure Active Directory may not be synchronized to your managed domain.
5555
* Backups for your managed domain may be taken, if possible.
5656
* If you resolve the alerts impacting your managed domain, it may be possible to restore your managed domain to the 'Running' state.
57-
* Critical alerts are triggered for configuration issues where Microsoft is unable to reach your domain controllers. If such alerts are not resolved within 15 days, your managed domain will be put in the 'Suspended' state.
57+
* Critical alerts are triggered for configuration issues where Microsoft is unable to reach your domain controllers. If such alerts aren't resolved within 15 days, your managed domain will be put in the 'Suspended' state.
5858

5959

6060
### 'Suspended' state
6161
A managed domain is put in the **Suspended** state for the following reasons:
62-
* One or more critical alerts have not been remediated in 15 days. This can be caused by a misconfiguration that blocks access to resources needed by Azure AD Domain Services.
62+
* One or more critical alerts haven't been resolved in 15 days. Critical alerts can be caused by a misconfiguration that blocks access to resources needed by Azure AD Domain Services.
6363
* For example, if the managed domain has alert [AADDS104: Network Error](active-directory-ds-troubleshoot-nsg.md) unresolved for over 15 days.
64-
* There is a billing issue with your Azure subscription or if the Azure subscription has expired.
64+
* There's a billing issue with your Azure subscription or your Azure subscription has expired.
6565

66-
Managed domains are suspended when Microsoft is unable to manage, monitor, patch or backup the domain on an ongoing basis.
66+
Managed domains are suspended when Microsoft is unable to manage, monitor, patch, or backup the domain on an ongoing basis.
6767

6868
**What you can expect:**
69-
* Domain controllers for your managed domain are de-provisioned and are not reachable within the virtual network.
69+
* Domain controllers for your managed domain are de-provisioned and aren't reachable within the virtual network.
7070
* Secure LDAP access to the managed domain over the internet (if enabled) stops working.
71-
* You will see failures in authenticating to the managed domain, logging on to domain joined virtual machines, connecting over LDAP/LDAPS etc.
71+
* You notice failures in authenticating to the managed domain, logging on to domain joined virtual machines, and connecting over LDAP/LDAPS.
7272
* Backups for your managed domain are no longer taken.
73-
* You need to resolve the alert causing your managed domain to be in the 'Suspended' state and then contact support.
74-
* Support may be able to restore your managed domain, only if there is an existing backup that is less than 30 days old.
73+
* Synchronization with Azure AD stops.
74+
* Resolve the alert causing your managed domain to be in the 'Suspended' state and then contact support.
75+
* Support may restore your managed domain, only if a backup that is less than 30 days old exists.
76+
77+
The managed domain will only stay in a suspended state for 15 days. To recover your managed domain, Microsoft recommends you resolve critical alerts immediately.
7578

7679

7780
### 'Deleted' state
7881
A managed domain that stays in the 'Suspended' state for 15 days is **Deleted**.
7982

8083
**What you can expect:**
8184
* All resources and backups for the managed domain are deleted.
82-
* You cannot restore the managed domain and will need to create a new managed domain to use Azure AD Domain Services.
83-
* You will not be billed for the managed domain.
84-
85-
86-
## What happens when a managed domain is suspended?
87-
When a domain is suspended, Azure AD Domain Services stops and de-provisions the domain controllers for your managed domain. As a result, backups are no longer taken, users are unable to sign-in to your domain, and synchronization with Azure AD stops.
85+
* You can't restore the managed domain and need to create a new managed domain to use Azure AD Domain Services.
86+
* Once deleted, you aren't billed for the managed domain.
8887

89-
The managed domain will only stay in a suspended state for a maximum of 15 days. In order to ensure a timely recovery, it is recommended you address the suspension as soon as possible.
9088

89+
## How do you know if your managed domain is suspended?
90+
You see an [alert](active-directory-ds-troubleshoot-alerts.md) on the Azure AD Domain Services Health page in the Azure portal that declares the domain suspended. The state of the domain also shows "Suspended".
9191

92-
## How do I know if my managed domain is suspended?
93-
You will see an [alert](active-directory-ds-troubleshoot-alerts.md) on the Azure AD Domain Services Health page in the Azure portal that declares the domain suspended. In addition, the state of the domain shows "Suspended".
9492

95-
96-
## How do I restore a suspended domain?
93+
## Restore a suspended domain
9794
To restore a domain in the 'Suspended' state, complete the following steps:
9895

9996
1. Navigate to the [Azure AD Domain Services page](https://portal.azure.com/#blade/HubsExtension/Resources/resourceType/Microsoft.AAD%2FdomainServices) on the Azure portal
100-
2. Click on the domain you wish to unsuspend
101-
3. On the left-hand navigation, click **Health**
97+
2. Click on the managed domain.
98+
3. On the left-hand navigation, click **Health**.
10299
4. Click on the alert. The alert ID will be either AADDS503 or AADDS504, depending on the cause of suspension.
103100
5. Click on the resolution link provided in the alert and follow the steps to resolve the alert.
104101

105-
Your domain can only be restored to the date of last backup. The date of your last backup is displayed on the Health page of your managed domain. Any changes that occurred after the last backup will not be restored. Backups for a managed domain are stored for up to 30 days. Backups older than 30 days are deleted.
106-
107-
108-
## Deleting domains
109-
If the domain is suspended for more than 15 days, Azure AD Domain Services deletes the managed domain due to inactivity and the inability to service the domain. You will no longer be billed for Azure AD Domain Services. At this point, you cannot restore your managed domain and need to recreate it.
102+
Your managed domain can only be restored to the date of last backup. The date of your last backup is displayed on the Health page of your managed domain. Any changes that occurred after the last backup won't be restored. Backups for a managed domain are stored for up to 30 days. Backups older than 30 days are deleted.
110103

111104

112105
## Next steps

articles/active-directory/connect/active-directory-aadconnectfed-single-adfs-multitenant-federation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Connect to Azure Active Directory that contains the domain fabrikam.com
6060
Connect-MsolService
6161
Convert the fabrikam.com managed domain to federated:
6262

63-
Convert-MsolDomainToFederated -DomainName anandmsft.com -Verbose -SupportMultipleDomain
63+
Convert-MsolDomainToFederated -DomainName fabrikam.com -Verbose -SupportMultipleDomain
6464

6565
The above operation will federate the domain fabrikam.com with the same AD FS. You can verify the domain settings by using Get-MsolDomainFederationSettings for both domains.
6666

articles/active-directory/fundamentals/whats-new.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,34 @@ Azure AD receives improvements on an ongoing basis. To stay up-to-date with the
3131

3232
This page is updated monthly, so revisit it regularly.
3333

34+
---
35+
3436
## July 2018
3537

38+
### New Azure AD email design and sender information - End of July
39+
40+
**Type:** Plan for change
41+
**Service category:** Other
42+
**Product capability:** Identity lifecycle management
43+
44+
At the **end of July 2018**, you'll notice that all Azure AD emails will have an updated design, sender email address, and sender display name when sent from the following services:
45+
46+
- Azure AD Identity Protection
47+
- Azure AD Connect Health
48+
- Azure AD Provisioning Service
49+
- Azure AD Enterprise Application Management
50+
- Azure AD Access Reviews
51+
- Azure AD Privileged Identity Management
52+
53+
Also at that time, email notifications will start to use the following address:
54+
55+
- Display name: Microsoft Azure
56+
- Email address: [email protected]
57+
58+
For an example of some of the new e-mail designs, see [Email notifications in Azure AD PIM](https://go.microsoft.com/fwlink/?linkid=2005832).
59+
60+
---
61+
3662
### View legacy authentications through Sign-ins activity logs
3763

3864
**Type:** New feature

articles/active-directory/manage-apps/tenant-restrictions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Tenant Restrictions is currently supported by Office 365 browser-based applicati
112112

113113
Outlook and Skype for Business clients that support modern authentication may still able to use legacy protocols against tenants where modern authentication is not enabled, effectively bypassing Tenant Restrictions. Applications that use legacy protocols may be blocked by Tenant Restrictions if they contact login.microsoftonline.com, login.microsoft.com, or login.windows.net during authentication.
114114

115-
For Outlook on Windows, customers may choose to implement restrictions preventing end users from adding non-approved mail accounts to their profiles. For example, see the [Prevent adding non-default Exchange accounts](http://gpsearch.azurewebsites.net/default.aspx?ref=1) group policy setting. For Outlook on non-Windows platforms, and for Skype for Business on all platforms, full support for Tenant Restrictions is not currently available.
115+
For Outlook on Windows, customers may choose to implement restrictions preventing end users from adding non-approved mail accounts to their profiles. For example, see the [Prevent adding non-default Exchange accounts](http://gpsearch.azurewebsites.net/default.aspx?ref=1) group policy setting.
116116

117117
## Testing
118118

0 commit comments

Comments
 (0)