Skip to content

Commit e13f5af

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-build-sql-ledger
2 parents e9063b6 + 8ecad79 commit e13f5af

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

docs/machine-learning/install/sql-machine-learning-azure-virtual-machine.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ monikerRange: ">=sql-server-2017||>=sql-server-linux-ver15"
1313
# Install SQL Server Machine Learning Services with Python and R on an Azure virtual machine
1414
[!INCLUDE [SQL Server 2017 and later](../../includes/applies-to-version/sqlserver2017.md)]
1515

16-
Learn how to install Python and R with SQL Server Machine Learning Services on a virtual machine in Azure. This eliminates the installation and configuration tasks for Machine Learning Services.
16+
Learn how to install Python and R with [SQL Server Machine Learning Services](../sql-server-machine-learning-services.md) on a virtual machine in Azure. This eliminates the installation and configuration tasks for Machine Learning Services.
1717

1818
Follow these steps:
1919

@@ -60,4 +60,4 @@ To do this, you must allow the SQL worker accounts that are used by Launchpad to
6060

6161
+ Enable TCP/IP
6262

63-
TCP/IP is required for loopback connections. If you get the error "DBNETLIB; SQL Server does not exist or access denied", enable TCP/IP on the virtual machine that supports the instance.
63+
TCP/IP is required for loopback connections. If you get the error "DBNETLIB; SQL Server does not exist or access denied", enable TCP/IP on the virtual machine that supports the instance.

docs/relational-databases/collations/collation-and-unicode-support.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@ These collations are supported in [!INCLUDE[ssde_md](../../includes/ssde_md.md)]
576576

577577
UTF-8 is available only to Windows collations that support supplementary characters, as introduced in [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)]. The **nchar** and **nvarchar** data types allow UCS-2 or UTF-16 encoding only, and they remain unchanged.
578578

579+
Azure SQL Database and Azure SQL Managed Instance also support UTF-8.
580+
579581
### <a name="storage_differences"></a> Storage differences between UTF-8 and UTF-16
580582
The Unicode Consortium allocates to each character a unique code point, which is a value in the range 000000–10FFFF. With [!INCLUDE[sql-server-2019](../../includes/sssql19-md.md)], both UTF-8 and UTF-16 encodings are available to represent the full range:
581583
- With UTF-8 encoding, characters in the ASCII range (000000–00007F) require 1 byte, code points 000080–0007FF require 2 bytes, code points 000800–00FFFF require 3 bytes, and code points 0010000–0010FFFF require 4 bytes.
@@ -650,4 +652,4 @@ For more information, see the following related content:
650652
[Contained Database Collations](../../relational-databases/databases/contained-database-collations.md)
651653
[Choose a Language When Creating a Full-Text Index](../../relational-databases/search/choose-a-language-when-creating-a-full-text-index.md)
652654
[sys.fn_helpcollations (Transact-SQL)](../../relational-databases/system-functions/sys-fn-helpcollations-transact-sql.md)
653-
[Single-Byte and Multibyte Character Sets](/cpp/c-runtime-library/single-byte-and-multibyte-character-sets)
655+
[Single-Byte and Multibyte Character Sets](/cpp/c-runtime-library/single-byte-and-multibyte-character-sets)

docs/t-sql/spatial-geography/collectionaggregate-geography-data-type.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description: "CollectionAggregate (geography Data Type)"
33
title: "CollectionAggregate (geography Data Type) | Microsoft Docs"
44
ms.custom: ""
5-
ms.date: "07/30/2017"
5+
ms.date: "05/18/2021"
66
ms.prod: sql
77
ms.prod_service: "database-engine, sql-database"
88
ms.reviewer: ""
@@ -25,7 +25,7 @@ Creates a **GeometryCollection** instance from a set of **geography** objects.
2525

2626
```
2727
28-
ConvexHullAggregate ( geography_operand )
28+
CollectionAggregate ( geography_operand )
2929
```
3030

3131
[!INCLUDE[sql-server-tsql-previous-offline-documentation](../../includes/sql-server-tsql-previous-offline-documentation.md)]

0 commit comments

Comments
 (0)