Skip to content

Commit 9d1d4c5

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-sqlseattle
2 parents c3f3ba4 + 5e598cb commit 9d1d4c5

29 files changed

Lines changed: 513 additions & 201 deletions

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"redirect_url": "/sql/advanced-analytics/administration/resource-governance",
5656
"redirect_document_id": true
5757
},
58+
{
59+
"source_path": "docs/advanced-analytics/r/dmvs-for-sql-server-r-services.md",
60+
"redirect_url": "/sql/advanced-analytics/administration/monitor-sql-server-machine-learning-services-using-dynamic-management-views",
61+
"redirect_document_id": true
62+
},
5863
{
5964
"source_path": "docs/advanced-analytics/python/machine-learning-services-python-reference.md",
6065
"redirect_url": "/sql/advanced-analytics/r/machine-learning-services-r-reference",

docs/2014/database-engine/dev-guide/unused-assembly-cleanup.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ using Microsoft.SqlServer.Server;
149149
/// <summary>
150150
/// Returns the comma-separated list of assembly ids contained in this instance
151151
/// </summary>
152-
/// <returns>string value that represents a comma-seperated list
152+
/// <returns>string value that represents a comma-separated list
153153
/// of assembly ids</returns>
154-
public string ToCommaSeperatedList()
154+
public string ToCommaSeparatedList()
155155
{
156156
StringBuilder sb = new StringBuilder();
157157
@@ -234,7 +234,7 @@ using Microsoft.SqlServer.Server;
234234
235235
cmd.CommandText = String.Format(CultureInfo.InvariantCulture,
236236
"SELECT name FROM sys.assemblies WHERE assembly_id IN ({0});",
237-
unusedAssemblySet.ToCommaSeperatedList());
237+
unusedAssemblySet.ToCommaSeparatedList());
238238
using (SqlDataReader rd = cmd.ExecuteReader())
239239
{
240240
while (rd.Read())
@@ -401,8 +401,8 @@ Public NotInheritable Class AssemblyCleanup
401401
''' <summary>
402402
''' Returns the comma-separated list of assembly ids contained in this instance
403403
''' </summary>
404-
''' <returns>string value that represents a comma-seperated list of assembly ids</returns>
405-
Public Function ToCommaSeperatedList() As String
404+
''' <returns>string value that represents a comma-separated list of assembly ids</returns>
405+
Public Function ToCommaSeparatedList() As String
406406
Dim sb As New StringBuilder()
407407
408408
If m_dictionary.Count > 0 Then
@@ -480,7 +480,7 @@ Public NotInheritable Class AssemblyCleanup
480480
481481
cmd.CommandText = String.Format(CultureInfo.InvariantCulture, _
482482
"SELECT name FROM sys.assemblies WHERE assembly_id IN ({0});", _
483-
unusedAssemblySet.ToCommaSeperatedList())
483+
unusedAssemblySet.ToCommaSeparatedList())
484484
Dim rd As SqlDataReader = cmd.ExecuteReader()
485485
Try
486486
While rd.Read()
11.9 KB
Loading
2.41 KB
Loading
37.2 KB
Loading
59.4 KB
Loading
2.46 KB
Loading
2.38 KB
Loading
5.23 KB
Loading
5.06 KB
Loading

0 commit comments

Comments
 (0)