Skip to content

Commit 0f8707d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-freshness
2 parents bc9b0d5 + 7f2cbd7 commit 0f8707d

File tree

101 files changed

+624
-246
lines changed

Some content is hidden

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

101 files changed

+624
-246
lines changed

articles/active-directory-b2c/api-connectors-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Using Azure AD B2C, you can add your own business logic to a user journey by cal
8787
![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)
8888

8989
> [!NOTE]
90-
> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds and the default retry count is one (meaning there are 2 tries in total).
90+
> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds for custom policies and 5 seconds for user flows. The default retry count is one (meaning there are 2 tries in total).
9191
9292
## Calling a RESTful service
9393

articles/app-service/app-service-web-nodejs-best-practices-and-troubleshoot-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ http.createServer(function (req, res) {
161161
}).listen(process.env.PORT);
162162
```
163163

164-
Go to the Debug Console site `https://yoursite.scm.azurewebsites.net/DebugConsole`
164+
To go to the Debug Console site for your app, select **Development Tools** > **Advanced Tools**, then select **Go**. In Kudu, select **Debug console** for **CMD** or **PowerShell**.
165165

166166
Go into your site/wwwroot directory. You see a command prompt as shown in the following example:
167167

articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,9 @@ Each action starts with a `Trace.WriteLine()` method. This code is added to show
379379
> [!TIP]
380380
> You can experiment with different trace levels to see what types of messages are displayed for each level. For example, the **Information** level includes all logs created by `Trace.TraceInformation()`, `Trace.TraceWarning()`, and `Trace.TraceError()`, but not logs created by `Trace.WriteLine()`.
381381
382-
1. In your browser, navigate to your app again at *http://<your app name>.azurewebsites.net*, then try clicking around the to-do list application in Azure. The trace messages are now streamed to the **Output** window in Visual Studio.
382+
1. In a different browser window, go to the Azure portal and open your app's **Overview** page. Under **Default domain**, select the link to open your app.
383+
384+
1. Then try clicking around the to-do list application in Azure. The trace messages are now streamed to the **Output** window in Visual Studio.
383385
384386
```console
385387
Application: 2017-04-06T23:30:41 PID[8132] Verbose GET /Todos/Index

articles/app-service/configure-language-dotnet-framework.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This guide provides key concepts and instructions for ASP.NET developers. If you
2121

2222
## Show supported .NET Framework runtime versions
2323

24-
In App Service, the Windows instances already have all the supported .NET Framework versions installed. To show the .NET Framework runtime and SDK versions available to you, navigate to `https://<app-name>.scm.azurewebsites.net/DebugConsole` and run the appropriate command in the browser-based console:
24+
In App Service, the Windows instances already have all the supported .NET Framework versions installed. To show the .NET Framework runtime and SDK versions available to you, go to your app in the Azure portal. Select **Development Tools** > **Advanced Tools**. Select **Go**. In Kudu, select **Debug console** for **CMD** or **PowerShell**. Run the appropriate command in the browser-based console:
2525

2626
For CLR 4 runtime versions (.NET Framework 4 and above):
2727

articles/app-service/configure-language-dotnetcore.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ This guide provides key concepts and instructions for ASP.NET Core developers. I
2323

2424
## Show supported .NET Core runtime versions
2525

26-
In App Service, the Windows instances already have all the supported .NET Core versions installed. To see the .NET Core runtime and SDK versions that are available to you, go to `https://<app-name>.scm.azurewebsites.net/DebugConsole` and run the following command in the browser-based console:
26+
In App Service, the Windows instances already have all the supported .NET Core versions installed. To see the .NET Core runtime and SDK versions that are available to you, go to your Kudu site.
27+
28+
Go to your app in the Azure portal and then select **Development Tools** > **Advanced Tools**. Select **Go**. In Kudu, select **Debug console** for **CMD** or **PowerShell**.
29+
30+
Run the following command in the browser-based console:
2731

