Merge pull request #6896 from maggiesMSFT/ms-rs-820-cleanup

Ms rs 820 cleanup

Author: TrishaMc

.openpublishing.redirection.json

@@ -185,19 +185,24 @@
             "redirect_url": "/sql/reporting-services/report-design/filter-group-and-sort-data-report-builder-and-ssrs",
             "redirect_document_id": true
         },
+        {
+            "source_path": "docs/reporting-services/report-data/enter-data-source-credentials-dialog-box-report-builder.md",
+            "redirect_url": "/sql/reporting-services/report-data/specify-credential-and-connection-information-for-report-data-sources",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/reporting-services/extensions/data-processing/removing-a-data-processing-extension.md",
-            "redirect_url": "/sql/reporting-services/extensions/reporting-services-extensions?view=sql-server-2017",
+            "redirect_url": "/sql/reporting-services/extensions/reporting-services-extensions",
             "redirect_document_id": true
         },
         {
             "source_path": "docs/reporting-services/extensions/delivery-extension/implementing-the-isubscriptionbaseuiusercontrol-interface.md",
-            "redirect_url": "/sql/reporting-services/extensions/delivery-extension/implementing-a-delivery-extension?view=sql-server-2017",
+            "redirect_url": "/sql/reporting-services/extensions/delivery-extension/implementing-a-delivery-extension",
             "redirect_document_id": true
         },
         {
             "source_path": "docs/reporting-services/extensions/delivery-extension/using-the-ideliveryreportserverinformation-interface-for-a-delivery-extension.md",
-            "redirect_url": "/sql/reporting-services/extensions/delivery-extension/implementing-a-delivery-extension?view=sql-server-2017",
+            "redirect_url": "/sql/reporting-services/extensions/delivery-extension/implementing-a-delivery-extension",
             "redirect_document_id": false
         },
         {

docs/reporting-services/report-data/create-a-shared-dataset-or-embedded-dataset-report-builder-and-ssrs.md

@@ -21,15 +21,19 @@ manager: "kfile"
 # Create a Shared Dataset or Embedded Dataset (Report Builder and SSRS)
 Embedded datasets are for use in a single [!INCLUDE[ssRSnoversion_md](../../includes/ssrsnoversion-md.md)] report. Shared datasets on a report server can be used by multiple reports, both mobile and paginated. To create a dataset, you need an embedded or shared data source.  
 
- Use **Report Builder** for the following tasks:  
+## Report Builder tasks
+
+Use Report Builder for the following tasks:  
 
 1.  Create a shared dataset in Dataset Design View. Shared datasets must use published shared data sources.  
 
 2.   Create an embedded dataset in Report Design View.  
 
 3.   Save the dataset directly to the report server or SharePoint site.  
 
- Use **Report Designer** in [!INCLUDE[ssBIDevStudioFull](../../includes/ssbidevstudiofull-md.md)] for the following tasks:  
+## Report Designer tasks
+
+Use Report Designer in [!INCLUDE[ssBIDevStudioFull](../../includes/ssbidevstudiofull-md.md)] for the following tasks:  
 
 1.  Create a shared dataset in Solution Explorer. Shared datasets must use data sources from the Shared Data Sources folder in Solution Explorer.  
 
@@ -42,7 +46,7 @@ Embedded datasets are for use in a single [!INCLUDE[ssRSnoversion_md](../../incl
 > [!NOTE]  
 >  [!INCLUDE[ssRBRDDup](../../includes/ssrbrddup-md.md)]  
   
-## To open Report Builder and create a shared dataset  
+## To create a shared dataset in Report Builder
 
 1.  Open Report Builder. The **New report or dataset pane** opens, as shown in the following figure:  
 

docs/reporting-services/report-data/data-connections-data-sources-and-connection-strings-report-builder-and-ssrs.md

@@ -1,7 +1,7 @@
 ---
 title: "Data Connections, Data Sources, Connection Strings-Report Builder-SSRS | Microsoft Docs"
 ms.custom: ""
-ms.date: "09/20/2017"
+ms.date: "08/21/2018"
 ms.prod: reporting-services
 ms.prod_service: "reporting-services-sharepoint, reporting-services-native"
 ms.component: "report-data"
@@ -24,9 +24,21 @@ manager: "kfile"
 
   To include data in [!INCLUDE[ssRBnoversion](../../includes/ssrbnoversion.md)] and  [!INCLUDE[ssRSnoversion](../../includes/ssrsnoversion-md.md)] paginated reports, you must first create *data sources* and *datasets*. This topic explains the type of data sources, how to create data sources, and important information related to data source credentials. A data source includes the data source type, connection information, and the type of credentials to use. There are two types of data sources: embedded and shared. An embedded data source is defined in the report and used only by that report. A shared data source is defined independently from a report and can be used by multiple reports. For more information, see [Embedded and Shared Datasets (Report Builder and SSRS)](../../reporting-services/report-data/embedded-and-shared-datasets-report-builder-and-ssrs.md).  
 
-> [!NOTE]  
->  [!INCLUDE[ssRBRDDup](../../includes/ssrbrddup-md.md)]
+## Data in [!INCLUDE[ssRBnoversion](../../includes/ssrbnoversion.md)]  
+ ![rs_DataSourcesStory](../../reporting-services/report-data/media/rs-datasourcesstory.gif "rs_DataSourcesStory")  
+  
+1.  **Data sources in the Report Data pane** A data source appears in the Report Data pane after you create an embedded data source or add a shared data source.  
+  
+2.  **Connection Dialog Box** Use the Connection Dialog Box to build a connection string or to paste a connection string.  
+  
+3.  **Data connection information** The connection string is passed to the data extension.  
 
+4.  **Credentials** Credentials are managed separately from the connection string.  
+  
+5.  **Data Extension/Data Provider** Connecting to the data can be through multiple data access layers.  
+  
+6.  **External data sources** Retrieve data from relational databases, multidimensional data bases, SharePoint lists, Web services, or report models.  
+
 ##  <a name="bkmk_data_sources"></a> Embedded and shared data sources  
  Shared data sources are useful when you have data sources that you use often. It is recommended that you use shared data sources as much as possible. They make reports and report access easier to manage, and help to keep reports and the data sources they access more secure. If you need a shared data source, ask your system administrator to create one for you.  
 
@@ -83,21 +95,6 @@ manager: "kfile"
 
  For a full list of data sources and versions [!INCLUDE[ssRSnoversion](../../includes/ssrsnoversion-md.md)] supports, see [Data Sources Supported by Reporting Services &#40;SSRS&#41;](../../reporting-services/report-data/data-sources-supported-by-reporting-services-ssrs.md).  
 
-## Data in [!INCLUDE[ssRBnoversion](../../includes/ssrbnoversion.md)]  
- ![rs_DataSourcesStory](../../reporting-services/report-data/media/rs-datasourcesstory.gif "rs_DataSourcesStory")  
-  
-1.  **Data sources in the Report Data pane** A data source appears in the Report Data pane after you create an embedded data source or add a shared data source.  
-  
-2.  **Connection Dialog Box** Use the Connection Dialog Box to build a connection string or to paste a connection string.  
-  
-3.  **Data connection information** The connection string is passed to the data extension.  
-  
-4.  **Credentials** Credentials are managed separately from the connection string.  
-  
-5.  **Data Extension/Data Provider** Connecting to the data can be through multiple data access layers.  
-  
-6.  **External data sources** Retrieve data from relational databases, multidimensional data bases, SharePoint lists, Web services, or report models.  
-  
 ##  <a name="bkmk_connection_examples"></a> Common connection string examples  
  Connection strings are the text representation of connection properties for a data provider. The following table lists examples of connections strings for various data connection types.  
 

docs/reporting-services/report-data/dataset-properties-dialog-box-query-report-builder.md

@@ -52,19 +52,19 @@ Select **Query** on the **Dataset Properties** dialog box to choose a shared dat
  This option appears when you choose the **Text** command type option. Type a query or import a pre-existing query by clicking **Import**. Click the **Expression** (*fx*) button to edit the expression.  
 
 > [!NOTE]  
->  If you used a query designer to build a query, the text of the query appears in this box.  
+>  If you use a query designer to build a query, the text of the query appears in this box.  
   
- **Table name**  
- Enter the name of the table that you want to use as a dataset. This option appears when you select **Table**.  
+**Table name**  
+This option appears when you select **Table**. Enter the name of the table that you want to use as a dataset.   
 
- **Select or enter stored procedure name**  
- Type or choose the name of the stored procedure that you want to use. Click the **Expression** (*fx*) button to edit the expression. This option appears when you choose the Stored Procedure command type option.  
+**Select or enter stored procedure name**  
+This option appears when you choose the Stored Procedure command type option. Type or choose the name of the stored procedure that you want to use. Click the **Expression** (*fx*) button to edit the expression.   
 
  **Time out (in seconds)**  
  Type the number of seconds until the query times out. The default is 30 seconds. The value for **Time out** must be empty or greater than zero. If it is empty, the query does not time out.  
 
  **Refresh Fields**  
- Run the query command to update the list of fields in the [Dataset Properties Dialog Box, Fields](http://msdn.microsoft.com/library/75c7e54a-3d20-4c9a-88da-ab36dce2ce42) page.  
+ Run the query command to update the list of fields in the **Dataset Properties Dialog Box, Fields**page.  
 
 ## See Also  
 [Report Embedded Datasets and Shared Datasets (Report Builder and SSRS)](../../reporting-services/report-data/report-embedded-datasets-and-shared-datasets-report-builder-and-ssrs.md).  

docs/reporting-services/report-data/enter-data-source-credentials-dialog-box-report-builder.md

@@ -55,7 +55,7 @@ manager: "kfile"
 
      These credentials are used by the report server to make a data connection to the external data source. For some types of data sources, credentials can be stored securely on the report server. These credentials enable other users to run the report without providing credentials for the underlying data connection.  
 
--   Data source credentials that you enter in the [Enter Data Source Credentials Dialog Box (Report Builder)](../../reporting-services/report-data/enter-data-source-credentials-dialog-box-report-builder.md) when you run a dataset query, refresh dataset fields, or preview the report.  
+-   Data source credentials that you enter in the **Enter Data Source Credentials** Dialog Box when you run a dataset query, refresh dataset fields, or preview the report.  
 
      These credentials are used to make a data connection from Report Builder to the external data source, or to preview a report that is configured to prompt for credentials. Credentials that you enter in this dialog box are not stored on the report server and are not available for use by other users. Report Builder caches the credentials during the report editing session so that you do not need to enter them every time you run the query or preview the report.  
 

docs/reporting-services/report-data/specify-credential-and-connection-information-for-report-data-sources.md

@@ -69,8 +69,6 @@
   href: store-credentials-in-a-reporting-services-data-source.md
 - name: Update Credentials in Report Data Sources from a SharePoint Site
   href: update-credentials-in-report-data-sources-from-a-sharepoint-site.md
-- name: Enter Data Source Credentials Dialog Box
-  href: enter-data-source-credentials-dialog-box-report-builder.md
 - name: Specify Connections for Custom Data Processing Extensions
   href: specify-connections-for-custom-data-processing-extensions.md
 - name: Bind a Report or Model to a Shared Data Source

docs/reporting-services/report-data/toc.yml

@@ -43,7 +43,7 @@ For data sources with prompted credentials or credentials specified in the conne
 Verify that the password does not include special characters. If changing the password is impractical, work with your database administrator to store the appropriate credentials locally and on the server as part of a system ODBC data source name (DSN). For more information, see "OdbcConnection.ConnectionString" in the .NET Framework SDK documentation on MSDN.   
 
 > [!NOTE]  
->It is recommended that you do not add login information such as passwords to the connection string. Report Designer provides a **Credentials** page on the [Data Source Properties](~/reporting-services/report-data/enter-data-source-credentials-dialog-box-report-builder.md) or the [Shared Data Source Properties dialog boxes](~/reporting-services/report-data/enter-data-source-credentials-dialog-box-report-builder.md) that you can use to enter credentials. These credentials are stored securely on the report authoring computer.  
+>It is recommended that you do not add login information such as passwords to the connection string. Report Designer provides a **Credentials** page on the **Data Source Properties** or the **Shared Data Source Properties** dialog boxes that you can use to enter credentials. These credentials are stored securely on the report authoring computer.  
   
 ## Why do I see no data when I run my query in the query designer?  
 When you create a dataset, the dataset field collection appears in the Report Data pane. Sometimes the dataset field collection does not appear as expected.