Skip to content

Commit 8a061f5

Browse files
authored
Merge pull request #218435 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 65f8480 + df1cfae commit 8a061f5

File tree

10 files changed

+52
-20
lines changed

10 files changed

+52
-20
lines changed

articles/active-directory/authentication/concept-authentication-phone-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ With phone call verification during SSPR or Azure AD Multi-Factor Authentication
5252

5353
## Office phone verification
5454

55-
With phone call verification during SSPR or Azure AD Multi-Factor Authentication, an automated voice call is made to the phone number registered by the user. To complete the sign-in process, the user is prompted to press # on their keypad.
55+
With office phone call verification during SSPR or Azure AD Multi-Factor Authentication, an automated voice call is made to the phone number registered by the user. To complete the sign-in process, the user is prompted to press # on their keypad.
5656

5757
## Troubleshooting phone options
5858

articles/active-directory/saas-apps/sap-analytics-cloud-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ This section guides you through the steps to configure the Azure AD provisioning
106106

107107
![Screenshot of the Provisioning Mode dropdown list with the Automatic option called out.](common/provisioning-automatic.png)
108108

109-
5. Under the **Admin Credentials** section, input the tenant URL value retrieved earlier in **Tenant URL**. Input the access token value retrieved earlier in **Secret Token**. Click **Test Connection** to ensure Azure AD can connect to InVision. If the connection fails, ensure your SAP Analytics Cloud account has Admin permissions and try again.
109+
5. Under the **Admin Credentials** section, input the tenant URL value retrieved earlier in **Tenant URL**. Input the access token value retrieved earlier in **Secret Token**. Click **Test Connection** to ensure Azure AD can connect to SAP Analytics Cloud. If the connection fails, ensure your SAP Analytics Cloud account has Admin permissions and try again.
110110

111111
![Screenshot shows the Admin Credentials dialog box, where you can enter your Tenant U R L and Secret Token.](./media/sap-analytics-cloud-provisioning-tutorial/provisioning.png)
112112

articles/application-gateway/configuration-infrastructure.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ For example, here's how to calculate the available addressing for a subnet with
4040
- Gateway 3: Maximum of 15 instances; utilizes a private frontend IP configuration
4141
- Subnet Size: /24
4242

43-
Subnet Size /24 = 255 IP addresses - 5 reserved from the platform = 250 available addresses.
44-
250 - Gateway 1 (10) - 1 private frontend IP configuration = 239
45-
239 - Gateway 2 (2) = 237
46-
237 - Gateway 3 (15) - 1 private frontend IP configuration = 221
43+
Subnet Size /24 = 256 IP addresses - 5 reserved from the platform = 251 available addresses.
44+
251 - Gateway 1 (10) - 1 private frontend IP configuration = 240
45+
240 - Gateway 2 (2) = 238
46+
238 - Gateway 3 (15) - 1 private frontend IP configuration = 222
4747

4848
> [!IMPORTANT]
4949
> Although a /24 subnet isn't required per Application Gateway v2 SKU deployment, it is highly recommended. This is to ensure that Application Gateway v2 has sufficient space for autoscaling expansion and maintenance upgrades. You should ensure that the Application Gateway v2 subnet has sufficient address space to accommodate the number of instances required to serve your maximum expected traffic. If you specify the maximum instance count, then the subnet should have capacity for at least that many addresses. For capacity planning around instance count, see [instance count details](understanding-pricing.md#instance-count).

articles/application-gateway/configuration-listeners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Choose the frontend IP address that you plan to associate with this listener. Th
3838

3939
## Frontend port
4040

