Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit ffa76b2

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into adstest
2 parents f63cc0a + ea83165 commit ffa76b2

1,449 files changed

Lines changed: 3383 additions & 3265 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.

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,6 +1380,16 @@
13801380
"redirect_url": "/sql/machine-learning/what-s-new-in-sql-server-machine-learning-services",
13811381
"redirect_document_id": true
13821382
},
1383+
{
1384+
"source_path": "docs/machine-learning/tutorials/sql-server-python-tutorials.md",
1385+
"redirect_url": "/sql/machine-learning/tutorials/python-tutorials",
1386+
"redirect_document_id": true
1387+
},
1388+
{
1389+
"source_path": "docs/machine-learning/tutorials/sql-server-r-tutorials.md",
1390+
"redirect_url": "/sql/machine-learning/tutorials/r-tutorials",
1391+
"redirect_document_id": true
1392+
},
13831393
{
13841394
"source_path": "docs/linux/sql-server-linux-develop-use-ssms.md",
13851395
"redirect_url": "/sql/linux/sql-server-linux-manage-ssms",

docs/2014/analysis-services/analysis-services-tutorials-ssas.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@ manager: craigg
2020
[Multidimensional Modeling (Adventure Works Tutorial)](multidimensional-modeling-adventure-works-tutorial.md)
2121
This tutorial teaches the fundamental skills and concepts behind multidimensional modeling in [!INCLUDE[ssBIDevStudioFull](../includes/ssbidevstudiofull-md.md)]. When you are finished, you will have a cube database based on Adventure Works data that you can access from Excel, Reporting Services, or any other client application that connects to Analysis Services.
2222

23-
[AdventureWorks Sample Databases on Codeplex](https://go.microsoft.com/fwlink/?linkID=335807)
24-
This link takes you to the codeplex download page that has the AdventureWorks sample databases for [!INCLUDE[ssSQL14](../includes/sssql14-md.md)].
25-
26-
[AMO Code Sample for Creating Tabular Models Programmatically](https://go.microsoft.com/fwlink/?linkID=221036)
27-
This link takes you to a Codeplex download page that has the AMO sample for [!INCLUDE[ssSQL14](../includes/sssql14-md.md)].
23+
[AdventureWorks Sample Databases on GitHub](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks)
24+
This link takes you to the GitHub download page that has the AdventureWorks sample databases for [!INCLUDE[ssSQL14](../includes/sssql14-md.md)].
2825

2926
[SQL Server 2008 R2 Tutorials](https://go.microsoft.com/fwlink/?linkID=220944)
3027
Most of the SQL Server 2008 R2 tutorials work on a [!INCLUDE[ssSQL14](../includes/sssql14-md.md)] server. If you are new to Data Mining, use this link to find the SQL Server 2008 R2 Data Mining Tutorials that also work with a [!INCLUDE[ssSQL14](../includes/sssql14-md.md)] instance of Analysis Services.

docs/2014/analysis-services/dev-guide/toc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
- name: Developing with ADOMD.NET
108108
href: https://docs.microsoft.com/bi-reference/adomd/developing-with-adomd-net
109109
- name: ADOMD.NET Client Programming
110-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/adomd-net-client-programming
110+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/adomd-net-client-programming
111111
items:
112112
- name: ADOMD.NET Client Functionality
113113
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/adomd-net-client-functionality
@@ -116,13 +116,13 @@
116116
- name: Establishing Connections in ADOMD.NET
117117
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net
118118
- name: Establishing Secure Connections in ADOMD.NET
119-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-establishing-secure-connections
119+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-establishing-secure-connections
120120
- name: Working with Connections and Sessions in ADOMD.NET
121121
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-working-with-connections-and-sessions
122122
- name: Performing Transactions in ADOMD.NET
123123
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/connections-in-adomd-net-performing-transactions
124124
- name: Retrieving Metadata from an Analytical Data Source
125-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-from-an-analytical-data-source
125+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-from-an-analytical-data-source
126126
- name: Working with the ADOMD.NET Object Model
127127
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-client/retrieving-metadata-working-with-adomd-net-object-model
128128
- name: Working with Schema Rowsets in ADOMD.NET
@@ -145,9 +145,9 @@
145145
- name: ADOMD.NET Server Object Architecture
146146
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/adomd-net-server-object-architecture
147147
- name: User Defined Functions and Stored Procedures
148-
href: https://docs.microsoft.com/bi-reference/adomd/multidimensional-models-adomd-net-server/user-defined-functions-and-stored-procedures
148+
href: https://docs.microsoft.com/analysis-services/adomd/multidimensional-models-adomd-net-server/user-defined-functions-and-stored-procedures
149149
- name: Redistributing ADOMD.NET
150-
href: https://docs.microsoft.com/bi-reference/adomd/redistributing-adomd-net
150+
href: https://docs.microsoft.com/analysis-services/adomd/redistributing-adomd-net
151151
- name: Developing with Analysis Management Objects (AMO)
152152
href: https://docs.microsoft.com/bi-reference/amo/developing-with-analysis-management-objects-amo
153153
- name: AMO Concepts and Object Model

docs/2014/analysis-services/tabular-model-programming-compatibility-levels-1050-1103/toc.yml

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,6 @@
3333
- name: Querying a Tabular Model
3434
href: representation/querying-a-tabular-model.md
3535
- name: CSDLBI Technical Reference
36-
href: https://docs.microsoft.com/bi-reference/csdl/technical-reference-for-bi-annotations-to-csdl
37-
items:
38-
- name: AssociationSet Element (CSDLBI)
39-
href: https://docs.microsoft.com/bi-reference/csdl/associationset-element-csdlbi
40-
- name: BaseProperty Element (CSDLBI)
41-
href: https://docs.microsoft.com/bi-reference/csdl/baseproperty-element-csdlbi
42-
- name: DefaultDetails Element (CSDLBI)
43-
href: https://docs.microsoft.com/bi-reference/csdl/defaultdetails-element-csdlbi
44-
- name: DisplayKey Element (CSDLBI)
45-
href: https://docs.microsoft.com/bi-reference/csdl/displaykey-element-csdlbi
46-
- name: EntityContainer Element (CSDLBI)
47-
href: https://docs.microsoft.com/bi-reference/csdl/entitycontainer-element-csdlbi
48-
- name: EntitySet Element (CSDLBI)
49-
href: https://docs.microsoft.com/bi-reference/csdl/entityset-element-csdlbi
50-
- name: EntityType Element (CSDLBI)
51-
href: https://docs.microsoft.com/bi-reference/csdl/entitytype-element-csdlbi
52-
- name: Hierarchy Element (CSDLBI)
53-
href: https://docs.microsoft.com/bi-reference/csdl/hierarchy-element-csdlbi
54-
- name: KPI Element (CSDLBI)
55-
href: https://docs.microsoft.com/bi-reference/csdl/kpi-element-csdlbi
56-
- name: KpiGoal Element (CSDLBI)
57-
href: https://docs.microsoft.com/bi-reference/csdl/kpigoal-element-csdlbi
58-
- name: KpiStatus Element (CSDLBI)
59-
href: https://docs.microsoft.com/bi-reference/csdl/kpistatus-element-csdlbi
60-
- name: Level Element (CSDLBI)
61-
href: https://docs.microsoft.com/bi-reference/csdl/level-element-csdlbi
62-
- name: Measure Element (CSDLBI)
63-
href: https://docs.microsoft.com/bi-reference/csdl/measure-element-csdlbi
64-
- name: Member Element (CSDLBI)
65-
href: https://docs.microsoft.com/bi-reference/csdl/member-element-csdlbi
66-
- name: MemberRef Element (CSDLBI)
67-
href: https://docs.microsoft.com/bi-reference/csdl/memberref-element-csdlbi
68-
- name: NavigationProperty Element (CSDLBI)
69-
href: https://docs.microsoft.com/bi-reference/csdl/navigationproperty-element-csdlbi
70-
- name: Property Element (CSDLBI)
71-
href: https://docs.microsoft.com/bi-reference/csdl/property-element-csdlbi
72-
- name: PropertyRef Element (CSDLBI)
73-
href: https://docs.microsoft.com/bi-reference/csdl/propertyref-element-csdlbi
36+
href: https://docs.microsoft.com/analysis-services/csdlbi/csdlbi-overview
7437
- name: IMDEmbedded Interface
7538
href: imdembeddeddata-interface.md

docs/ado/guide/appendixes/internet-explorer-error-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ The following table lists Microsoft® Internet Explorer error codes related to R
2323
|**IDS_WinInet_ ConnectionReset**|12031 -2146816257 0x800A2EFF|Internet Client Error: Connection Reset.|
2424
|**IDS_WinInet_Error**|8193 -2146820095 0x800A2001|Internet Client Error.|
2525
|**IDS_WinInet_ InvalidServerResponse**|8430 -2146819858 0x800A20EE|Internet Client Error: Invalid Server Response.|
26-
|**IDS_WinInet_ SSLPostLimitation**|8196 -2146820092 0x800A2004|Internet Client Error: SSL Error (possibly 32K data upload limitation).|
26+
|**IDS_WinInet_ SSLPostLimitation**|8196 -2146820092 0x800A2004|Internet Client Error: TLS/SSL Error (possibly 32K data upload limitation).|
2727
|**IDS_WinInet_Timeout**|8194 -2146820094 0x800A2002|Internet Client Error: Request Timeout.|

docs/big-data-cluster/data-ingestion-restore-database.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ First, backup your existing SQL Server database from either SQL Server on Window
2424
This article shows how to restore the AdventureWorks database, but you can use any database backup.
2525

2626
> [!TIP]
27-
> You can download the AdventureWorks backup [here](https://www.microsoft.com/download/details.aspx?id=49502).
27+
> Download the [AdventureWorks backup](../samples/adventureworks-install-configure.md).
2828
2929
## Copy the backup file
3030

docs/big-data-cluster/deploy-big-data-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The following table lists common big data cluster tools and how to install them:
2929
| **Azure Data Studio** | Yes | Cross-platform graphical tool for querying SQL Server. | [Install](https://aka.ms/getazuredatastudio) |
3030
| **Data Virtualization extension** | Yes | Extension for Azure Data Studio that provides a Data Virtualization wizard. | [Install](../azure-data-studio/data-virtualization-extension.md) |
3131
| **Azure CLI**<sup>2</sup> | For AKS | Modern command-line interface for managing Azure services. Used with AKS big data cluster deployments ([More info](https://docs.microsoft.com/cli/azure/?view=azure-cli-latest)). | [Install](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) |
32-
| **mssql-cli** | Optional | Modern command-line interface for querying SQL Server ([More info](https://github.com/dbcli/mssql-cli/blob/master/README.rst)). | [Windows](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/windows.md) \| [Linux](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/linux.md) |
32+
| **mssql-cli** | Optional | Modern command-line interface for querying SQL Server ([More info](../tools/mssql-cli.md)). | [Windows](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/windows.md) \| [Linux](https://github.com/dbcli/mssql-cli/blob/master/doc/installation/linux.md) |
3333
| **sqlcmd** | For some scripts | Legacy command-line tool for querying SQL Server ([More info](https://docs.microsoft.com/sql/tools/sqlcmd-utility?view=sql-server-ver15)). You might need to install the Microsoft ODBC Driver 11 for SQL Server before installing the SQLCMD package. | [Windows](https://www.microsoft.com/download/details.aspx?id=36433) \| [Linux](../linux/sql-server-linux-setup-tools.md) |
3434
| `curl` <sup>3</sup> | For some scripts | Command-line tool for transferring data with URLs. | [Windows](https://curl.haxx.se/windows/) \| Linux: install curl package |
3535

docs/connect/jdbc/application-security.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ permission java.net.SocketPermission "*", "listen, connect, accept";
5353
> The code "file:/install_dir/lib/-" refers to the installation directory of the JDBC driver.
5454
5555
## Protecting server communication
56-
When you use the JDBC driver to communicate with a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database, you can secure the communication channel by using either Internet Protocol Security (IPSEC) or Secure Sockets Layer (SSL); or you can use both.
56+
When you use the JDBC driver to communicate with a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database, you can secure the communication channel by using either Internet Protocol Security (IPSEC) or Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL); or you can use both.
5757

58-
SSL support can be used to provide an additional level of protection besides IPSEC. For more information about using SSL, see [Using SSL encryption](../../connect/jdbc/using-ssl-encryption.md).
58+
TLS support can be used to provide an additional level of protection besides IPSEC. For more information about using TLS, see [Using encryption](../../connect/jdbc/using-ssl-encryption.md).
5959

6060
## See also
6161
[Securing JDBC driver applications](../../connect/jdbc/securing-jdbc-driver-applications.md)

docs/connect/jdbc/fips-mode.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The Microsoft JDBC Driver for SQL Server supports running in JVMs configured to
1919
#### Prerequisites
2020

2121
- FIPS configured JVM
22-
- Appropriate SSL Certificate
22+
- Appropriate TLS/SSL Certificate
2323
- Appropriate policy files
2424
- Appropriate Configuration parameters
2525

@@ -32,11 +32,11 @@ To see the approved modules for FIPS Configuration, refer to [Validated Modules
3232
Vendors may have some additional steps to configure a JVM with FIPS.
3333

3434
## Appropriate SSL certificate
35-
In order to connect to SQL Server in FIPS mode, a valid SSL Certificate is required. Install or import it into the Java Key Store on the client machine (JVM) where FIPS is enabled.
35+
In order to connect to SQL Server in FIPS mode, a valid TLS/SSL Certificate is required. Install or import it into the Java Key Store on the client machine (JVM) where FIPS is enabled.
3636

3737
### Importing SSL certificate in Java keyStore
3838
For FIPS, most likely you need to import the certificate (.cert) in either PKCS or a provider-specific format.
39-
Use the following snippet to import the SSL certificate and store it in a working directory with the appropriate KeyStore format. _TRUST\_STORE\_PASSWORD_ is your password for Java KeyStore.
39+
Use the following snippet to import the TLS/SSL certificate and store it in a working directory with the appropriate KeyStore format. _TRUST\_STORE\_PASSWORD_ is your password for Java KeyStore.
4040

4141
```java
4242
public void saveGenericKeyStore(
@@ -66,7 +66,7 @@ private Certificate getCertificate(String pathName)
6666
}
6767
```
6868

69-
The following example is importing an Azure SSL Certificate in PKCS12 format with the BouncyCastle Provider. The certificate is imported in the working directory named _MyTrustStore\_PKCS12_ by using the following snippet:
69+
The following example is importing an Azure TLS/SSL Certificate in PKCS12 format with the BouncyCastle Provider. The certificate is imported in the working directory named _MyTrustStore\_PKCS12_ by using the following snippet:
7070

7171
`saveGenericKeyStore(BCFIPS, PKCS12, "SQLAzure SSL Certificate Name", "SQLAzure.cer");`
7272

docs/connect/jdbc/frequently-asked-questions-faq-for-jdbc-driver.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ The JDBC Drivers 6.0, 6.2, 6.4, and 7.0 are redistributable. Review the "Distrib
107107
**Can I use the driver to access Microsoft SQL Server from a Linux computer?**
108108
Yes! You can use the driver to access SQL Server from Linux, Unix, and other non-Windows platforms. For more information, see [Microsoft JDBC Driver for SQL Server Support Matrix](../../connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md).
109109

110-
**Does the driver support Secure Sockets Layer (SSL) encryption?**
111-
Starting with version 1.2, the driver supports Secure Sockets Layer (SSL) encryption. For more information, see [Using SSL Encryption](../../connect/jdbc/using-ssl-encryption.md).
110+
**Does the driver support TLS encryption?**
111+
Starting with version 1.2, the driver supports Transport Layer Security (TLS), previously known as Secure Sockets Layer (SSL), encryption. For more information, see [Using encryption](../../connect/jdbc/using-ssl-encryption.md).
112112

113113
**Which authentication types are supported by the Microsoft JDBC Driver for SQL Server?**
114114
The table below lists available authentication options. A pure Java Kerberos authentication is available starting with the 4.0 release of the driver.

0 commit comments

Comments
 (0)