Skip to content

Commit 57be137

Browse files
authored
Merge pull request #104301 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 9978ec5 + 800acc3 commit 57be137

File tree

3 files changed

+23
-28
lines changed

3 files changed

+23
-28
lines changed

articles/cognitive-services/text-analytics/includes/entity-types/general-entities.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.author: aahi
1717
Recognize person names in text.
1818

1919
Languages:
20-
* Public preview: `English`
20+
* Public preview: `Arabic`, `Czech`, `Chinese-Simplified`, `Danish`, `Dutch`, `English`, `Finnish`, `French`, `German`, `Hungarian`, `Italian`, `Japanese`, `Korean`, `Norwegian (Bokmål)`, `Polish`, `Portuguese (Portugal)`, `Portuguese (Brazil)`, `Russian`, `Spanish`, `Swedish` and `Turkish`
2121

2222
| Subtype name | Description | Available starting with model version |
2323
|--------------|------------------------------------------------------------------|---------------------------------------|
@@ -39,20 +39,20 @@ Natural and human-made landmarks, structures, geographical features and geopolit
3939

4040
Languages:
4141

42-
* Public preview: `English`
42+
* Public preview: `Arabic`, `Czech`, `Chinese-Simplified`, `Danish`, `Dutch`, `English`, `Finnish`, `French`, `German`, `Hungarian`, `Italian`, `Japanese`, `Korean`, `Norwegian (Bokmål)`, `Polish`, `Portuguese (Portugal)`, `Portuguese (Brazil)`, `Russian`, `Spanish`, `Swedish` and `Turkish`
4343

4444
| Subtype name | Description | Available starting with model version |
4545
|---------------------------|------------------------------------------------------------------------------------------|----------------------------------------|
4646
| N/A | locations, for example `Atlantic Ocean`, `library`, `Eiffel Tower`, `Statue of Liberty` | `2019-10-01` |
47-
| Geopolitical Entity (GPE) | Cities, countries, states for example `Seattle`, `Pennsylvania`, `South Africa`, `Tokyo` | `2020-02-01` |
47+
| Geopolitical Entity (GPE) - English only| Cities, countries, states for example `Seattle`, `Pennsylvania`, `South Africa`, `Tokyo` | `2020-02-01` |
4848

4949
### Organization
5050

5151
Recognized organizations, corporations, agencies, and other groups of people. For example: companies, political groups, musical bands, sport clubs, government bodies, and public organizations. Nationalities and religions are not included in this entity type.
5252

5353
Languages:
5454

55-
* Public preview: `English`
55+
* Public preview: `Arabic`, `Czech`, `Chinese-Simplified`, `Danish`, `Dutch`, `English`, `Finnish`, `French`, `German`, `Hungarian`, `Italian`, `Japanese`, `Korean`, `Norwegian (Bokmål)`, `Polish`, `Portuguese (Portugal)`, `Portuguese (Brazil)`, `Russian`, `Spanish`, `Swedish` and `Turkish`
5656

5757
| Subtype name | Description | Available starting with model version |
5858
|--------------|---------------------------------------------------------------------------------------------------------|----------------------------------------|
@@ -151,7 +151,7 @@ Date and Time entities.
151151

152152
Languages:
153153

154-
* Public preview: `English`
154+
* Public preview: `Chinese-Simplified`, `English`, `French`, `German` and `Spanish`
155155

156156
| Subtype name | Examples |
157157
|-------------|------------------------------|
@@ -171,7 +171,7 @@ Numbers and numeric quantities.
171171

172172
Languages:
173173

174-
* Public preview: `English`
174+
* Public preview: `Chinese-Simplified`, `English`, `French`, `German` and `Spanish`
175175

176176
| Subtype name | Examples |
177177
|-------------|------------------------------|

