Skip to content

Commit c7e723d

Browse files
authored
Merge pull request #92788 from MicrosoftDocs/master
10/22 AM Publish
2 parents 8074f48 + db299e2 commit c7e723d

File tree

32 files changed

+164
-200
lines changed

32 files changed

+164
-200
lines changed

articles/active-directory-domain-services/tutorial-create-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ On the **Summary** page of the wizard, review the configuration settings for the
115115

116116
![Domain Services status once successfully provisioned](./media/tutorial-create-instance/successfully-provisioned.png)
117117

118-
During the provisioning process, Azure AD DS creates two Enterprise Applications named *Domain Controller Services* and *AzureActiveDirectoryDomainControllerServices* in your directory. These Enterprise Applications are needed to service your managed domain. It's imperative that these applications are not deleted at any time.
118+
We provision Azure AD Domain Services on the Azure Active Directory tenant and the Azure AD Domain Services resource for the service is created within the associated Azure subscription. During the provisioning process, Azure AD DS creates two Enterprise Applications named *Domain Controller Services* and *AzureActiveDirectoryDomainControllerServices* in your Azure Active directory instance where you have enabled the Azure AD domain services. These Enterprise Applications are needed to service your managed domain. It's imperative that these applications are not deleted at any time.
119119

120120
## Update DNS settings for the Azure virtual network
121121

articles/active-directory/manage-apps/application-provisioning-config-how-to.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ ms.collection: M365-identity-device-management
2222

2323
# How to configure user provisioning to an Azure AD Gallery application
2424

25-
*User account provisioning* is the act of creating, updating, and/or disabling user account records in an application’s local user profile store. Most cloud and SaaS applications store the users role and permissions in their own local user profile store, and presence of such a user record in their local store is *required* for single sign-on and access to work.
25+
*User account provisioning* is the act of creating, updating, and/or disabling user account records in an application’s local user profile store. Most cloud and SaaS applications store the users role and permissions in the user's own local user profile store, and presence of such a user record in the user's local store is *required* for single sign-on and access to work.
2626

2727
In the Azure portal, the **Provisioning** tab in the left navigation pane for an Enterprise App displays what provisioning modes are supported for that app. This can be one of two values:
2828

2929
## Configuring an application for Manual Provisioning
3030

31-
*Manual* provisioning means that user accounts must be created manually using the methods provided by that app. This could mean logging into an administrative portal for that app and adding users using a web-based user interface. Or it could be uploading a spreadsheet with user account detail, using a mechanism provided by that application. Consult the documentation provided by the app, or contact the app developer to determine wat mechanisms are available.
31+
*Manual* provisioning means that user accounts must be created manually using methods provided by the app. This could mean logging into an administrative portal for that app and adding users using a web-based user interface. Or it could be uploading a spreadsheet with user account detail, using a mechanism provided by that application. Consult the documentation provided by the app, or contact the app developer to determine what mechanisms are available.
3232

33-
If Manual is the only mode shown for a given application, it means that no automatic Azure AD provisioning connector has been created for the app yet. Or it means the app does not support the pre-requisite user management API upon which to build an automated provisioning connector.
33+
If *Manual* is the only mode shown for a given application, it means that there is no automatic Azure AD provisioning connector for the app yet. Or it means the app does not support the pre-requisites for Microsoft's user management API, which is used to build an automated provisioning connector.
3434