41-
Choose the frontend port. Select an existing port or create a new one. Choose any value from the [allowed range of ports](./application-gateway-components.md#ports). You can use not only well-known ports, such as 80 and 443, but any allowed custom port that's suitable. A port can be used for public-facing listeners or private-facing listeners.
41+
Choose the front-end port. Select an existing port or create a new one. Choose any value from the [allowed range of ports](./application-gateway-components.md#ports). You can use not only well-known ports, such as 80 and 443, but any allowed custom port that's suitable. A port can be used for public-facing listeners or private-facing listeners, however the same port cannot be used for both at the same time.
4242

4343
## Protocol
4444

articles/cognitive-services/language-service/concepts/model-lifecycle.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ Use the table below to find which model versions are supported by each feature:
8181

8282
| Feature | Supported Training config versions | Training config expiration | Deployment expiration |
8383
|---------------------------------------------|--------------------------------------------|------------------------------------|------------------------|
84-
| Custom text classification | `2022-05-01` | `04/10/2023` | `04/28/2024` |
85-
| Conversational language understanding | `2022-05-01` | `10/28/2022` | `10/28/2023` |
86-
| Conversational language understanding | `2022-09-01` | `04/10/2023` | `04/28/2024` |
87-
| Custom named entity recognition | `2022-05-01` | `04/10/2023` | `04/28/2024` |
88-
| Orchestration workflow | `2022-05-01` | `10/28/2022` | `10/28/2023` |
84+
| Custom text classification | `2022-05-01` | `2023-05-01` | `2024-04-30` |
85+
| Conversational language understanding | `2022-05-01` | `2022-10-28` | `2023-10-28` |
86+
| Conversational language understanding | `2022-09-01` | `2023-02-28` | `2024-02-28` |
87+
| Custom named entity recognition | `2022-05-01` | `2023-05-01` | `2024-04-30` |
88+
| Orchestration workflow | `2022-05-01` | `2023-05-01` | `2024-04-30` |
8989

9090

9191
## API versions

articles/cosmos-db/mongodb/quickstart-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ The output of the app should be similar to this example:
231231

232232
## Clean up resources
233233

234-
When you no longer need the Azure Cosmos DB for NoSQL account, you can delete the corresponding resource group.
234+
When you no longer need the Azure Cosmos DB for MongoDB account, you can delete the corresponding resource group.
235235

236236
### [Azure CLI](#tab/azure-cli)
237237

articles/machine-learning/resource-curated-environments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ The following configurations are supported:
4646

4747
| Environment Name | OS | GPU Version| Python Version | PyTorch Version | ORT-training Version | DeepSpeed Version | torch-ort Version |
4848
| --- | --- | --- | --- | --- | --- | --- | --- |
49-
| AzureML-ACPT-pytorch-1.12-py39-cuda11.6-gpu | Ubuntu 20.04 | cu116 | 3.9 | 1.13.1 | 1.12.1 | 0.7.3 | 1.13.1 |
50-
| AzureML-ACPT-pytorch-1.12-py38-cuda11.6-gpu | Ubuntu 20.04 | cu116 | 3.8 | 1.12.0 | 1.12.0 | 0.7.3 | 1.12.0 |
49+
| AzureML-ACPT-pytorch-1.12-py39-cuda11.6-gpu | Ubuntu 20.04 | cu116 | 3.9 | 1.12.1 | 1.13.1 | 0.7.3 | 1.13.1 |
50+
| AzureML-ACPT-pytorch-1.12-py38-cuda11.6-gpu | Ubuntu 20.04 | cu116 | 3.8 | 1.12.1 | 1.12.0 | 0.7.3 | 1.12.0 |
5151
| AzureML-ACPT-pytorch-1.11-py38-cuda11.5-gpu | Ubuntu 20.04 | cu115 | 3.8 | 1.11.0 | 1.11.1 | 0.7.3 | 1.11.0 |
5252
| AzureML-ACPT-pytorch-1.11-py38-cuda11.3-gpu | Ubuntu 20.04 | cu113 | 3.8 | 1.11.0 | 1.11.1 | 0.7.3 | 1.11.0 |
5353

articles/synapse-analytics/sql-data-warehouse/backup-and-restore.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ Learn how to use backup and restore in Azure Synapse Dedicated SQL pool. Use ded
2020

2121
A *data warehouse snapshot* creates a restore point you can leverage to recover or copy your data warehouse to a previous state. Since dedicated SQL pool is a distributed system, a data warehouse snapshot consists of many files that are located in Azure storage. Snapshots capture incremental changes from the data stored in your data warehouse.
2222

23-
A *data warehouse restore* is a new data warehouse that is created from a restore point of an existing or deleted data warehouse. Restoring your data warehouse is an essential part of any business continuity and disaster recovery strategy because it re-creates your data after accidental corruption or deletion. Data warehouse snapshot is also a powerful mechanism to create copies of your data warehouse for test or development purposes. Dedicated SQL pool restore rates can vary depending on the database size and location of the source and target data warehouse.
23+
A *data warehouse restore* is a new data warehouse that is created from a restore point of an existing or deleted data warehouse. Restoring your data warehouse is an essential part of any business continuity and disaster recovery strategy because it re-creates your data after accidental corruption or deletion. Data warehouse snapshot is also a powerful mechanism to create copies of your data warehouse for test or development purposes.
24+
25+
> [!NOTE]
26+
> Dedicated SQL pool Recovery Time Objective (RTO) rates can vary. Factors that may affect the recovery (restore) time:
27+
> - The database size
28+
> - The location of the source and target data warehouse (i.e., geo-restore)
2429
2530
## Automatic Restore Points
2631

includes/front-door-edge-locations-by-abbreviation.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
| Abbreviation | Location | Region |
1414
| --- | --- | --- |
1515
| AKL | Auckland, New Zealand | New Zealand North, Asia |
16+
| ASH | Ashburn, Virginia, USA | EAST US, United States |
1617
| ATA | Atlanta, Georgia, USA | East US, United States |
1718
| ATH | Athens, Greece | Greece Central, Europe |
1819
| BCN | Barcelona, Spain | Spain Central, Europe |
1920
| BER | Berlin, Germany | Germany West Central, Europe |
21+
| BJJ | Beijing, China | APAC |
2022
| BKK | Bangkok, Thailand | South East Asia |
2123
| BL | Ashburn, Virginia, USA | East US, United States |
2224
| BN | Boydton, Virginia, USA | East US, United States |
@@ -32,20 +34,24 @@
3234
| CAI | Cairo, Egypt | Africa |
3335
| CH | Chicago, Illinois, USA | Central US, United States |
3436
| CHG | Chicago, Illinois, USA | Central US, United States |
37+
| CHI | Chicago, Illinois, USA | Central US, United States |
3538
| CPH | Copenhagen, Denmark | Denmark East, Europe |
3639
| CPQ | Campinas, Brazil | South Brazil, Latin America |
3740
| CPT | Cape Town, South Africa | South Africa North |
41+
| CVG | Cincinnati, Ohio, USA | US East, United States |
3842
| CYS | Cheyenne, Wyoming, USA | Central US, United States |
3943
| DAL | Dallas, Texas, USA | Central US, United States |
4044
| DB | Dublin, Ireland | North Europe |
4145
| DEL | New Delhi, India | West India, Asia |
4246
| DEN | Denver, Colorado, USA | Central US, United States |
4347
| DFW | Dallas, Texas, USA | Central US, United States |
4448
| DNA | Denver, Colorado, USA | Central US, United States |
49+
| DOH | Doha, Qatar | Qatar Central, Qater |
4550
| DUS | Duesseldorf, Germany | Germany West Central, Europe |
4651
| DXB | Dubai, United Arab Emirates | United Arab Emirates North, Asia |
4752
| EWR | Newark, New Jersey, USA | East US, United States |
4853
| FRA | Frankfurt, Germany | Germany West Central, Europe |
54+
| GRU | Sau Paulo, Brazil | Brazil South |
4955
| GVA | Geneva, Switzerland | Switzerland North, Europe |
5056
| HEL | Helsinki, Finland | West Europe |
5157
| HK | Hong Kong, Hong Kong SAR | East Asia |
@@ -70,6 +76,7 @@
7076
| MAD | Madrid, Spain | Spain Central, Europe |
7177
| MAN | Manchester, United Kingdom | UK West, Europe |
7278
| MEL | Melbourne, Australia | Australia Southeast, Asia |
79+
| MEM | Memphis, Tennessee, USA | Central US, United States |
7380
| MEX | Queretaro, Mexico | Mexico Central |
7481
| MIA | Miami, Florida, USA | East US, United States |
7582
| MIL | Milan, Italy | Italy North, Europe |
@@ -82,11 +89,13 @@
8289
| NYC | New York City, New York, USA | East US, United States |
8390
| OSA | Osaka, Japan | Japan West, Asia |
8491
| OSL | Oslo, Norway | Norway East, Europe |
92+
| PAO | Palo Alto, California, USA | West US, United States |
8593
| PAR | Paris, France | France Central, Europe |
8694
| PDX | Portland, Oregon, USA | West US, United States |
8795
| PER | Perth, Australia | Australia Southeast, Asia |
8896
| PHL | Philadelphia, Pennsylvania, USA | East US, United States |
8997
| PHX | Phoenix, Arizona, USA | West US, United States |
98+
| PNQ | Pune, India | Central India |
9099
| PR | San Juan, Puerto Rico | Latin America |
91100
| PRA | Saint Denis, France | France Central, Europe |
92101
| PRG | Prague, Czech Republic | West Europe |
@@ -97,18 +106,25 @@
97106
| SAN | San Diego, California, USA | West US, United States |
98107
| SAO | Sao Paulo, Brazil | South Brazil |
99108
| SCL | Santiago, Chile | Chile Central, Latin America |
109+
| SEL | Seoul, Singapore | Southeast Asia |
100110
| SG | Singapore, Singapore | Southeast Asia |
101111
| SGE | Singapore, Singapore | Southeast Asia |
102112
| SGN | Ho Chi Minh City, Vietnam | Southeast Asia |
103113
| SIN | Singapore, Singapore | Southeast Asia |
104114
| SJC | San Jose, California, USA | West US, United States |
105115
| SLA | Seoul, Korea | Korea Central, Asia |
116+
| SLC | Salt Lake City, Utah, USA | West US, United States |
106117
| SN | San Antonio, Texas, USA | Central US, United States |
107118
| SOF | Sofia, Bulgaria | West Europe |
119+
| STB | Seattle, Washington, USA | West US, United States |
108120
| STO | Stockholm, Sweden | West Europe |
109121
| SYD | Sydney, Australia | Australia East |
122+
| TEB | Secaucus, New Jersey, United States | East US, United States |
110123
| TLV | Tel Aviv, Israel | Israel Central, Asia |
124+
| TPA | Tampa, Florida, USA | East US 2, United States |
111125
| TPE | Taipei, Taiwan | Taiwan North, Asia |
126+
| TYA | Tokyo, Japan | Japan East, Asia |
127+
| TYB | Tokyo, Japan | Japan East, Asia |
112128
| TYO | Tokyo, Japan | Japan East, Asia |
113129
| VIE | Vienna, Austria | Austria East, Europe |
114130
| WAW | Warsaw, Poland | Poland Central, Europe |

includes/virtual-network-multiple-ip-addresses-os-config.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,18 @@ ping -S 10.1.0.5 outlook.com
113113
114114
</details>
115115

116-
### Linux (Ubuntu 14/16)
116+
### SUSE Linux Enterprise and openSUSE
117+
118+
<details>
119+
<summary>Expand</summary>
120+
121+
SUSE-based distributions use the <code>cloud-netconfig</code> plugin from the <code>cloud-netconfig-azure</code> package to manage additional IP addresses. No manual configuration is required on the part of the administrator. The first IP address of an interface set on the platform is assigned via DHCP. The cloud-netconfig plugin then probes the Azure Instance Metadata Service API continuously (once per minute) for additional IP addresses assigned to the interface and adds/removes them as secondary IP addresses automatically.
122+
123+
This plugin should be installed and enabled on new images by default. Configuration steps for old workloads can be found here: https://www.suse.com/c/multi-nic-cloud-netconfig-ec2-azure/.
124+
125+
</details>
126+
127+
### Ubuntu 14/16
117128

118129
<details>
119130
<summary>Expand</summary>
@@ -234,7 +245,7 @@ ip route add default via 10.1.0.1 dev eth2 table custom
234245
235246
</details>
236247
237-
### Linux (Ubuntu 18.04+)
248+
### Ubuntu 18.04+
238249
239250
<details>
240251
<summary>Expand</summary>
@@ -349,7 +360,7 @@ ip route add default via 10.1.0.1 dev eth2 table custom
349360

350361
</details>
351362

352-
### Linux (Red Hat, CentOS, and others)
363+
### Red Hat Enterprise Linux, CentOS, and others
353364

354365
<details>
355366
<summary>Expand</summary>
@@ -605,4 +616,4 @@ ip route add default via 10.1.0.1 dev eth2 table custom
605616
606617
- **eth2** to the name of your secondary NIC
607618
608-
</details>
619+
</details>

0 commit comments

Comments
 (0)