articles/cognitive-services/text-analytics/language-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Language support is initially rolled out in preview, graduating to generally ava
4545
|:----------------------|:-------------:|:---------:|:-----------:|:------------------------:|:--------------:|:------------------:|
4646
| Arabic | `ar` | | |\* | | |
4747
| Czech | `cs` | | |\* | | |
48-
| Chinese-Simplified | `zh-hans` |\*\* | || | |
48+
| Chinese-Simplified | `zh-hans` |\*\* | || | `zh` also accepted |
4949
| Chinese-Traditional | `zh-hant` |\*\* | | | | |
5050
| Danish | `da` |\* ||\* | | |
5151
| Dutch | `nl` |\** ||\* | | |
@@ -58,7 +58,7 @@ Language support is initially rolled out in preview, graduating to generally ava
5858
| Italian | `it` |\** ||\* | | |
5959
| Japanese | `ja` |\** ||\* | | |
6060
| Korean | `ko` |\*\* ||\* | | |
61-
| Norwegian (Bokmål) | `no` |\* ||\* | | |
61+
| Norwegian (Bokmål) | `no` |\* ||\* | | `nb` also accepted |
6262
| Polish | `pl` |\* ||\* | | |
6363
| Portuguese (Portugal) | `pt-PT` |\** ||\* | | `pt` also accepted |
6464
| Portuguese (Brazil) | `pt-BR` | ||\* | | |

articles/site-recovery/azure-to-azure-how-to-reprotect.md

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ ms.author: rajanaki
1313
---
1414
# Reprotect failed over Azure VMs to the primary region
1515

16-
17-
When you [fail over](site-recovery-failover.md) Azure VMs from one region to another using [Azure Site Recovery](site-recovery-overview.md), the VMs boot up in the secondary region, in an unprotected state. If fail back the VMs to the primary region, you need to do the following:
16+
When you [fail over](site-recovery-failover.md) Azure VMs from one region to another using [Azure Site Recovery](site-recovery-overview.md), the VMs boot up in the secondary region, in an **unprotected** state. If you want to fail back the VMs to the primary region, you need to do the following:
1817

1918
- Reprotect the VMs in the secondary region, so that they start to replicate to the primary region.
2019
- After reprotection completes and the VMs are replicating, you can fail them over from the secondary to primary region.
@@ -36,7 +35,7 @@ When you [fail over](site-recovery-failover.md) Azure VMs from one region to ano
3635

3736
### Customize reprotect settings
3837

39-
You can customize the following properties of the target VMe during reprotection.
38+
You can customize the following properties of the target VM during reprotection.
4039

4140
![Customize](./media/site-recovery-how-to-reprotect-azure-to-azure/customizeblade.png)
4241

@@ -49,7 +48,6 @@ You can customize the following properties of the target VMe during reprotection
4948
|Cache Storage | You can specify a cache storage account to be used during replication. By default, a new cache storage account is be created, if it doesn't exist. |
5049
|Availability Set |If the VM in the secondary region is part of an availability set, you can choose an availability set for the target VM in the primary region. By default, Site Recovery tries to find the existing availability set in the primary region, and use it. During customization, you can specify a new availability set. |
5150

52-
5351
### What happens during reprotection?
5452

5553
By default the following occurs:
@@ -64,31 +62,28 @@ When you trigger a reprotect job, and the target VM exists, the following occurs
6462
1. The target side VM is turned off if it's running.
6563
2. If the VM is using managed disks, a copy of original disks are created with '-ASRReplica' suffix. The original disks are deleted. The '-ASRReplica' copies are used for replication.
6664
3. If the VM is using unmanaged disks, the target VM's data disks are detached and used for replication. A copy of the OS disk is created and attached on the VM. The original OS disk is detached and used for replication.
67-
4. Only changes between the source disk and the target disk are synchronized. The differentials are computed by comparing both the disks and then transferred. To find the estimated time check below.
68-
5. After the synchronization completes, the delta replication begins, and creates a recovery point in line with the replication policy.
65+
4. Only changes between the source disk and the target disk are synchronized. The differentials are computed by comparing both the disks and then transferred. Check below to find the estimated time to complete the reprotection.
66+
5. After the synchronization completes, the delta replication begins, and a recovery point is created in line with the replication policy.
6967

7068
When you trigger a reprotect job, and the target VM and disks do not exist, the following occurs:
7169
1. If the VM is using managed disks, replica disks are created with '-ASRReplica' suffix. The '-ASRReplica' copies are used for replication.
7270
2. If the VM is using unmanaged disks, replica disks are created in the target storage account.
7371
3. The entire disks are copied from the failed over region to the new target region.
74-
4. After the synchronization completes, the delta replication begins, and creates a recovery point in line with the replication policy.
72+
4. After the synchronization completes, the delta replication begins, and a recovery point is created in line with the replication policy.
7573

