Skip to content

Commit 4fa5df8

Browse files
committed
Bringing even with master.
2 parents e84ac76 + cae7170 commit 4fa5df8

18 files changed

Lines changed: 196 additions & 209 deletions

docs/advanced-analytics/known-issues-for-sql-server-machine-learning-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ This message is displayed if either of the following two statements is true,
9292
+ You installed R Server (Standalone) on a client computer by using the setup wizard for [!INCLUDE[ssSQLv14_md](../includes/sssqlv14-md.md)].
9393
+ You installed Microsoft R Server by using the [separate Windows installer](https://docs.microsoft.com/machine-learning-server/install/r-server-install-windows).
9494

95-
To ensure that the server and client use the same version you might need to use _binding_, supported for Microsoft R Server 9.0 and later releases, to upgrade the R components in SQL Server 2016 instances. To determine if support for upgrades is available for your version of R Services, see [Upgrade an instance of R Services using SqlBindR.exe](/r/use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md).
95+
To ensure that the server and client use the same version you might need to use _binding_, supported for Microsoft R Server 9.0 and later releases, to upgrade the R components in SQL Server 2016 instances. To determine if support for upgrades is available for your version of R Services, see [Upgrade an instance of R Services using SqlBindR.exe](r/use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md).
9696

9797
**Applies to:** SQL Server 2016 R Services, with R Server version 9.0.0 or earlier
9898

docs/advanced-analytics/r/install-additional-r-packages-on-sql-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ This article describes how to install new R packages to an instance of SQL Serve
1919
| Approach | Permissions | Remote/Local |
2020
|------------------------------------|---------------------------|-------|
2121
| [Use conventional R package managers](#bkmk_rInstall) | Admin | Local |
22-
| [Use RevoScaleR](use-revoscaler-to-manage-r-packages.md) | Admin | Local |
23-
| [Use T-SQL (CREATE EXTERNAL LIBRARY)](install-r-packages-tsql.md) | Admin to setup, database roles afterwards | both
22+
| [Use RevoScaleR](use-revoscaler-to-manage-r-packages.md) | Admin to setup, database roles afterwards | Both |
23+
| [Use T-SQL (CREATE EXTERNAL LIBRARY)](install-r-packages-tsql.md) | Admin | both
2424
| [Use a miniCRAN to create a local repository](create-a-local-package-repository-using-minicran.md) | Admin to setup, database roles afterwards | both |
2525

2626
## <a name="bkmk_rInstall"></a> Install R packages over an Internet connection

docs/advanced-analytics/r/install-pretrained-models-sql-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ Pre-trained models work with the following products and languages. The Setup pro
2626

2727
+ SQL Server 2016 R Services (In-Database) - R only, with the [MicrosoftML library](https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package)
2828
+ SQL Server 2016 R Server (Standalone) - R only, with the [MicrosoftML library](https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package)
29-
+ SQL Server 2017 Machine Learning Services (In-Database) - R with the [MicrosoftML library] (https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package), Python with the [microsoftml library](https://docs.microsoft.com/machine-learning-server/python-reference/microsoftml/microsoftml-package)
30-
+ SQL Server 2017 Machine Learning Server (Standalone) - R with the [MicrosoftML library] (https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package), Python with the [microsoftml library](https://docs.microsoft.com/machine-learning-server/python-reference/microsoftml/microsoftml-package)
29+
+ SQL Server 2017 Machine Learning Services (In-Database) - R with the [MicrosoftML library](https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package), Python with the [microsoftml library](https://docs.microsoft.com/machine-learning-server/python-reference/microsoftml/microsoftml-package)
30+
+ SQL Server 2017 Machine Learning Server (Standalone) - R with the [MicrosoftML library](https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package), Python with the [microsoftml library](https://docs.microsoft.com/machine-learning-server/python-reference/microsoftml/microsoftml-package)
3131

3232
The installation process differs slightly depending on your version of SQL Server. See the following sections for instructions for each version.
3333

docs/advanced-analytics/r/installing-sql-server-r-services-on-an-azure-virtual-machine.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ manager: cgronlun
1212
# Install SQL Server machine learning features on an Azure virtual machine
1313
[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md-winonly](../../includes/appliesto-ss-xxxx-xxxx-xxx-md-winonly.md)]
1414

15-
We recommend using the [Data Science virtual machine](ttps://docs.microsoft.com/azure/machine-learning/data-science-virtual-machine/provision-vm), but if you want a VM that has just SQL Server 2017 Machine Learning Services or SQL Server 2016 R Services, this article guides you through the steps.
15+
We recommend using the [Data Science virtual machine](https://docs.microsoft.com/azure/machine-learning/data-science-virtual-machine/provision-vm), but if you want a VM that has just SQL Server 2017 Machine Learning Services or SQL Server 2016 R Services, this article guides you through the steps.
1616

1717
## Create a virtual machine on Azure
1818

@@ -85,4 +85,4 @@ If you expect that clients calling the server will need to issue ODBC queries as
8585
8686
TCP/IP is required for loopback connections. If you get the following error, enable TCP/IP on the virtual machine that supports the instance:
8787
88-
"DBNETLIB; SQL Server does not exist or access denied"
88+
"DBNETLIB; SQL Server does not exist or access denied"

docs/advanced-analytics/r/machine-learning-services-r-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ For the most part, SQL Server consumes the same R and Python libraries that are
2828

2929
Scalable algorithms that support remote compute contexts and multiple data sources.
3030

31-
+ [MicrosoftML](https://docs.microsoft.com/machine-learning-serverr-reference/microsoftml/microsoftml-package)
31+
+ [MicrosoftML](https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package)
3232

3333
Fast, scalable machine learning algorithms and transforms for R. Requires RevoScaleR.
3434

docs/advanced-analytics/r/r-and-data-optimization-r-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ When working with large data sets, you should always use the SQL compute context
2626

2727
## Factors
2828

29-
The R language has the concept of “factors”, which are special variable for categorical data. Data scientists often use factor variables in their formula, because handling categorical variables as factors ensures that the data is processed properly by machine learning functions. For more information, see [R for Dummies: Factor Variables] (http://www.dummies.com/programming/r/how-to-look-at-the-structure-of-a-factor-in-r/).
29+
The R language has the concept of “factors”, which are special variable for categorical data. Data scientists often use factor variables in their formula, because handling categorical variables as factors ensures that the data is processed properly by machine learning functions. For more information, see [R for Dummies: Factor Variables](http://www.dummies.com/programming/r/how-to-look-at-the-structure-of-a-factor-in-r/).
3030

3131
By design, factor variables can be converted from strings to integers and back again for storage or processing. The R `data.frame` function handles all strings as factor variables, unless the argument *stringsAsFactors* is set to **False**. What this means is that strings are automatically converted to an integer for processing, and then mapped back to the original string.
3232

docs/advanced-analytics/r/r-package-management-for-sql-server-r-services.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Unlike a typical R or Python development, packages used by SQL Server must be in
2121

2222
+ The server administrator can monitor the addition of new files and libraries on the server, and control the growth of files used by package libraries.
2323
+ Packages can be more easily shared by multiple database users, as opposed to installing multiple copies of the same package in user libraries.
24-
+ Only secured, approved packages can be installed, to protect the server and its operations.
2524

2625
However, these restrictions necessarily mean some changes in the way that data scientists and analysts work:
2726

docs/advanced-analytics/r/use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Notice that binding does not guarantee the very latest version of R or Anaconda.
4545
Component |Initial Release | R Server 9.0.1 | R Server 9.1 | MLS 9.2.1 | MLS 9.3 |
4646
----------|----------------|----------------|--------------|---------|-------|
4747
Microsoft R Open (MRO) over R | R 3.2.2 | R 3.3.2 |R 3.3.3 | R 3.4.1 | R 3.4.3 |
48-
[RevoScaleR](https://docs.microsoft.com/achine-learning-server/r-reference/revoscaler/revoscaler) | 8.0.3 | 9.0.1 | 9.1 | 9.2.1 | 9.3 |
48+
[RevoScaleR](https://docs.microsoft.com/machine-learning-server/r-reference/revoscaler/revoscaler) | 8.0.3 | 9.0.1 | 9.1 | 9.2.1 | 9.3 |
4949
[MicrosoftML](https://docs.microsoft.com/machine-learning-server/r-reference/microsoftml/microsoftml-package)| n.a. | 9.0.1 | 9.1 | 9.2.1 | 9.3 |
5050
[pretrained models](https://docs.microsoft.com/machine-learning-server/install/microsoftml-install-pretrained-models)| n.a. | 9.0.1 | 9.1 | 9.2.1 | 9.3 |
5151
[sqlrutils](https://docs.microsoft.com/machine-learning-server/r-reference/sqlrutils/sqlrutils)| n.a. | 1.0 | 1.0 | 1.0 | 1.0 |
@@ -327,4 +327,4 @@ If you find folders with a name like this, you can remove it after installation
327327
+ [Install Machine Learning Server for Windows (offline)](https://docs.microsoft.com/machine-learning-server/install/machine-learning-server-windows-offline)
328328
+ [Known issues in Machine Learning Server](https://docs.microsoft.com/machine-learning-server/resources-known-issues)
329329
+ [Feature announcements from previous release of R Server](https://docs.microsoft.com/r-server/whats-new-in-r-server)
330-
+ [Deprecated, discontinued or changed features](https://docs.microsoft.com/machine-learning-server/resources-deprecated-features)
330+
+ [Deprecated, discontinued or changed features](https://docs.microsoft.com/machine-learning-server/resources-deprecated-features)

docs/advanced-analytics/tutorials/walkthrough-prepare-the-data.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Plug in the database server name, database name, user name and password into the
158158
This step (plugging in database information) takes 0.48 seconds.
159159
```
160160
161-
Click this link to jump to the next lesson: [View and explore the data using SQL](/walkthrough-view-and-explore-the-data.md)
161+
Click this link to jump to the next lesson: [View and explore the data using SQL](walkthrough-view-and-explore-the-data.md)
162162
163163
## <a name="bkmk_Troubleshooting"></a>Troubleshooting
164164
@@ -293,10 +293,10 @@ The T-SQL queries used in this walkthrough have been tested and can be run as-is
293293
294294
## Next lesson
295295
296-
[View and explore the data using R and SQL](/walkthrough-view-and-explore-the-data.md)
296+
[View and explore the data using R and SQL](walkthrough-view-and-explore-the-data.md)
297297
298298
## Previous lesson
299299
300-
[End-to-end data science walkthrough for R and SQL Server](/walkthrough-data-science-end-to-end-walkthrough.md)
300+
[End-to-end data science walkthrough for R and SQL Server](walkthrough-data-science-end-to-end-walkthrough.md)
301301
302302
[Prerequisites for the data science walkthrough](walkthrough-prerequisites-for-data-science-walkthroughs.md)

docs/connect/ado-net/microsoft-ado-net-for-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ADO.NET is the core data access technology for .NET languages. Use the System.Da
4040
## More Samples
4141
* [ADO.NET Code Examples](https://msdn.microsoft.com/library/dw70f090.aspx)
4242
* [Getting Started with .NET Framework on Windows](https://www.microsoft.com/sql-server/developer-get-started/csharp/win/)
43-
* [Getting Started with .NET Core on macOS](https://www.microsoft.com/sql-server/developer-get-started/csharp/mac/)
43+
* [Getting Started with .NET Core on macOS](https://www.microsoft.com/sql-server/developer-get-started/csharp/macos/)
4444
* [Getting Started with .NET Core on Ubuntu](https://www.microsoft.com/sql-server/developer-get-started/csharp/ubuntu/)
4545
* [Getting Started with .NET Core on Red Hat Enterprise Linux (RHEL)](https://www.microsoft.com/sql-server/developer-get-started/csharp/rhel/)
4646

0 commit comments

Comments
 (0)