Merge pull request #4423 from MicrosoftDocs/master

v-alje · web-flow · commit 7673ad0e84a6 · 2018-01-03T10:35:53.000-08:00
1/3 AM Publish
diff --git a/docs/integration-services/extending-packages-scripting/task/connecting-to-data-sources-in-the-script-task.md b/docs/integration-services/extending-packages-scripting/task/connecting-to-data-sources-in-the-script-task.md
@@ -55,51 +55,39 @@ ms.workload: "On Demand"
  The following example demonstrates how to access connection managers from within the Script task. The sample assumes that you have created and configured an [!INCLUDE[vstecado](../../../includes/vstecado-md.md)] connection manager named **Test ADO.NET Connection** and a Flat File connection manager named **Test Flat File Connection**. Note that the [!INCLUDE[vstecado](../../../includes/vstecado-md.md)] connection manager returns a **SqlConnection** object that you can use immediately to connect to the data source. The Flat File connection manager, on the other hand, returns only a string that contains the path and file name. You must use methods from the **System.IO** namespace to open and work with the flat file.  
   
 ```vb  
-Public Sub Main()  
-  
-    Dim myADONETConnection As SqlClient.SqlConnection  
-    myADONETConnection = _  
-        DirectCast(Dts.Connections("Test ADO.NET Connection").AcquireConnection(Dts.Transaction), _  
-        SqlClient.SqlConnection)  
-    MsgBox(myADONETConnection.ConnectionString, _  
-        MsgBoxStyle.Information, "ADO.NET Connection")  
-  
-    Dim myFlatFileConnection As String  
-    myFlatFileConnection = _  
-        DirectCast(Dts.Connections("Test Flat File Connection").AcquireConnection(Dts.Transaction), _  
-        String)  
-    MsgBox(myFlatFileConnection, MsgBoxStyle.Information, "Flat File Connection")  
-  
-    Dts.TaskResult = ScriptResults.Success  
-  
-End Sub  
+    Public Sub Main()
+
+        Dim myADONETConnection As SqlClient.SqlConnection =
+        DirectCast(Dts.Connections("Test ADO.NET Connection").AcquireConnection(Dts.Transaction),
+            SqlClient.SqlConnection)
+        MsgBox(myADONETConnection.ConnectionString,
+            MsgBoxStyle.Information, "ADO.NET Connection")
+
+        Dim myFlatFileConnection As String =
+        DirectCast(Dts.Connections("Test Flat File Connection").AcquireConnection(Dts.Transaction),
+            String)
+        MsgBox(myFlatFileConnection, MsgBoxStyle.Information, "Flat File Connection")
+
+        Dts.TaskResult = ScriptResults.Success
+
+    End Sub
 ```  
   
 ```csharp  
-using System;  
-using System.Data.SqlClient;  
-using Microsoft.SqlServer.Dts.Runtime;  
-using System.Windows.Forms;  
-  
-public class ScriptMain  
-{  
-  
-        public void Main()  
-        {  
-            SqlConnection myADONETConnection = new SqlConnection();  
-            myADONETConnection = (SqlConnection)(Dts.Connections["Test ADO.NET Connection"].AcquireConnection(Dts.Transaction)as SqlConnection);  
-            MessageBox.Show(myADONETConnection.ConnectionString, "ADO.NET Connection");  
-  
-            string myFlatFileConnection;  
-            myFlatFileConnection = (string)(Dts.Connections["Test Flat File Connection"].AcquireConnection(Dts.Transaction) as String);  
-            MessageBox.Show(myFlatFileConnection, "Flat File Connection");  
-  
-            Dts.TaskResult = (int)ScriptResults.Success;  
-  
-        }  
-  
-}  
-  
+		public void Main()
+		{
+            SqlConnection myADONETConnection = 
+                Dts.Connections["Test ADO.NET Connection"].AcquireConnection(Dts.Transaction)
+                as SqlConnection;
+            MessageBox.Show(myADONETConnection.ConnectionString, "ADO.NET Connection");
+
+            string myFlatFileConnection = 
+                Dts.Connections["Test Flat File Connection"].AcquireConnection(Dts.Transaction) 
+                as string;
+            MessageBox.Show(myFlatFileConnection, "Flat File Connection");
+
+            Dts.TaskResult = (int)ScriptResults.Success;
+		}
 ```  
   
 ## See Also  