2832
```azurecli-interactive
2933
dotnet --info

articles/app-service/configure-language-java-deploy-run.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ You can deploy WAR files to your Tomcat application by following [this documenta
214214
215215
To deploy WAR files to JBoss EAP, see [this documentation](./deploy-zip.md#deploy-warjarear-packages). When OneDeploy is used, this will automatically rename the WAR file to `app.war` and be placed under `/home/site/wwwroot`.
216216
217-
To deploy EAR files, [use FTP](deploy-ftp.md). Your EAR application is deployed to the context root defined in your application's configuration. For example, if the context root of your app is `<context-root>myapp</context-root>`, then you can browse the site at the `/myapp` path: `http://my-app-name.azurewebsites.net/myapp`. If you want your web app to be served in the root path, ensure that your app sets the context root to the root path: `<context-root>/</context-root>`. For more information, see [Setting the context root of a web application](https://docs.jboss.org/jbossas/guides/webguide/r2/en/html/ch06.html).
217+
To deploy EAR files, [use FTP](deploy-ftp.md). Your EAR application is deployed to the context root defined in your application's configuration. If you want your web app to be served in the root path, ensure that your app sets the context root to the root path: `<context-root>/</context-root>`. For more information, see [Setting the context root of a web application](https://docs.jboss.org/jbossas/guides/webguide/r2/en/html/ch06.html).
218218
219219
::: zone-end
220220
@@ -309,7 +309,7 @@ jcmd <pid> JFR.dump name=continuous_recording filename="/home/recording1.jfr"
309309

310310
#### Timed recording
311311

312-
To take a timed recording, you need the process ID (PID) of the Java application. To find the PID, open a browser to your web app's SCM site at `https://<your-site-name>.scm.azurewebsites.net/ProcessExplorer/`. This page shows the running processes in your web app. Find the process named "java" in the table and copy the corresponding PID.
312+
To take a timed recording, you need the process ID (PID) of the Java application. To find the PID, open your service in the Azure portal. Select **Development Tools** > **Advanced Tools**, then select **Go**. In Kudu, select **Process explorer**. This page shows the running processes in your web app. Find the process named "java" in the table and copy the corresponding PID.
313313

314314
Next, open the **Debug Console** in the top toolbar of the SCM site and run the following command. Replace `<pid>` with the PID you copied earlier. This command starts a 30-second profiler recording of your Java application and generates a file named `timed_recording_example.jfr` in the `C:\home` directory.
315315

articles/app-service/configure-language-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To show the current Node.js version, run the following command in the [Cloud She
2727
az webapp config appsettings list --name <app-name> --resource-group <resource-group-name> --query "[?name=='WEBSITE_NODE_DEFAULT_VERSION'].value"
2828
```
2929

30-
To show all supported Node.js versions, navigate to `https://<sitename>.scm.azurewebsites.net/api/diagnostics/runtime` or run the following command in the [Cloud Shell](https://shell.azure.com):
30+
To show all supported Node.js versions, run the following command in the [Cloud Shell](https://shell.azure.com):
3131

3232
```azurecli-interactive
3333
az webapp list-runtimes --os windows | grep NODE

articles/application-gateway/http-response-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Other reasons for clients receiving 403 responses include:
9797

9898
#### 404 – Page not found
9999

100-
An HTTP 404 response is generated when a request is made to Application Gateway (V2 SKUs) with a hostname that doesn’t corresponds to any of the configured Multi-site listeners, and there is no Basic listener present. Learn more about [types of listeners](application-gateway-components.md#types-of-listeners.
100+
An HTTP 404 response is generated when a request is made to Application Gateway (V2 SKUs) with a hostname that doesn’t corresponds to any of the configured Multi-site listeners, and there is no Basic listener present. Learn more about [types of listeners](application-gateway-components.md#types-of-listeners).
101101

102102
#### 408 – Request Time-out
103103

articles/azure-app-configuration/enable-dynamic-configuration-azure-functions-csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ In this tutorial, you learn how to:
2121

2222
> [!div class="checklist"]
2323
> * Set up dynamic configuration refresh for your Azure Functions app.
24-
> * Enable automatic configuration refresh using App Configuraion middleware.
24+
> * Enable automatic configuration refresh using App Configuration middleware.
2525
> * Use the latest configuration in Function calls when changes occur in your App Configuration store.
2626
2727
## Prerequisites

articles/azure-cache-for-redis/cache-how-to-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ az redis update --cluster-name myCache --resource-group myGroup --set "sku.name"
137137
For more information on scaling with Azure CLI, see [Change settings of an existing Azure Cache for Redis](cache-manage-cli.md#scale).
138138

139139
> [!NOTE]
140-
> When you scale a cache up or down programatically (e.g. using PowerShell or Azure CLI), any `maxmemory-reserved` or `maxfragmentationmemory-reserved` are ignored as part of the update request. Only your scaling change is honored. You can update these memory settings after the scaling operation has completed.
140+
> When you scale a cache up or down programmatically (e.g. using PowerShell or Azure CLI), any `maxmemory-reserved` or `maxfragmentationmemory-reserved` are ignored as part of the update request. Only your scaling change is honored. You can update these memory settings after the scaling operation has completed.
141141
>
142142
143143
### [Scale out and in - Premium only](#tab/scale-out-and-in---premium-only)

0 commit comments

Comments
 (0)