3535
If you would like to request support for automatic provisioning for a given app, you can fill out a request using the [Azure Active Directory Application Requests](https://aka.ms/aadapprequest).
3636

@@ -40,16 +40,14 @@ If you would like to request support for automatic provisioning for a given app,
4040

4141
For more information on how to provision specific users and groups to an application, see [Managing user account provisioning for enterprise apps](https://docs.microsoft.com/azure/active-directory/active-directory-enterprise-apps-manage-provisioning).
4242

43-
The actual steps required to enable and configure automatic provisioning vary depending on the application.
43+
The actual steps required to enable and configure automatic provisioning varies depending on the application.
4444

45-
>[!NOTE]
46-
>You should start by finding the setup tutorial specific to setting up provisioning for your application, and following those steps to configure both the app and Azure AD to create the provisioning connection.
47-
>
48-
>
45+
> [!NOTE]
46+
> You should start by finding the setup tutorial specific to setting up provisioning for your application, and following those steps to configure both the app and Azure AD to create the provisioning connection.
4947
5048
App tutorials can be found at [List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list).
5149

52-
An important thing to consider when setting up provisioning be to review and configure the attribute mappings and workflows that define which user (or group) properties flow from Azure AD to the application. This includes setting the “matching property” that be used to uniquely identify and match users/groups between the two systems. For more information on this important process.
50+
An important thing to consider when setting up provisioning is to review and configure the attribute mappings and workflows that define which user (or group) properties flow from Azure AD to the application. This includes setting the “matching property” that is used to uniquely identify and match users/groups between the two systems. See the link in *Next Steps* for more information on attribute mappings.
5351

5452
## Next steps
5553
[Customizing User Provisioning Attribute Mappings for SaaS Applications in Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-saas-customizing-attribute-mappings)

articles/app-service/app-service-web-get-started-dotnet-framework.md

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ description: Learn how to run web apps in Azure App Service by deploying the def
44
services: app-service\web
55
documentationcenter: ''
66
author: cephalin
7-
manager: cfowler
8-
editor: ''
7+
manager: gwallace
98

109
ms.assetid: 04a1becf-7756-4d4e-92d8-d9471c263d23
1110
ms.service: app-service-web
1211
ms.workload: web
1312
ms.tgt_pltfrm: na
1413
ms.topic: quickstart
15-
ms.date: 08/30/2019
14+
ms.date: 10/21/2019
1615
ms.author: cephalin
1716
ms.custom: mvc, devcenter
1817
ms.custom: seodec18
@@ -41,27 +40,27 @@ Create an ASP.NET web app by following these steps:
4140

4241
1. Open Visual Studio and then select **Create a new project**.
4342

44-
1. In **Create a new project**, find and choose **ASP.NET Web Application (.NET Framework)** for C#, then select **Next**.
43+
2. In **Create a new project**, find and choose **ASP.NET Web Application (.NET Framework)**, then select **Next**.
4544

46-
1. In **Configure your new project**, name the application _myFirstAzureWebApp_, and then select **Create**.
45+
3. In **Configure your new project**, name the application _myFirstAzureWebApp_, and then select **Create**.
4746

4847
![Configure your web app project](./media/app-service-web-get-started-dotnet-framework/configure-web-app-project-framework.png)
4948

50-
1. You can deploy any type of ASP.NET web app to Azure. For this quickstart, choose the **MVC** template.
49+
4. You can deploy any type of ASP.NET web app to Azure. For this quickstart, choose the **MVC** template.
5150

52-
1. Make sure authentication is set to **No Authentication**. Select **Create**.
51+
5. Make sure authentication is set to **No Authentication**. Select **Create**.
5352

5453
![Create ASP.NET Web Application](./media/app-service-web-get-started-dotnet-framework/select-mvc-template-vs2019.png)
5554

56-
1. From the Visual Studio menu, select **Debug** > **Start Without Debugging** to run the web app locally.
55+
6. From the Visual Studio menu, select **Debug** > **Start Without Debugging** to run the web app locally.
5756

5857
![Run app locally](./media/app-service-web-get-started-dotnet-framework/local-web-app.png)
5958

6059
## Publish your web app <a name="launch-the-publish-wizard"></a>
6160

6261
1. In **Solution Explorer**, right-click the **myFirstAzureWebApp** project and select **Publish**.
6362

64-
1. Choose **App Service** and then select **Publish**.
63+
1. Choose **App Service** and then change **Create profile** to **Publish**.
6564

6665
![Publish from project overview page](./media/app-service-web-get-started-dotnet-framework/publish-app-framework-vs2019.png)
6766

@@ -96,9 +95,9 @@ Create an ASP.NET web app by following these steps:
9695

9796
1. In **Name**, enter a unique app name that includes only the valid characters are `a-z`, `A-Z`, `0-9`, and `-`. You can accept the automatically generated unique name. The URL of the web app is `http://<app_name>.azurewebsites.net`, where `<app_name>` is your app name.
9897

99-
![Configure app name](./media/app-service-web-get-started-dotnet-framework/web-app-name-framework-vs2019.png)
98+
2. Select **Create** to start creating the Azure resources.
10099

101-
1. Select **Create** to start creating the Azure resources.
100+
![Configure app name](./media/app-service-web-get-started-dotnet-framework/web-app-name-framework-vs2019.png)
102101

103102
Once the wizard completes, it publishes the ASP.NET web app to Azure, and then launches the app in the default browser.
104103

@@ -121,11 +120,7 @@ The app name specified in the **App Service Create new** page is used as the URL
121120
</div>
122121
```
123122

124-
1. To redeploy to Azure, right-click the **myFirstAzureWebApp** project in **Solution Explorer** and select **Publish**.
125-
126-
1. In the **Publish** summary page, select **Publish**.
127-
128-
![Visual Studio summary page for publishing](./media/app-service-web-get-started-dotnet-framework/publish-summary-page-framework-vs2019.png)
123+
1. To redeploy to Azure, right-click the **myFirstAzureWebApp** project in **Solution Explorer** and select **Publish**. Then, select **Publish**.
129124

130125
When publishing completes, Visual Studio launches a browser to the URL of the web app.
131126

@@ -135,7 +130,7 @@ When publishing completes, Visual Studio launches a browser to the URL of the we
135130

136131
1. Go to the <a href="https://portal.azure.com" target="_blank">Azure portal</a> to manage the web app.
137132

138-
1. From the left menu, select **App Services**, and then select the name of your Azure app.
133+
2. From the left menu, select **App Services**, and then select the name of your Azure app.
139134

140135
![Portal navigation to Azure app](./media/app-service-web-get-started-dotnet-framework/access-portal-framework-vs2019.png)
141136

@@ -145,14 +140,6 @@ When publishing completes, Visual Studio launches a browser to the URL of the we
145140

146141
The left menu provides different pages for configuring your app.
147142

148-
## Video
149-
150-
Watch the video to see this quickstart in action and then follow the steps yourself to publish your first .NET app on Azure.
151-
152-
> [!VIDEO https://channel9.msdn.com/Shows/Azure-for-NET-Developers/Create-a-NET-app-in-Azure-Quickstart/player]
153-
154-
[!INCLUDE [Clean-up section](../../includes/clean-up-section-portal.md)]
155-
156143
## Next steps
157144

158145
> [!div class="nextstepaction"]

articles/app-service/app-service-web-tutorial-windows-containers-custom-fonts.md

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.service: app-service-web
1111
ms.workload: web
1212
ms.tgt_pltfrm: na
1313
ms.topic: quickstart
14-
ms.date: 04/03/2019
14+
ms.date: 10/22/2019
1515
ms.author: cephalin
1616
ms.custom: mvc
1717
ms.custom: seodec18
@@ -87,6 +87,10 @@ RUN ${source:-obj/Docker/publish/InstallFont.ps1}
8787

8888
You can find _InstallFont.ps1_ in the **CustomFontSample** project. It's a simple script that installs the font. You can find a more complex version of the script in the [Script Center](https://gallery.technet.microsoft.com/scriptcenter/fb742f92-e594-4d0c-8b79-27564c575133).
8989

90+
> [!NOTE]
91+
> To test the Windows container locally, make sure that Docker is started on your local machine.
92+
>
93+
9094
## Publish to Azure Container Registry
9195

9296
[Azure Container Registry](https://docs.microsoft.com/azure/container-registry/) can store your images for container deployments. You can configure App Service to use images hosted in Azure Container Registry.
@@ -132,27 +136,34 @@ Sign in to the Azure portal at https://portal.azure.com.
132136

133137
From the left menu, select **Create a resource** > **Web** > **Web App for Containers**.
134138

135-
### Configure the new web app
139+
### Configure app basics
136140

137-
In the create interface, configure the settings according to the following table:
141+
In the **Basics** tab, configure the settings according to the following table, then click **Next: Docker**.
138142

139143
| Setting | Suggested value | For more information |
140144
| ----------------- | ------------ | ----|
141-
|**App Name**| Type a unique name. | The URL of the web app is `http://<app_name>.azurewebsites.net`, where `<app_name>` is your app name. |
142-
|**Resource Group**| Select **Use existing** and type **myResourceGroup**. | |
143-
|**OS**| Windows (Preview) | |
144-
145-
### Configure App Service plan
145+
|**Subscription**| Make sure the correct subscription is selected. | |
146+
|**Resource Group**| Select **Create new**, type **myResourceGroup**, and click **OK**. | |
147+
|**Name**| Type a unique name. | The URL of the web app is `http://<app-name>.azurewebsites.net`, where `<app-name>` is your app name. |
148+
|**Publish**| Docker container | |
149+
|**Operating System**| Windows | |
150+
|**Region**| West Europe | |
151+
|**Windows Plan**| Select **Create new**, type **myAppServicePlan**, and click **OK**. | |
146152

147-
Click **App Service plan/Location** > **Create new**. Give the new plan a name, select **West Europe** as the location, and click **OK**.
153+
Your **Basics** tab should look like this:
148154

149-
![](media/app-service-web-tutorial-windows-containers-custom-fonts/configure-app-service-plan.png)
155+
![](media/app-service-web-tutorial-windows-containers-custom-fonts/configure-app-basics.png)
150156

151-
### Configure container
157+
### Configure Windows container
152158

153-
Click **Configure container** > **Azure Container Registry**. Select the registry, image, and tag you created earlier in [Publish to Azure Container Registry](#publish-to-azure-container-registry), and click **OK**.
159+
In the **Docker** tab, configure your custom Windows container as shown in the following table, and select **Review + create**.
154160

155-
![](media/app-service-web-tutorial-windows-containers-custom-fonts/configure-app-container.png)
161+
| Setting | Suggested value |
162+
| ----------------- | ------------ |
163+
|**Image Source**| Azure Container Register |
164+
|**Registry**| Select [the registry you created earlier](#publish-to-azure-container-registry). |
165+
|**Image**| customfontsample |
166+
|**Tag**| latest |
156167

157168
### Complete app creation
158169

@@ -180,9 +191,9 @@ Wait a few minutes and try again, until you get the homepage with the beautiful
180191

181192
## See container start-up logs
182193

183-
It may take some time for the Windows container to load. To see the progress, navigate to the following URL by replacing *\<app_name>* with the name of your app.
194+
It may take some time for the Windows container to load. To see the progress, navigate to the following URL by replacing *\<app-name>* with the name of your app.
184195
```
185-
https://<app_name>.scm.azurewebsites.net/api/logstream
196+
https://<app-name>.scm.azurewebsites.net/api/logstream
186197
```
187198

188199
The streamed logs looks like this:
9.75 KB
Loading
15.6 KB
Loading
37.3 KB
Loading
24.7 KB
Loading
33.1 KB
Loading
77.9 KB
Loading

0 commit comments

Comments
 (0)