Skip to content

Commit ada4d1c

Browse files
authored
Merge pull request #12321 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to master to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents c8fd812 + 485628d commit ada4d1c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docs/database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ms.author: mathoma
8585

8686
Three forms of failover exist-automatic, manual, and forced (with possible data loss). The form or forms of failover supported by a given secondary replica depends on its availability mode, and, for synchronous-commit mode, on the failover mode on the primary replica and target secondary replica, as follows.
8787

88-
- Synchronous-commit mode supports two forms of failover-*planned manual failover* and *automatic failover*, if the target secondary replica is currently synchronized with the avt1. The support for these forms of failover depends on the setting of the *failover mode property* on the failover partners. If failover mode is set to "manual" on either the primary or secondary replica, only manual failover is supported for that secondary replica. If failover mode is set to "automatic" on both the primary and secondary replicas, both automatic and manual failover are supported on that secondary replica.
88+
- Synchronous-commit mode supports two forms of failover-*planned manual failover* and *automatic failover*, if the target secondary replica is currently synchronized with the primary replica. The support for these forms of failover depends on the setting of the *failover mode property* on the failover partners. If failover mode is set to "manual" on either the primary or secondary replica, only manual failover is supported for that secondary replica. If failover mode is set to "automatic" on both the primary and secondary replicas, both automatic and manual failover are supported on that secondary replica.
8989

9090
- **Planned manual failover** (without data loss)
9191

docs/relational-databases/import-export/examples-of-bulk-access-to-data-in-azure-blob-storage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ SECRET = 'sv=2018-03-28&ss=b&srt=sco&sp=rwdlac&se=2019-08-31T02:25:19Z&st=2019-0
4747

4848
## Accessing data in a CSV file referencing an Azure blob storage location
4949

50-
The following example uses an external data source pointing to an Azure storage account, named `newinvoices`.
50+
The following example uses an external data source pointing to an Azure storage account, named `MyAzureInvoices`.
5151

5252
```sql
5353
CREATE EXTERNAL DATA SOURCE MyAzureInvoices
5454
WITH (
5555
TYPE = BLOB_STORAGE,
5656
LOCATION = 'https://newinvoices.blob.core.windows.net',
57-
CREDENTIAL = 'UploadInvoices';
57+
CREDENTIAL = UploadInvoices
5858
);
5959
```
6060

0 commit comments

Comments
 (0)