You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/active-directory-domain-services/active-directory-ds-getting-started.md
+7-5Lines changed: 7 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -13,7 +13,7 @@ ms.workload: identity
13
13
ms.tgt_pltfrm: na
14
14
ms.devlang: na
15
15
ms.topic: article
16
-
ms.date: 07/15/2017
16
+
ms.date: 08/28/2017
17
17
ms.author: maheshu
18
18
19
19
---
@@ -60,13 +60,15 @@ In the **Basics** page of the wizard, you can specify the DNS domain name for th
60
60
61
61
* You have an existing cloud service with that name on the virtual network.
62
62
63
-
3.Select the Azure **Subscription** in which you would like to create the managed domain.
63
+
3.Choose the **type of virtual network**. By default, the **Resource Manager** virtual network type is selected. We recommend using this type of virtual network for all newly created managed domains.
64
64
65
-
4. Select the **Resource group**to which the managed domain should belong. You can choose either the **Create new** or **Use existing** options to select the resource group.
65
+
4. Select the Azure **Subscription**in which you would like to create the managed domain.
66
66
67
-
5.Choose the Azure **Location**in which the managed domain should be created. On the **Network**page of the wizard, you see only virtual networks that belong to the location you have selected.
67
+
5.Select the **Resource group**to which the managed domain should belong. You can choose either the **Create new**or **Use existing** options to select the resource group.
68
68
69
-
6. When you are done, click **OK** to move on to the **Network** page of the wizard.
69
+
6. Choose the Azure **Location** in which the managed domain should be created. On the **Network** page of the wizard, you see only virtual networks that belong to the location you have selected.
70
+
71
+
7. When you are done, click **OK** to move on to the **Network** page of the wizard.
Copy file name to clipboardExpand all lines: articles/active-directory/active-directory-how-subscriptions-associated-directory.md
+8-12Lines changed: 8 additions & 12 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -21,18 +21,16 @@ ms.custom: oldportal;it-pro;
21
21
22
22
---
23
23
# How Azure subscriptions are associated with Azure Active Directory
24
-
This article covers information about the relationship between an Azure subscription and Azure Active Directory (Azure AD).
24
+
This article covers information about the relationship between an Azure subscription and Azure Active Directory (Azure AD), and how to add an existing subscription to your Azure AD directory.
25
25
26
26
## Your Azure subscription's relationship to Azure AD
27
27
Your Azure subscription has a trust relationship with Azure AD, which means that it trusts the directory to authenticate users, services, and devices. Multiple subscriptions can trust the same directory, but each subscription trusts only one directory.
28
28
29
-
The trust relationship that a subscription has with a directory is unlike the relationship that it has with other resources in Azure (websites, databases, and so on). If a subscription expires, then access to the other resources associated with the subscription also stops. But the directory remains in Azure, and you can associate a different subscription with that directory and continue to manage the directory users.
29
+
The trust relationship that a subscription has with a directory is unlike the relationship that it has with other resources in Azure (websites, databases, and so on). If a subscription expires, access to the other resources associated with the subscription also stops. But an Azure AD directory remains in Azure, and you can associate a different subscription with that directory and manage the directory using the new subscription.
30
30
31
31
32
32
33
-
Azure AD doesn’t work like the other services in your Azure subscription. Other Azure services are subordinate to the Azure subscription. But what you see in Azure AD does not vary based on subscription. It allows access to directories based on the signed-in user.
34
-
35
-
All users have a single home directory that authenticates them, but they can also be guests in other directories. In Azure AD, you can see only the directories of which your user account is a member. A directory can also be synchronized with on-premises Active Directory.
33
+
All users have a single home directory that authenticates them, but they can also be guests in other directories. In Azure AD, you can see the directories of which your user account is a member or guest.
36
34
37
35
## Azure AD and cloud service subscriptions
38
36
Azure AD provides the core directory and identity management capabilities behind most of Microsoft’s cloud services, including:
@@ -42,19 +40,17 @@ Azure AD provides the core directory and identity management capabilities behind
42
40
* Microsoft Dynamics CRM Online
43
41
* Microsoft Intune
44
42
45
-
You get the Azure AD service free when you sign up for any of these Microsoft cloud services. If you want to add an additional Azure subscription to an Azure AD directory, you can do this only if you are signed in with a Microsoft account. For example, if you sign up for Azure using a Microsoft account and also sign up for a different Microsoft cloud service using a work or school account, you have two instances of Azure AD:
46
-
1. The default directory for your Azure subscription. You can add another Azure subscription to this directory or others you create if you are signed in with a Microsoft account because you can be authenticated by Azure.
47
-
2. The home directory for your work or school account. If you are signed in to Azure with a work or school account, you can't add an Azure subscription to an existing directory because your work or school account can't be authenticated directly by Azure.
43
+
You get the Azure AD service free when you sign up for any of these Microsoft cloud services. If you want to add an additional Azure subscription to an Azure AD directory, you must be signed in with a Microsoft account. If you sign in to Azure with a work or school account, you can't add an Azure subscription to an existing directory because your work or school account can't be authenticated directly by Azure.
48
44
49
45
## To add an existing subscription to your Azure AD directory
50
-
You need to sign in with an account that exists in both the current directory with which the subscription is associated as well as the directory you want to add it to.
46
+
You must sign in with an account that exists in both the current directory with which the subscription is associated and in the directory you want to add it to.
51
47
52
-
1. Sign in to the [Azure Account Center](https://account.windowsazure.com/Home/Index) with an account that is the Account Administrator of the subscription to transfer subscription ownership.
48
+
1. Sign in to the [Azure Account Center](https://account.windowsazure.com/Home/Index) with an account that is the Account Administrator of the subscription whose ownership you want to transfer.
53
49
2. Ensure that the user who you want to be the subscription owner is in the targeted directory.
54
50
3. Click **Transfer subscription**.
55
51
4. Specify the recipient. The recipient automatically gets an email with an acceptance link.
56
52
5. The recipient clicks the link and follows the instructions, including entering their payment information. When the recipient succeeds, the subscription is transferred.
57
-
6. The default directory of the subscription is changed to the directory that the user is in if the subscription ownership transfer is successful.
53
+
6. The default directory of the subscription is changed to the directory that the user is in.
58
54
59
55
60
56
## Suggestions to manage both a subscription and a directory
@@ -68,7 +64,7 @@ Azure subscription admins and Azure AD directory admins are two separate roles.
68
64
* Azure subscription admins can manage resources in Azure and can use Azure AD in the Azure portal (because the Azure portal itself is an Azure resource).
69
65
* Directory admins can manage properties only in the Azure AD directory.
70
66
71
-
A person can be in both roles but it isn’t required. A user can be assigned to the directory global administrator role but not be assigned as Service administrator or co-administrator of an Azure subscription. Without being an administrator of the subscription, the user can sign in to the Azure portal, but can't manage the directories for that subscription in the portal. This user can manage directories using other tools such as Azure AD PowerShell or the Office 365 Admin Center.
67
+
A person can be in both roles but it isn’t required. A directory global administrator might not be assigned as service administrator or co-administrator of an Azure subscription, or vice versa. Without being an administrator of the subscription, the user can sign in to the Azure portal, but can't manage the directories for that subscription in the portal. However, this user can manage directories using other tools such as Azure AD PowerShell or the Office 365 Admin Center.
72
68
73
69
## Next steps
74
70
* To learn more about how to change administrators for an Azure subscription, see [Transfer ownership of an Azure subscription to another account](../billing/billing-subscription-transfer.md)
Copy file name to clipboardExpand all lines: articles/app-service-web/app-service-linux-faq.md
+13-2Lines changed: 13 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -4,7 +4,7 @@ description: Azure App Service Web App on Linux FAQ.
4
4
keywords: azure app service, web app, faq, linux, oss
5
5
services: app-service
6
6
documentationCenter: ''
7
-
authors: ahmedelnably
7
+
author: ahmedelnably
8
8
manager: erikre
9
9
editor: ''
10
10
@@ -47,6 +47,10 @@ If you have a question, comment on the article and we'll answer it as soon as po
47
47
48
48
**A:** Yes, you can do that through the SCM site, check the following article for more information [SSH support for Web App on Linux](./app-service-linux-ssh-support.md)
49
49
50
+
**Q:** I want to create a Linux App Service plane through SDK or an ARM template, how can I achieve this?
51
+
52
+
**A:** You need to set the `reserved` field of the app service to `true`.
53
+
50
54
## Continuous integration/deployment
51
55
52
56
**Q:** My web app still uses an old Docker container image after I've updated the image on Docker Hub. Do you support continuous integration/deployment of custom containers?
@@ -77,6 +81,14 @@ If you have a question, comment on the article and we'll answer it as soon as po
77
81
78
82
**A:** We mount an SMB share to the `\home\` directory. This will override any content that's there.
79
83
84
+
**Q:** I'm using my own custom container. I don't want the platform to mount an SMB share to the `\home\`.
85
+
86
+
**A:** You can do that by setting the `WEBSITES_ENABLE_APP_SERVICE_STORAGE` app setting to `false`.
87
+
88
+
**Q:** My custom container takes a long time to start, and the platform restart the container before it finishes starting up.
89
+
90
+
**A:** You can configure the time the platform will wait before restarting your container. This can be done by setting the `WEBSITES_CONTAINER_START_TIME_LIMIT` app setting to the desired value in seconds. The default is 230 seconds, and the max is 600 seconds.
91
+
80
92
**Q:** What is the format for private registry server url?
81
93
82
94
**A:** You need to provide the full registry url including `http://` or `https://`.
@@ -123,7 +135,6 @@ If you have a question, comment on the article and we'll answer it as soon as po
123
135
124
136
## Next steps
125
137
*[What is Azure Web App on Linux?](app-service-linux-intro.md)
126
-
*[Creating web apps in Azure Web App on Linux](app-service-linux-how-to-create-web-app.md)
127
138
*[SSH support for Azure Web App on Linux](./app-service-linux-ssh-support.md)
128
139
*[Set up staging environments in Azure App Service](./web-sites-staged-publishing.md)
129
140
*[Continuous Deployment with Azure Web App on Linux](./app-service-linux-ci-cd.md)
Copy file name to clipboardExpand all lines: articles/app-service-web/app-service-linux-intro.md
-1Lines changed: 0 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -109,7 +109,6 @@ You can access the SCM site from **Advanced Tools** in the **Development Tools**
109
109
## Next steps
110
110
See the following links to get started with App Service on Linux. You can post questions and concerns on [our forum](https://social.msdn.microsoft.com/forums/azure/home?forum=windowsazurewebsitespreview).
111
111
112
-
*[Creating Web Apps in Azure Web App on Linux](app-service-linux-how-to-create-web-app.md)
113
112
*[How to use a custom Docker image for Azure Web App on Linux](app-service-linux-using-custom-docker-image.md)
114
113
*[Using PM2 Configuration for Node.js in Azure Web App on Linux](app-service-linux-using-nodejs-pm2.md)
115
114
*[Using .NET Core in Azure App Service Web App on Linux](app-service-linux-using-dotnetcore.md)
0 commit comments