Skip to content

Commit 94bae3b

Browse files
authored
Merge pull request #268483 from MicrosoftDocs/main
Publish to live, Friday 4 AM PST, 3/8
2 parents fb59694 + 5b8dc27 commit 94bae3b

File tree

41 files changed

+686
-296
lines changed

Some content is hidden

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

41 files changed

+686
-296
lines changed

articles/ai-services/speech-service/includes/language-support/multilingual-voices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ ms.author: v-baolianzou
1717

1818
<sup>2</sup> The neural voice is a multilingual voice in Azure AI Speech. All multilingual voices (except `en-US-JennyMultilingualNeural`) can speak in the language in default locale of the input text without [using SSML](../../speech-synthesis-markup-voice.md#adjust-speaking-languages). However, you can still use the `<lang xml:lang>` element to adjust the speaking accent of each language to set preferred accent such as British accent (`en-GB`) for English. Check the [full list](https://speech.microsoft.com/portal/voicegallery) of supported locales through SSML.
1919

20-
<sup>3</sup> The OpenAI text to speech voices in Azure AI Speech are in public preview and only available in North Central US (`northcentralus`) and Sweden Central (`swedencentral`).
20+
<sup>3</sup> The OpenAI text to speech voices in Azure AI Speech are in public preview and only available in North Central US (`northcentralus`) and Sweden Central (`swedencentral`). Locales not listed for OpenAI voices aren't supported by design.

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,6 +1086,85 @@ You don't need to incrementally add instances (scaling out), you can add multipl
10861086
10871087
JBoss EAP is only available on the Premium v3 and Isolated v2 App Service Plan types. Customers that created a JBoss EAP site on a different tier during the public preview should scale up to Premium or Isolated hardware tier to avoid unexpected behavior.
10881088
1089+
## Tomcat Baseline Configuration On App Services
1090+
1091+
Java developers can customize the server settings, troubleshoot issues, and deploy applications to Tomcat with confidence if they know about the server.xml file and configuration details of Tomcat. Some of these may be:
1092+
* Customizing Tomcat configuration: By understanding the server.xml file and Tomcat's configuration details, developers can fine-tune the server settings to match the needs of their applications.
1093+
* Debugging: When an application is deployed on a Tomcat server, developers need to know the server configuration to debug any issues that may arise. This includes checking the server logs, examining the configuration files, and identifying any errors that might be occurring.
1094+
* Troubleshooting Tomcat issues: Inevitably, Java developers will encounter issues with their Tomcat server, such as performance problems or configuration errors. By understanding the server.xml file and Tomcat's configuration details, developers can quickly diagnose and troubleshoot these issues, which can save time and effort.
1095+
* Deploying applications to Tomcat: To deploy a Java web application to Tomcat, developers need to know how to configure the server.xml file and other Tomcat settings. Understanding these details is essential for deploying applications successfully and ensuring that they run smoothly on the server.
1096+
1097+
As you provision an App Service with Tomcat to host your Java workload (a WAR file or a JAR file), there are certain settings that you get out of the box for Tomcat configuration. You can refer to the [Official Apache Tomcat Documentation](https://tomcat.apache.org/) for detailed information, including the default configuration for Tomcat Web Server.
1098+
1099+
Additionally, there are certain transformations that are further applied on top of the server.xml for Tomcat distribution upon start. These are transformations to the Connector, Host, and Valve settings.
1100+
1101+
Please note that the latest versions of Tomcat will have these server.xml. (8.5.58 and 9.0.38 onward). Older versions of Tomcat do not use transforms and may have different behavior as a result.
1102+
1103+
### Connector
1104+
1105+
```xml
1106+
<Connector port="${port.http}" address="127.0.0.1" maxHttpHeaderSize="16384" compression="on" URIEncoding="UTF-8" connectionTimeout="${site.connectionTimeout}" maxThreads="${catalina.maxThreads}" maxConnections="${catalina.maxConnections}" protocol="HTTP/1.1" redirectPort="8443"/>
1107+
```
1108+
* `maxHttpHeaderSize` is set to `16384`
1109+
* `URIEncoding` is set to `UTF-8`
1110+
* `conectionTimeout` is set to `WEBSITE_TOMCAT_CONNECTION_TIMEOUT`, which defaults to `240000`
1111+
* `maxThreads` is set to `WEBSITE_CATALINA_MAXTHREADS`, which defaults to `200`
1112+
* `maxConnections` is set to `WEBSITE_CATALINA_MAXCONNECTIONS`, which defaults to `10000`
1113+
1114+
> [!NOTE]
1115+
> The connectionTimeout, maxThreads and maxConnections settings can be tuned with app settings
1116+
1117+
Following are example CLI commands that you may use to alter the values of conectionTimeout, maxThreads, or maxConnections:
1118+
1119+
```azurecli-interactive
1120+
az webapp config appsettings set --resource-group myResourceGroup --name myApp --settings WEBSITE_TOMCAT_CONNECTION_TIMEOUT=120000
1121+
```
1122+
```azurecli-interactive
1123+
az webapp config appsettings set --resource-group myResourceGroup --name myApp --settings WEBSITE_CATALINA_MAXTHREADS=100
1124+
```
1125+
```azurecli-interactive
1126+
az webapp config appsettings set --resource-group myResourceGroup --name myApp --settings WEBSITE_CATALINA_MAXCONNECTIONS=5000
1127+
```
1128+
* Connector uses the address of the container instead of 127.0.0.1
1129+
1130+
### Host
1131+
1132+
```xml
1133+
<Host appBase="${site.appbase}" xmlBase="${site.xmlbase}" unpackWARs="${site.unpackwars}" workDir="${site.tempdir}" errorReportValveClass="com.microsoft.azure.appservice.AppServiceErrorReportValve" name="localhost" autoDeploy="true">
1134+
```
1135+
1136+
* `appBase` is set to `AZURE_SITE_APP_BASE`, which defaults to local `WebappsLocalPath`
1137+
* `xmlBase` is set to `AZURE_SITE_HOME`, which defaults to `/site/wwwroot`
1138+
* `unpackWARs` is set to `AZURE_UNPACK_WARS`, which defaults to `true`
1139+
* `workDir` is set to `JAVA_TMP_DIR`, which defaults `TMP`
1140+
* errorReportValveClass uses our custom error report valve
1141+
1142+
### Valve
1143+
1144+
```xml
1145+
<Valve prefix="site_access_log.${catalina.instance.name}" pattern="%h %l %u %t &quot;%r&quot; %s %b %D %{x-arr-log-id}i" directory="${site.logdir}/http/RawLogs" maxDays="${site.logRetentionDays}" className="org.apache.catalina.valves.AccessLogValve" suffix=".txt"/>
1146+
```
1147+
* `directory` is set to `AZURE_LOGGING_DIR`, which defaults to `home\logFiles`
1148+
* `maxDays` is to `WEBSITE_HTTPLOGGING_RETENTION_DAYS`, which defaults to `0` [forever]
1149+
1150+
On Linux, it has all of the same customization, plus:
1151+
1152+
* Adds some error and reporting pages to the valve:
1153+
```xml
1154+
<xsl:attribute name="appServiceErrorPage">
1155+
<xsl:value-of select="'${appService.valves.appServiceErrorPage}'"/>
1156+
</xsl:attribute>
1157+
1158+
<xsl:attribute name="showReport">
1159+
<xsl:value-of select="'${catalina.valves.showReport}'"/>
1160+
</xsl:attribute>
1161+
1162+
<xsl:attribute name="showServerInfo">
1163+
<xsl:value-of select="'${catalina.valves.showServerInfo}'"/>
1164+
</xsl:attribute>
1165+
```
1166+
1167+
10891168
::: zone-end
10901169
10911170
## Next steps

articles/communication-services/concepts/numbers/number-types.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.service: azure-communication-services
1414

1515
# Number types
1616

17-
Azure Communication Services allows you to use phone numbers to make voice calls and send SMS messages with the public-switched telephone network (PSTN). In this document, we'll review the phone number types, region availability, and use cases for planning your telephony and SMS solution using Communication Services.
17+
Azure Communication Services allows you to use phone numbers to make voice calls and send SMS messages with the public-switched telephone network (PSTN). In this document, we review the phone number types, region availability, and use cases for planning your telephony and SMS solution using Communication Services.
1818

1919
## Available options
2020

@@ -25,7 +25,7 @@ Azure Communication Services offers three types of Numbers: Toll-Free, Local, an
2525
- **To send or receive an SMS**, choose a Toll-Free Number or a Short Code
2626
- **To make or receive phone calls**, choose a Toll-Free Number or a Local Number
2727

28-
The table below summarizes these number types with supported capabilities:
28+
This table summarizes the number types and supported capabilities:
2929

3030
| Type | Example | Send SMS | Receive SMS | Make Calls | Receive Calls | Typical Use Case | Restrictions |
3131
| :-------------------------------------------------------------------- | :---------------- | :------: | :---------: | :--------: | :-----------: | :------------------------------------------- | :------------- |
@@ -35,7 +35,8 @@ The table below summarizes these number types with supported capabilities:
3535

3636
## Next steps
3737

38-
For additional information about getting or managing phone numbers please see the following pages:
38+
For more information about getting or managing phone numbers, see the following topics:
3939

4040
- Get a [Toll-Free or Local Phone Number](../../quickstarts/telephony/get-phone-number.md)
4141
- Get a [Short-Code](../../quickstarts/sms/apply-for-short-code.md)
42+
- [Quickstart: Look up operator information for a phone number](../../quickstarts/telephony/number-lookup.md)

articles/communication-services/concepts/sms/concepts.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Key features of Azure Communication Services SMS SDKs include:
3636

3737
## Sender types supported
3838

39-
Sending SMS to any recipient requires getting a phone number. Choosing the right number type is critical to the success of your messaging campaign. Few of the factors to consider when choosing a number type include destination(s) of the message, throughput requirement of your messaging campaign, and the timeline when you want to start sending messages. Azure Communication Services enables you to send SMS using a variety of sender types - toll-free number (1-8XX), short codes (12345), and alphanumeric sender ID (CONTOSO). The following table walks you through the features of each number type:
39+
Sending SMS to any recipient requires getting a phone number. Choosing the right number type is critical to the success of your messaging campaign. Some factors to consider when choosing a number type include destination(s) of the message, throughput requirement of your messaging campaign, and the timeline when you want to start sending messages. Azure Communication Services enables you to send SMS using a variety of sender types - toll-free number (1-8XX), short codes (12345), and alphanumeric sender ID (CONTOSO). The following table walks you through the features of each number type:
4040

41-
|Factors | Toll-Free| Short Code | Dynamic Alphanumeric Sender ID| Pre-registered Alphanumeric Sender ID|
41+
|Factors | Toll-Free| Short Code | Dynamic Alphanumeric Sender ID| Preregistered Alphanumeric Sender ID|
4242
|---------------------|----------|------------|-----------------------|-----------------------|
4343
|**Description**|Toll free numbers are telephone numbers with distinct three-digit codes that can be used for business to consumer communication without any charge to the consumer| Short codes are 5-6 digit numbers used for business to consumer messaging such as alerts, notifications, and marketing | Alphanumeric Sender IDs are displayed as a custom alphanumeric phrase like the company’s name (CONTOSO, MyCompany) on the recipient handset. Alphanumeric sender IDs can be used for a variety of use cases like one-time passcodes, marketing alerts, and flight status notifications. Dynamic alphanumeric sender ID is supported in countries that do not require registration for use.| Alphanumeric Sender IDs are displayed as a custom alphanumeric phrase like the company’s name (CONTOSO, MyCompany) on the recipient handset. Alphanumeric sender IDs can be used for a variety of use cases like one-time passcodes, marketing alerts, and flight status notifications. Pre-registered alphanumeric sender ID is supported in countries that require registration for use. |
4444
|**Format**|+1 (8XX) XYZ PQRS| 12345 | CONTOSO* |CONTOSO* |
@@ -56,11 +56,12 @@ Sending SMS to any recipient requires getting a phone number. Choosing the right
5656
> [!div class="nextstepaction"]
5757
> [Get started with sending sms](../../quickstarts/sms/send.md)
5858
59-
The following documents might be interesting to you:
59+
See the following articles for more information:
6060

61+
- [Number lookup overview](../../concepts/numbers/number-lookup-concept.md)
6162
- Check SMS FAQ for questions regarding [SMS](../sms/sms-faq.md)
6263
- Familiarize yourself with the [SMS SDK](../sms/sdk-features.md)
6364
- Get an SMS capable [phone number](../../quickstarts/telephony/get-phone-number.md)
6465
- Get a [short code](../../quickstarts/sms/apply-for-short-code.md)
65-
- [Phone number types in Azure Communication Services](../telephony/plan-solution.md)
66+
- Learn about [Phone number types in Azure Communication Services](../telephony/plan-solution.md)
6667
- Apply for [Toll-free verification](./sms-faq.md#toll-free-verification)

articles/communication-services/concepts/telephony/telephony-concept.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ ms.subservice: pstn
1616

1717
[!INCLUDE [Regional Availability Notice](../../includes/regional-availability-include.md)]
1818

19-
Azure Communication Services Calling SDKs can be used to add telephony and Public Switched Telephone Network access to your applications. This page summarizes key telephony concepts and capabilities. See the [calling library](../../quickstarts/voice-video-calling/getting-started-with-calling.md) to learn more about specific SDK languages and capabilities.
19+
Azure Communication Services Calling SDKs enable you to add telephony and Public Switched Telephone Network (PSTN) access to your applications. This page summarizes key telephony concepts and capabilities. See the [calling library](../../quickstarts/voice-video-calling/getting-started-with-calling.md) to learn more about specific SDK languages and capabilities.
2020

2121
[!INCLUDE [Survey Request](../../includes/survey-request.md)]
2222

23-
## Overview of telephony
24-
Whenever your users interact with a traditional telephone number, calls are facilitated by PSTN (Public Switched Telephone Network) voice calling. To make and receive PSTN calls, you need to add telephony capabilities to your Azure Communication Services resource. In this case, signaling and media use a combination of IP-based and PSTN-based technologies to connect your users. Communication Services provides two discrete ways to reach the PSTN network: Voice Calling (PSTN) and Azure direct routing.
23+
## Telephony overview
24+
Whenever your users interact with a traditional telephone number, the Public Switched Telephone Network (PSTN) voice calling handles the call. To make and receive PSTN calls, you need to add telephony capabilities to your Azure Communication Services resource. In this case, signaling and media use a combination of IP-based and PSTN-based technologies to connect your users. Communication Services provides two discrete ways to reach the PSTN network: Voice Calling (PSTN) and Azure direct routing.
2525

2626
### Voice Calling (PSTN)
2727

2828
An easy way of adding PSTN connectivity to your app or service, in such case, Microsoft is your telco provider. You can buy numbers directly from Microsoft. Azure Cloud Calling is an all-in-the-cloud telephony solution for Communication Services. It is the simplest option that connects Communication Services to the Public Switched Telephone Network (PSTN) to enable calls to landlines and mobile phones worldwide. Microsoft acts as your PSTN carrier, as shown in the following diagram:
2929

3030
![Voice Calling (PSTN) diagram.](../media/telephony-concept/azure-calling-diagram.png)
3131

32-
If you answer yes to the following, then Voice Calling (PSTN) is the right solution for you:
32+
If you answer **yes** to the following questions, then Voice Calling (PSTN) is the right solution for you:
3333
- Voice Calling (PSTN) is available in your region.
34-
- You do not need to retain your current PSTN carrier.
34+
- You don't need to retain your current PSTN carrier.
3535
- You want to use Microsoft-managed access to the PSTN.
3636

3737
With this option:
3838
- You get numbers directly from Microsoft and can call phones around the world.
39-
- You do not require deployment or maintenance of an on-premises deployment—because Voice Calling (PSTN) operates out of Azure Communication Services.
40-
- Note: If necessary, you can choose to connect a supported Session Border Controller (SBC) through Azure direct routing for interoperability with third-party PBXs, analog devices, and other third-party telephony equipment supported by the SBC.
39+
- You don't need to deploy or maintain any on-premises system because Voice Calling (PSTN) operates through Azure Communication Services.
40+
- Note: If necessary, you can choose to connect a supported Session Border Controller (SBC) through Azure Communication Services direct routing for interoperability with third-party Pprivate branch exchanges (PBXs), analog devices, and other third-party telephony equipment supported by the SBC.
4141

4242
This option requires an uninterrupted connection to Azure Communication Services.
4343

@@ -49,19 +49,19 @@ With this option, you can connect legacy on-premises telephony and your carrier
4949

5050
![Azure direct routing diagram.](../media/telephony-concept/sip-interface-diagram.png)
5151

52-
If you answer yes to any of the following questions, then Azure direct routing is the right solution for you:
52+
If you answer **yes** to any of the following questions, then Azure direct routing is the right solution for you:
5353

54-
- You want to use Communication Services with PSTN calling capabilities.
54+
- You want to use Azure Communication Services with PSTN calling capabilities.
5555
- You need to retain your current PSTN carrier.
56-
- You want to mix routing, with some calls going through Voice Calling (PSTN), some through your carrier.
56+
- You want to mix routing, with some calls going through Voice Calling (PSTN) and some through your carrier.
5757
- You need to interoperate with third-party PBXs and/or equipment such as overhead pagers, analog devices, and so on.
5858

5959
With this option:
6060

6161
- You connect your own supported SBC to Azure Communication Services without the need for extra on-premises software.
6262
- You can use literally any telephony carrier with Communication Services.
6363
- You can choose to configure and manage this option, or it can be configured and managed by your carrier or partner (ask if your carrier or partner provides this option).
64-
- You can configure interoperability between your telephony equipment, such as a third-party PBX and analog devices, and Communication Services.
64+
- You can configure interoperability between your telephony equipment, such as a third-party PBX and analog devices, and Azure Communication Services.
6565

6666
This option requires:
6767

@@ -78,9 +78,11 @@ This option requires:
7878
- [Session Border Controllers certified for Azure Communication Services direct routing](./certified-session-border-controllers.md)
7979
- [Pricing](../pricing.md)
8080
- Learn about [call automation API](../call-automation/call-automation.md) that enables you to build server-based calling workflows to control and manage calls for phone numbers and direct routing
81+
- [Number lookup overview](../../concepts/numbers/number-lookup-concept.md)
8182

8283
### Quickstarts
8384

8485
- [Get a phone number](../../quickstarts/telephony/get-phone-number.md)
8586
- [Outbound call to a phone number](../../quickstarts/telephony/pstn-call.md)
86-
- [Use call automation to build calling workflow that can place calls to phone numbers, play voice prompts and more](../../quickstarts/call-automation/quickstart-make-an-outbound-call.md)
87+
- [Use call automation to build calling workflow that can place calls to phone numbers, play voice prompts and more](../../quickstarts/call-automation/quickstart-make-an-outbound-call.md)
88+
- [Look up operator information for a phone number](../../quickstarts/telephony/number-lookup.md)

0 commit comments

Comments
 (0)