diff --git a/docs/integration-services/integration-services-ssis-variables.md b/docs/integration-services/integration-services-ssis-variables.md
@@ -129,7 +129,17 @@ ms.workload: "Active"
  When the system resets the **IncludeInDebugDump** option to **false**, this might override the value selected by the user.  
   
 **Value**    
- The value of a user-defined variable can be a literal or an expression. A variable includes options for setting the variable value and the data type of the value. The two properties must be compatible: for example, the use of a string value together with an integer data type is not valid.  
+The value of a user-defined variable can be a literal or an expression. The value of a variable can't be null. Variables have the following default values:
+
+| Data type | Default value |
+|---|---|
+| Boolean | False |
+| Numeric and binary data types | 0 (zero) |
+| Char and string data types | (empty string) |
+| Object | System.Object |
+| | |
+
+A variable has options for setting the variable value and the data type of the value. The two properties must be compatible: for example, the use of a string value together with an integer data type is not valid.  
   
  If the variable is configured to evaluate as an expression, you must provide an expression. At run time, the expression is evaluated, and the variable is set to the evaluation result. For example, if a variable uses the expression `DATEPART("month", GETDATE())` the value of the variable is the number equivalent of the month for the current date. The expression must be a valid expression that uses the [!INCLUDE[ssIS](../includes/ssis-md.md)] expression grammar syntax. When an expression is used with variables, the expression can use literals and the operators and functions that the expression grammar provides, but the expression cannot reference the columns from a data flow in the package. The maximum length of an expression is 4000 characters. For more information, see [Integration Services &#40;SSIS&#41; Expressions](../integration-services/expressions/integration-services-ssis-expressions.md).  
   
diff --git a/docs/integration-services/lesson-1-6-adding-and-configuring-the-lookup-transformations.md b/docs/integration-services/lesson-1-6-adding-and-configuring-the-lookup-transformations.md
@@ -58,34 +58,11 @@ In both cases, the Lookup transformation will utilize the OLE DB connection mana
     2.  Select **Use results of an SQL query**, and then type or copy the following SQL statement:  
   
         ```sql
-        select * from (select * from [dbo].[DimCurrency]) as refTable  
-        where [refTable].[CurrencyAlternateKey] = 'ARS'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'AUD'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'BRL'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'CAD'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'CNY'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'DEM'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'EUR'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'FRF'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'GBP'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'JPY'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'MXN'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'SAR'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'USD'  
-        OR  
-        [refTable].[CurrencyAlternateKey] = 'VEB'  
+        SELECT * FROM [dbo].[DimCurrency]
+        WHERE [CurrencyAlternateKey]
+        IN ('ARS', 'AUD', 'BRL', 'CAD', 'CNY',
+            'DEM', 'EUR', 'FRF', 'GBP', 'JPY',
+	        'MXN', 'SAR', 'USD', 'VEB')
         ```  
   
 7.  On the **Columns** page, make the following selections:  
diff --git a/docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-configure.md b/docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-configure.md
@@ -175,7 +175,7 @@ On the NFS Server do the following:
 
 Do the following steps on all cluster nodes.
 
-1.	From the NFS server, install `nfs-utils`
+1.	Install `nfs-utils`
 
    ```bash
    sudo yum -y install nfs-utils
diff --git a/docs/relational-databases/indexes/columnstore-indexes-what-s-new.md b/docs/relational-databases/indexes/columnstore-indexes-what-s-new.md
@@ -50,7 +50,7 @@ ms.workload: "On Demand"
 |Compression delay option for columnstore indexes in `CREATE TABLE` and `ALTER TABLE`|||yes|yes|yes|yes|
 |Columnstore index can have a non-persisted computed column||||yes|||   
   
- <sup>1</sup> To create a readable nonclustered columnstore index, store the index on a read-only filegroup.  
+ <sup>1</sup> To create a read-only nonclustered columnstore index, store the index on a read-only filegroup.  
 
 ## [!INCLUDE[ssSQLv14_md](../../includes/sssqlv14-md.md)] 
  [!INCLUDE[ssSQLv14_md](../../includes/sssqlv14-md.md)] adds these new features.
diff --git a/docs/relational-databases/json/json-data-sql-server.md b/docs/relational-databases/json/json-data-sql-server.md
@@ -23,7 +23,7 @@ manager: "craigg"
 ms.workload: "Active"
 ---
 # JSON Data (SQL Server)
-[!INCLUDE[appliesto-ss-asdb-xxxx-xxx-md](../../includes/appliesto-ss-asdb-xxxx-xxx-md.md)]
+[!INCLUDE[appliesto-ss2016-asdb-xxxx-xxx-md.md](../../includes/appliesto-ss2016-asdb-xxxx-xxx-md.md)]
 
 JSON is a popular textual data format used for exchanging data in  modern web and mobile applications. JSON is  also used for storing unstructured data in log files or NoSQL databases like Microsoft Azure Cosmos DB. Many REST web services return results formatted as JSON text or accept data formatted as JSON. For example, most Azure services such as Azure Search, Azure Storage, and Azure Cosmos DB have REST endpoints that return or consume JSON. JSON is also the main format for exchanging data between web pages and web servers using AJAX calls.  
   
diff --git a/docs/relational-databases/lesson-1-create-stored-access-policy-and-shared-access-signature.md b/docs/relational-databases/lesson-1-create-stored-access-policy-and-shared-access-signature.md
@@ -113,21 +113,12 @@ To create a policy on container and generate a Shared Access Signature (SAS) key
   
     # Creates a new container in blob storage  
     $container = New-AzureStorageContainer -Context $storageContext -Name $containerName  
-    $cbc = $container.CloudBlobContainer  
   
     # Sets up a Stored Access Policy and a Shared Access Signature for the new container  
-    $permissions = $cbc.GetPermissions();  
-    $policyName = $policyName  
-    $policy = new-object 'Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPolicy'  
-    $policy.SharedAccessStartTime = $(Get-Date).ToUniversalTime().AddMinutes(-5)  
-    $policy.SharedAccessExpiryTime = $(Get-Date).ToUniversalTime().AddYears(10)  
-    $policy.Permissions = "Read,Write,List,Delete"  
-    $permissions.SharedAccessPolicies.Add($policyName, $policy)  
-    $cbc.SetPermissions($permissions);  
-  
+    $policy = New-AzureStorageContainerStoredAccessPolicy -Container $containerName -Policy $policyName -Context $storageContext -StartTime $(Get-Date).ToUniversalTime().AddMinutes(-5) -ExpiryTime $(Get-Date).ToUniversalTime().AddYears(10) -Permission rwld
+
     # Gets the Shared Access Signature for the policy  
-    $policy = new-object 'Microsoft.WindowsAzure.Storage.Blob.SharedAccessBlobPolicy'  
-    $sas = $cbc.GetSharedAccessSignature($policy, $policyName)  
+    $sas = New-AzureStorageContainerSASToken -name $containerName -Policy $policyName -Context $storageContext
     Write-Host 'Shared Access Signature= '$($sas.Substring(1))''  
   
     # Outputs the Transact SQL to the clipboard and to the screen to create the credential using the Shared Access Signature  
diff --git a/docs/relational-databases/sqlxml-annotated-xsd-schemas-xpath-queries/bulk-load-xml/guidelines-and-limitations-of-xml-bulk-load-sqlxml-4-0.md b/docs/relational-databases/sqlxml-annotated-xsd-schemas-xpath-queries/bulk-load-xml/guidelines-and-limitations-of-xml-bulk-load-sqlxml-4-0.md
@@ -168,7 +168,7 @@ ms.workload: "Inactive"
   
 -   SchemaGen only provides basic functionality for generating the relational schema from annotated XSD. The user should modify the generated tables manually, if needed.  
   
--   Where more than relationship exists between tables,SchemaGen tries to create a single relationship that includes all the keys involved between the two tables. This limitation might be the cause of a [!INCLUDE[tsql](../../../includes/tsql-md.md)] error.  
+-   Where more than one relationship exists between tables, SchemaGen tries to create a single relationship that includes all the keys involved between the two tables. This limitation might be the cause of a [!INCLUDE[tsql](../../../includes/tsql-md.md)] error.  
   
 -   When you are bulk loading XML data into a database, there must be at least one attribute or child element in the mapping schema that is mapped to a database column.  
   
diff --git a/docs/reporting-services/tools/rsconfig-utility-ssrs.md b/docs/reporting-services/tools/rsconfig-utility-ssrs.md
@@ -55,7 +55,7 @@ rsconfig {-?}
 |**-e**|Required if **-c** argument is not used.|Specifies the unattended report execution account.<br /><br /> This argument does not take a value. However, you must include additional arguments on the command line to specify that values that are encrypted in the configuration file.<br /><br /> Arguments that you can specify with **-e** include **-u** and **-p**. You can also set **-t**.|  
 |**-m**  *computername*|Required if you are configuring a remote report server instance.|Specifies the name of the computer that is hosting the report server. If this argument is omitted, the default is **localhost**.|  
 |**-s**  *servername*|Required.|Specifies the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instance that hosts the report server database.|  
-|**-i**  *instancename*|Required if you are using named instances.|If you used a named [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instance to host the report server database, this value specifies the named instance.|  
+|**-i**  *instancename*|Required if you are using named instances.|If you used a named Reporting Services instance, this value specifies the name of the Reporting Services instance.|  
 |**-d**  *databasename*|Required.|Specifies the name of the report server database.|  
 |**-a**  *authmethod*|Required.|Specifies the authentication method that the report server uses to connect to the report server database. Valid values are **Windows** or **SQL** (this argument is not case-sensitive).<br /><br /> **Windows** specifies that the report server use Windows Authentication.<br /><br /> **SQL** specifies that the report server use SQL Server Authentication.|  
 |**-u**  *[domain\\]username*|Required with **-e** Optional with **-c**.|Specifies a user account for the report server database connection or for the unattended account.<br /><br /> For **rsconfig -e**, this argument is required. It must be a domain user account.<br /><br /> For **rsconfig -c** and **-a SQL**, this argument must specify a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] login.<br /><br /> For **rsconfig -c** and **-a Windows**, this argument may specify a domain user, a built-in account, or service account credentials. If you are specifying a domain account, specify *domain* and *username* in the format *domain\username*. If you are using a built-in account, this argument is optional. If you want to use service account credentials, omit this argument.|  
@@ -75,9 +75,9 @@ rsconfig {-?}
   
 -   To configure a special account that the report server uses to log on to a remote database server when other credentials are not available.  
   
- You can run the**rsconfig** utility on a local or remote instance of [!INCLUDE[ssRSnoversion](../../includes/ssrsnoversion-md.md)]. You cannot use the **rsconfig** utility to decrypt and view values that are already set.  
+You can run the **rsconfig** utility on a local or remote instance of [!INCLUDE[ssRSnoversion](../../includes/ssrsnoversion-md.md)]. You cannot use the **rsconfig** utility to decrypt and view values that are already set.  
   
- Before you can run this utility, Windows Management Instrumentation (WMI) must be installed on the computer that you are configuring.  
+Before you can run this utility, Windows Management Instrumentation (WMI) must be installed on the computer that you are configuring.  
   
 ## Examples  
  The following examples illustrate ways of using **rsconfig**.  
diff --git a/docs/t-sql/language-elements/null-and-unknown-transact-sql.md b/docs/t-sql/language-elements/null-and-unknown-transact-sql.md
@@ -36,23 +36,23 @@ ms.workload: "On Demand"
   
 -   Null values cannot be used as information that is required to distinguish one row in a table from another row in a table, such as primary keys, or for information used to distribute rows, such as distribution keys.  
   
- When null values are present in data, logical and comparison operators can potentially return a third result of UNKNOWN instead of just TRUE or FALSE. This need for three-valued logic is a source of many application errors. These tables outline the effect of introducing null comparisons.  
+ When null values are present in data, logical and comparison operators can potentially return a third result of UNKNOWN instead of just TRUE or FALSE. This need for three-valued logic is a source of many application errors. Logical operators in a boolean expression that includes UNKNOWNs will return UNKNOWN unless the result of the operator does not depend on the UNKNOWN expression. These tables provide examples of this behavior.  
   
- The following table shows the results of applying an AND operator to two Boolean operands where one operand returns NULL.  
+ The following table shows the results of applying an AND operator to two Boolean expressions where one expression returns UNKNOWN.  
   
-|Operand 1|Operand 2|Result|  
+|Expression 1|Expression 2|Result|  
 |---------------|---------------|------------|  
-|TRUE|NULL|FALSE|  
-|NULL|NULL|FALSE|  
-|FALSE|NULL|FALSE|  
+|TRUE|UNKNOWN|UNKNOWN|  
+|UNKNOWN|UNKNOWN|UNKNOWN|  
+|FALSE|UNKNOWN|FALSE|  
   
- The following table shows the results of applying an OR operator to two Boolean operands where one operand returns NULL.  
+ The following table shows the results of applying an OR operator to two Boolean expressions where one expression returns UNKNOWN.  
   
-|Operand 1|Operand 2|Result|  
+|Expression 1|Expression 2|Result|  
 |---------------|---------------|------------|  
-|TRUE|NULL|TRUE|  
-|NULL|NULL|UNKNOWN|  
-|FALSE|NULL|UNKNOWN|  
+|TRUE|UNKNOWN|TRUE|  
+|UNKNOWN|UNKNOWN|UNKNOWN|  
+|FALSE|UNKNOWN|UNKNOWN|  
   
 ## See Also  
  [AND &#40;Transact-SQL&#41;](../../t-sql/language-elements/and-transact-sql.md)   
diff --git a/docs/t-sql/statements/bulk-insert-transact-sql.md b/docs/t-sql/statements/bulk-insert-transact-sql.md
@@ -332,7 +332,7 @@ Before [!INCLUDE[ssSQLv14_md](../../includes/sssqlv14-md.md)] CTP 1.1, comma-sep
  For more information about this and other security considerations for using BULK INSERT, see [Import Bulk Data by Using BULK INSERT or OPENROWSET&#40;BULK...&#41; &#40;SQL Server&#41;](../../relational-databases/import-export/import-bulk-data-by-using-bulk-insert-or-openrowset-bulk-sql-server.md).  
   
 ### Permissions  
- Requires INSERT and ADMINISTER BULK OPERATIONS permissions. Additionally, ALTER TABLE permission is required if one or more of the following is true:  
+ Requires INSERT and ADMINISTER BULK OPERATIONS permissions. In Azure SQL Database, INSERT and ADMINISTER DATABASE BULK OPERATIONS permissions are required. Additionally, ALTER TABLE permission is required if one or more of the following is true:  
   
 -   Constraints exist and the CHECK_CONSTRAINTS option is not specified.  
   
diff --git a/docs/t-sql/statements/create-symmetric-key-transact-sql.md b/docs/t-sql/statements/create-symmetric-key-transact-sql.md
@@ -122,7 +122,7 @@ Specify the encrypting algorithm.
  When a symmetric key is created, the symmetric key must be encrypted by using at least one of the following: certificate, password, symmetric key, asymmetric key, or PROVIDER. The key can have more than one encryption of each type. In other words, a single symmetric key can be encrypted by using multiple certificates, passwords, symmetric keys, and asymmetric keys at the same time.  
   
 > [!CAUTION]  
->  When a symmetric key is encrypted with a password instead of the public key of the database master key, the TRIPLE DES encryption algorithm is used. Because of this, keys that are created with a strong encryption algorithm, such as AES, are themselves secured by a weaker algorithm.  
+>  When a symmetric key is encrypted with a password instead of a certificate (or another key), the TRIPLE DES encryption algorithm is used to encrypt the password. Because of this, keys that are created with a strong encryption algorithm, such as AES, are themselves secured by a weaker algorithm.  
   
  The optional password can be used to encrypt the symmetric key before distributing the key to multiple users.  
   
