Skip to content

Commit d5fbb78

Browse files
HeidiSteenHeidiSteen
committed
merge conflict
2 parents ace2dc8 + 622399c commit d5fbb78

1,028 files changed

Lines changed: 55448 additions & 53157 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ _themes.MSDN.Modern/
77
_themes.VS.Modern/
88

99
.openpublishing.buildcore.ps1
10+
/docs/ssms/.vs

‎.openpublishing.redirection.json‎

Lines changed: 185 additions & 140 deletions
Large diffs are not rendered by default.

‎docs/2014/2014-toc/books-online-for-sql-server-2014.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ manager: craigg
2525
Welcome to [!INCLUDE[msCoName](../includes/msconame-md.md)]® Books Online for [!INCLUDE[msCoName](../includes/msconame-md.md)] [!INCLUDE[ssCurrent](../includes/sscurrent-md.md)]®. Books Online contains the task descriptions and reference documentation that describes how to perform data management and business intelligence work by using [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)].
2626

2727
**Try it out:**
28-
![Azure Virtual Machine small](../sql-server/media/what-s-new-in-sql-server-2016/azure-virtual-machine-small.png) Have an Azure account? Then go **[Here](https://ms.portal.azure.com/?flight=1#create/Microsoft.SQLServer2016RTMEnterpriseWindowsServer2012R2)** to spin up a Virtual Machine with SQL Server 2014 Service Pack 1 (SP1) already installed. For more information on SQL Server 2014 (SP1), see [SQL Server 2014 Service Pack 1 release information ](https://support.microsoft.com/en-us/kb/3058865).
28+
![Azure Virtual Machine small](../sql-server/media/what-s-new-in-sql-server-2016/azure-virtual-machine-small.png) Have an Azure account? Then go **[Here](https://ms.portal.azure.com/?flight=1#create/Microsoft.SQLServer2016RTMEnterpriseWindowsServer2012R2)** to spin up a Virtual Machine with SQL Server 2014 Service Pack 1 (SP1) already installed. For more information on SQL Server 2014 (SP1), see [SQL Server 2014 Service Pack 1 release information](https://support.microsoft.com/en-us/kb/3058865).
2929

3030
## SQL Server Technologies
3131

‎docs/2014/analysis-services/multidimensional-models/olap-physical/object-naming-rules-analysis-services.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ manager: craigg
6565
|Object|Invalid characters|
6666
|------------|------------------------|
6767
|`Server`|Follow Windows server naming conventions when naming a server object. See [Naming Conventions (Windows)](/windows/desktop/DNS/naming-conventions) for details.|
68-
|`DataSource`|: / \ * &#124; ? " () [] {} <>|
69-
|`Level` or `Attribute`|. , ; ' ` : / \ * &#124; ? " & % $ ! + = [] {} \< >|
70-
|`Dimension` or `Hierarchy`|. , ; ' ` : / \ * &#124; ? " & % $ ! + = () [] {} \<,>|
71-
|All other objects|. , ; ' ` : / \ * &#124; ? " & % $ ! + = () [] {} \< >|
68+
|`DataSource`|`: / \ * | ? " () [] {} <>`|
69+
|`Level` or `Attribute`|```. , ; ' ` : / \ * &| ? " & % $ ! + = [] {} \< >```|
70+
|`Dimension` or `Hierarchy`|```. , ; ' ` : / \ * | ? " & % $ ! + = () [] {} \<,>```|
71+
|All other objects|```. , ; ' ` : / \ * | ? " & % $ ! + = () [] {} \< >```|
7272

7373
**Exceptions: When Reserved Characters are Allowed**
7474

‎docs/2014/database-engine/availability-groups/windows/always-on-availability-groups-sql-server.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ manager: craigg
3737

3838
- *Synchronous-commit mode*. This availability mode emphasizes high availability and data protection over performance, at the cost of increased transaction latency. A given availability group can support up to three synchronous-commit availability replicas, including the current primary replica.
3939

40-
For more information, see [ Availability Modes;Always On Availability Groups;](availability-modes-always-on-availability-groups.md).
40+
For more information, see [Availability Modes;Always On Availability Groups;](availability-modes-always-on-availability-groups.md).
4141

4242
- Supports several forms of availability-group failover: automatic failover, planned manual failover (generally referred as simply "manual failover"), and forced manual failover (generally referred as simply "forced failover"). For more information, see [Failover and Failover Modes;Always On Availability Groups;](failover-and-failover-modes-always-on-availability-groups.md).
4343

‎docs/2014/database-engine/availability-groups/windows/configure-backup-on-availability-replicas-sql-server.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ manager: craigg
2323
This topic describes how to configure backup on secondary replicas for an AlwaysOn availability group by using [!INCLUDE[ssManStudioFull](../../../includes/ssmanstudiofull-md.md)], [!INCLUDE[tsql](../../../includes/tsql-md.md)], or PowerShell in [!INCLUDE[ssCurrent](../../../includes/sscurrent-md.md)].
2424

2525
> [!NOTE]
26-
> For an introduction to backup on secondary replicas, see [ Active Secondaries: Backup on Secondary Replicas (AlwaysOn Availability Groups)](active-secondaries-backup-on-secondary-replicas-always-on-availability-groups.md).
26+
> For an introduction to backup on secondary replicas, see [Active Secondaries: Backup on Secondary Replicas (AlwaysOn Availability Groups)](active-secondaries-backup-on-secondary-replicas-always-on-availability-groups.md).
2727
2828

2929

@@ -195,6 +195,6 @@ BACKUP DATABASE @DBNAME TO DISK=<disk>
195195
196196
## See Also
197197
[Overview of AlwaysOn Availability Groups &#40;SQL Server&#41;](overview-of-always-on-availability-groups-sql-server.md)
198-
[ Active Secondaries: Backup on Secondary Replicas (AlwaysOn Availability Groups)](active-secondaries-backup-on-secondary-replicas-always-on-availability-groups.md)
198+
[Active Secondaries: Backup on Secondary Replicas (AlwaysOn Availability Groups)](active-secondaries-backup-on-secondary-replicas-always-on-availability-groups.md)
199199
200200

‎docs/2014/database-engine/availability-groups/windows/configure-read-only-routing-for-an-availability-group-sql-server.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ Server=tcp:MyAgListener,1433;Database=Db1;IntegratedSecurity=SSPI;ApplicationInt
209209
For more information about read-only application intent and read-only routing, see [Availability Group Listeners, Client Connectivity, and Application Failover &#40;SQL Server&#41;](../../listeners-client-connectivity-application-failover.md).
210210

211211
### If Read-Only Routing is Not Working Correctly
212-
For information about troubleshooting a read-only routing configuration, see [ Read-Only Routing is Not Working Correctly](troubleshoot-always-on-availability-groups-configuration-sql-server.md).
212+
For information about troubleshooting a read-only routing configuration, see [Read-Only Routing is Not Working Correctly](troubleshoot-always-on-availability-groups-configuration-sql-server.md).
213213

214214
## <a name="RelatedTasks"></a> Related Tasks
215215
**To view read-only routing configurations**

‎docs/2014/database-engine/availability-groups/windows/possible-failures-during-sessions-between-availability-replicas-sql-server.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ manager: craigg
7676
- Insufficient computing resources, such as a CPU or disk overload, the transaction log filling up, or the system is running out of memory or threads. In these cases, you must increase the time-out period, reduce the workload, or change the hardware to handle the workload.
7777

7878
### The Session-Timeout Mechanism
79-
Because soft errors are not detectable directly by a server instance, a soft error could potentially cause an availability replica to wait indefinitely for a response from the other availability replica in a session. To prevent this, [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] implements a session time-out mechanism, based on the connected availability replicas sending out a ping on each open connection at a fixed interval. Receiving a ping during the time-out period indicates that the connection is still open and that the server instances are communicating over it. On receiving a ping, a replica resets its time-out counter on that connection. For information about the relationship of availability mode and session timeouts, see [ Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md).
79+
Because soft errors are not detectable directly by a server instance, a soft error could potentially cause an availability replica to wait indefinitely for a response from the other availability replica in a session. To prevent this, [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] implements a session time-out mechanism, based on the connected availability replicas sending out a ping on each open connection at a fixed interval. Receiving a ping during the time-out period indicates that the connection is still open and that the server instances are communicating over it. On receiving a ping, a replica resets its time-out counter on that connection. For information about the relationship of availability mode and session timeouts, see [Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md).
8080

8181
The primary and secondary replicas ping each other to signal that they are still active, and a session-timeout limit prevents either replica from waiting indefinitely to receive a ping from the other replica. The session-timeout limit is a user-configurable replica property with a default value of 10 seconds. Receiving a ping during the time-out period indicates that the connection is still open and that the server instances are communicating over it. On receiving a ping, an availability replica resets its time-out counter on that connection.
8282

8383
If no ping is received from the other replica within the session-timeout period, the connection times out. The connection is closed, and the timed-out replica enters the DISCONNECTED state. Even if a disconnected replica is configured for synchronous-commit mode, transactions will not wait for that replica to reconnect and resynchronize.
8484

8585
## Responding to an Error
86-
Regardless of the type of error, a server instance that detects an error responds appropriately based on the role of the instance, the availability mode of the session, and the state of any other connection in the session. For information about what occurs on the loss of a partner, see [ Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md).
86+
Regardless of the type of error, a server instance that detects an error responds appropriately based on the role of the instance, the availability mode of the session, and the state of any other connection in the session. For information about what occurs on the loss of a partner, see [Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md).
8787

8888
## Related Tasks
8989
**To change the time-out value (synchronous-commit availability mode only)**

‎docs/2014/database-engine/availability-groups/windows/replicate-track-change-data-capture-always-on-availability.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ manager: craigg
212212
213213
### Considerations
214214
215-
- The distribution database is not supported for use with [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] or database mirroring. Replication configuration is coupled to the SQL Server instance where the Distributor is configured; therefore the distribution database cannot be mirrored or replicated. To provide high availability for the Distributor, use a SQL Server failover cluster. For more information, see [ AlwaysOn Failover Cluster Instances (SQL Server)](../../../sql-server/failover-clusters/windows/always-on-failover-cluster-instances-sql-server.md).
215+
- The distribution database is not supported for use with [!INCLUDE[ssHADR](../../../includes/sshadr-md.md)] or database mirroring. Replication configuration is coupled to the SQL Server instance where the Distributor is configured; therefore the distribution database cannot be mirrored or replicated. To provide high availability for the Distributor, use a SQL Server failover cluster. For more information, see [AlwaysOn Failover Cluster Instances (SQL Server)](../../../sql-server/failover-clusters/windows/always-on-failover-cluster-instances-sql-server.md).
216216
217217
- Subscriber failover to a secondary database, while supported, is a relatively complex manual procedure. The procedure is essentially identical to the method used to fail over a mirrored subscriber database. Subscribers must be running [!INCLUDE[ssSQL11](../../../includes/sssql11-md.md)] or later to participate in an availability group.
218218
@@ -248,7 +248,7 @@ manager: craigg
248248
[Prerequisites, Restrictions, and Recommendations for AlwaysOn Availability Groups &#40;SQL Server&#41;](prereqs-restrictions-recommendations-always-on-availability.md)
249249
[Overview of AlwaysOn Availability Groups &#40;SQL Server&#41;](overview-of-always-on-availability-groups-sql-server.md)
250250
[AlwaysOn Availability Groups: Interoperability (SQL Server)](always-on-availability-groups-interoperability-sql-server.md)
251-
[ AlwaysOn Failover Cluster Instances (SQL Server)](../../../sql-server/failover-clusters/windows/always-on-failover-cluster-instances-sql-server.md)
251+
[AlwaysOn Failover Cluster Instances (SQL Server)](../../../sql-server/failover-clusters/windows/always-on-failover-cluster-instances-sql-server.md)
252252
[About Change Data Capture &#40;SQL Server&#41;](../../../relational-databases/track-changes/about-change-data-capture-sql-server.md)
253253
[About Change Tracking &#40;SQL Server&#41;](../../../relational-databases/track-changes/about-change-tracking-sql-server.md)
254254
[SQL Server Replication](../../../relational-databases/replication/sql-server-replication.md)

‎docs/2014/database-engine/availability-groups/windows/use-the-fail-over-availability-group-wizard-sql-server-management-studio.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ manager: craigg
138138
|**Synchronous commit**|Under synchronous-commit mode, before committing transactions, a synchronous-commit primary replica waits for a synchronous-commit secondary replica to acknowledge that it has finished hardening the log. Synchronous-commit mode ensures that once a given secondary database is synchronized with the primary database, committed transactions are fully protected.|
139139
|**Asynchronous commit**|Under asynchronous-commit mode, the primary replica commits transactions without waiting for acknowledgement that an asynchronous-commit secondary replica has hardened the log. Asynchronous-commit mode minimizes transaction latency on the secondary databases but allows them to lag behind the primary databases, making some data loss possible.|
140140

141-
For more information, see [ Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md).
141+
For more information, see [Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md).
142142

143143
**Failover Mode**
144144
Displays the failover mode of the server instance, one of:
@@ -195,7 +195,7 @@ manager: craigg
195195

196196
## See Also
197197
[Overview of AlwaysOn Availability Groups &#40;SQL Server&#41;](overview-of-always-on-availability-groups-sql-server.md)
198-
[ Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md)
198+
[Availability Modes (AlwaysOn Availability Groups)](availability-modes-always-on-availability-groups.md)
199199
[Failover and Failover Modes &#40;AlwaysOn Availability Groups&#41;](failover-and-failover-modes-always-on-availability-groups.md)
200200
[Perform a Planned Manual Failover of an Availability Group &#40;SQL Server&#41;](perform-a-planned-manual-failover-of-an-availability-group-sql-server.md)
201201
[Perform a Forced Manual Failover of an Availability Group &#40;SQL Server&#41;](perform-a-forced-manual-failover-of-an-availability-group-sql-server.md)

0 commit comments

Comments
 (0)