76-
#### Estimated time to do the reprotection
74+
#### Estimated time to do the reprotection
7775

78-
In most cases, Azure Site Recovery doesn’t replicates the complete data to the source region.
79-
Below are the conditions that determines how much data would be replicated :
76+
In most cases, Azure Site Recovery doesn’t replicate the complete data to the source region.
77+
Below are the conditions that determines how much data would be replicated:
8078

81-
1. If the source VM data is deleted, corrupted or inaccessible due to some reason like resource group change/delete then during reprotection complete IR will happen as there is no data available on the source region to use.
82-
2. If the source VM data is accessible then only differentials are computed by comparing both the disks and then transferred. Check the below table to get the estimated time
79+
1. If the source VM data is deleted, corrupted, or inaccessible due to some reason, like a resource group change/delete, then during reprotection a complete Site Recovery will happen as there is no data available on the source region to use.
80+
2. If the source VM data is accessible, then only differentials are computed by comparing both the disks and then transferred. Check the table below to get the estimated time.
8381

84-
|**Example situation ** | **Time taken to Reprotect ** |
85-
|--- | --- |
86-
|Source region has 1 VM with 1 TB standard Disk<br/>- Only 127 GB data is used and rest of the disk is empty<br/>- Disk type is standard with 60 MiB/S throughput<br/>- No data change after failover| Approximate time 45 minutes – 1.5 hours<br/> - During reprotection Site Recovery will populate the checksum of whole data which will take 127 GB/ 45 MBs ~45 minutes<br/>- Some overhead time is required for Site Recovery to do auto scale that is 20-30 minutes<br/>- No Egress charges |
87-
|Source region has 1 VM with 1 TB standard Disk<br/>- Only 127 GB data is used and rest of the disk is empty<br/>- Disk type is standard with 60 MiB/S throughput<br/>- 45 GB data changes after failover| Approximate time 1 hours – 2 hours<br/>- During reprotection Site Recovery will populate the checksum of whole data which will take 127 GB/ 45 MBs ~45 minutes<br/>- Transfer time to apply changes of 45 GB that is 45 GB/ 45 MBps ~ 17 minutes<br/>- Egress charges would be only for 45 GB data not for the checksum|
82+
|Example situation | Time taken to Reprotect |
83+
|---|---|
84+
|Source region has 1 VM with 1 TB standard Disk<br/>- Only 127 GB data is used, and the rest of the disk is empty<br/>- Disk type is standard with 60 MiB/S throughput<br/>- No data change after failover| Approximate time: 45 minutes – 1.5 hours<br/> - During reprotection, Site Recovery will populate the checksum of all data which will take 127 GB/ 45 MBs ~45 minutes<br/>- Some overhead time is required for Site Recovery to auto scale: approx. 20-30 minutes<br/>- No Egress charges |
85+
|Source region has 1 VM with 1 TB standard Disk<br/>- Only 127 GB data is used and rest of the disk is empty<br/>- Disk type is standard with 60 MiB/S throughput<br/>- 45 GB data changes after failover| Approximate time: 1 hours – 2 hours<br/>- During reprotection, Site Recovery will populate the checksum of all data which will take 127 GB/ 45 MBs ~45 minutes<br/>- Transfer time to apply changes of 45 GB that is 45 GB/ 45 MBps ~ 17 minutes<br/>- Egress charges would be for 45 GB data changes, not for the checksum |
8886

89-
90-
91-
9287
## Next steps
9388

94-
After the VM is protected, you can initiate a failover. The failover shuts down the VM in the secondary region, and creates and boots VM in the primary region, with some small downtime. We recommend you choose a time accordingly, and that you run a test failover before initiating a full failover to the primary site. [Learn more](site-recovery-failover.md) about failover.
89+
After the VM is protected, you can initiate a failover. The failover shuts down the VM in the secondary region and creates and boots the VM in the primary region, with some small downtime during this process. We recommend you choose an appropriate time for this process and that you run a test failover before initiating a full failover to the primary site. [Learn more](site-recovery-failover.md) about Azure Site Recovery failover.

0 commit comments

Comments
 (0)