Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into apache-domain-joined

Author: ShannonLeavitt

.openpublishing.redirection.json

@@ -35643,6 +35643,11 @@
       "redirect_url": "/azure/key-vault/vs-key-vault-add-connected-service",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/iot-central/howto-generate-connection-string.md",
+      "redirect_url": "/azure/iot-central",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/iot-central/howto-create-application.md",
       "redirect_url": "/azure/iot-central/quick-deploy-iot-central",

articles/api-management/api-management-sample-flexible-throttling.md

@@ -25,7 +25,7 @@ To date, the rate throttling capabilities have been limited to being scoped to a
 
 ## Custom key based throttling
 
-> NOTE:
+> [!NOTE]
 > The `rate-limit-by-key` and `quota-by-key` policies are not available when in the Consumption tier of Azure API Management. 
 
 The new [rate-limit-by-key](/azure/api-management/api-management-access-restriction-policies#LimitCallRateByKey) and [quota-by-key](/azure/api-management/api-management-access-restriction-policies#SetUsageQuotaByKey) policies provide a more flexible solution to traffic control. These new policies allow you to define expressions to identify the keys that are used to track traffic usage. The way this works is easiest illustrated with an example. 

articles/azure-cache-for-redis/cache-overview.md

@@ -4,12 +4,11 @@ description: Learn what Azure Cache for Redis is and how it is commonly used.
 services: cache
 documentationcenter: ''
 author: yegu-ms
-manager: jhubbard
+manager: martinekuan
 editor: ''
 ms.service: cache
 ms.workload: tbd
 ms.tgt_pltfrm: cache
-ms.devlang: na
 ms.topic: overview
 ms.date: 03/26/2018
 ms.author: yegu

articles/backup/backup-azure-sap-hana-database.md

@@ -23,8 +23,8 @@ ms.author: dacurwin
 **Support** | **Details**
 --- | ---
 **Supported geos** | Australia South East, East Australia <br> Brazil South <br> Canada Central, Canada East <br> South East Asia, East Asia <br> East US, East US 2, West Central US, West US, West US 2, North Central US, Central US, South Central US<br> India Central, India South <br> Japan East, Japan West<br> Korea Central, Korea South <br> North Europe, West Europe <br> UK South, UK West
-**Supported VM operating systems** | SLES 12 with SP2 or SP3.
-**Supported HANA versions** | SDC on HANA 1.x, MDC on HANA 2.x <= SPS03
+**Supported VM operating systems** | SLES 12 with SP2, SP3 or SP4.
+**Supported HANA versions** | SDC on HANA 1.x, MDC on HANA 2.x <= SPS04 Rev 42
 
 ### Current limitations
 

articles/cognitive-services/LUIS/luis-reference-prebuilt-domains.md

@@ -51,10 +51,10 @@ Calendar is anything about personal meetings and appointments, NOT public event
 Intent Name | Description | Examples
 ---------|----------|---------------
  AcceptEventEntry | Accept a(n) appointment/meeting/event on calendar. | Accept an appointment. <br> Accept the event <br> accept today's meeting.
- Cancel | Cancel the ongoing action by virtual assistant, such as canceling the process of creating a meeting. <br> ***Notice**: This intent mainly includes "Cancel" action in Calendar scenario. If you need general expression on "Cancel", please leverage "Cancel" intent in **Utilities** domain.* | It's ok, just cancel the event. <br> No, I just cancel the appointment.
+ Cancel | Cancel the ongoing action by virtual assistant, such as canceling the process of creating a meeting. <br> _**Notice**: This intent mainly includes "Cancel" action in Calendar scenario. If you need general expression on "Cancel", please leverage "Cancel" intent in **Utilities** domain._ | It's ok, just cancel the event. <br> No, I just cancel the appointment.
  ChangeCalendarEntry | Change or reschedule the calendar entry. | Reschedule my 6 a.m. appointment tomorrow to 2 p.m. <br> Reschedule doctor's appointment for 5 PM <br> Reschedule lunch with jenny olson to Friday. <br> Change event time.
  CheckAvailability | Find availability for an appointment or meeting on the user's calendar or another person's calendar. | When is Jim available to meet? <br> Show when Carol is available tomorrow. <br> Is Chris free on Saturday?
- Confirm | Confirm whether to perform an operation/action based on previous intent. <br> ***Notice**: This intent mainly includes "Confirm" action for Calendar scenario. If you need more general expressions on "Confirm", please leverage "Confirm" intent in **Utilities** domain.*| That's correct, please create the meeting <br> Yes, thanks, connect to the meeting.
+ Confirm | Confirm whether to perform an operation/action based on previous intent. <br> _**Notice**: This intent mainly includes "Confirm" action for Calendar scenario. If you need more general expressions on "Confirm", please leverage "Confirm" intent in **Utilities** domain._| That's correct, please create the meeting <br> Yes, thanks, connect to the meeting.
  ConnectToMeeting | Connect to a meeting. | Connect me to 11:00 conference call with Andy. <br> Accept the budget meeting call.
  ContactMeetingAttendees | Contact to the meeting attendees. | Tell the meeting I am running late to 3:00 meeting. <br> Notify colleagues for 8 am meeting that it needs to start at 8:30.
  CreateCalendarEntry | Add a new one-time item to the calendar. | Create a meeting about discussing issues. <br> create a meeting with [email protected]
@@ -66,10 +66,10 @@ Intent Name | Description | Examples
  FindCalendarDetail | Check and show the details for the schedule. | I need you to provide me the details of the meeting I have scheduled with my colleague Paul.
  FindDuration | Check the duration. | How much time will I have to pick up groceries? <br> How long do I have for lunch?
  FindMeetingRoom | Find the available meeting rooms. | What meet rooms do I have? <br> A new meeting location, find one.
- GoBack | Go back to last step or item.  <br> ***Notice**: Please refer to **Utilities** domain for more GoBack general utterances.* | Previous one <br> Back to last email.
- Reject | The user rejects what virtual assistant proposed. <br> ***Notice**: Please refer to **Utilities** domain for more Reject general utterances.* | Not need to set the event. <br> I have other things to do at that time.
-ShowNext | Check the next event. <br> ***Notice**: Please refer to **Utilities** domain for more ShowNext general utterances.* | Give me my next event. <br> What is next in calendar?
- ShowPrevious | Check the previous event. <br> ***Notice**: Please refer to **Utilities** domain for more ShowPrevious general utterances.* | What is the schedule before that?
+ GoBack | Go back to last step or item.  <br> _**Notice**: Please refer to **Utilities** domain for more GoBack general utterances._ | Previous one <br> Back to last email.
+ Reject | The user rejects what virtual assistant proposed. <br> _**Notice**: Please refer toC **Utilities** domain for more Reject general utterances._ | Not need to set the event. <br> I have other things to do at that time.
+ShowNext | Check the next event. <br> _**Notice**: Please refer to **Utilities** domain for more ShowNext general utterances._ | Give me my next event. <br> What is next in calendar?
+ ShowPrevious | Check the previous event. <br> _**Notice**: Please refer to **Utilities** domain for more ShowPrevious general utterances._ | What is the schedule before that?
  TimeRemaining | Check the remaining time until next event. | Display how much time i have before my meetings. <br> Display the amount of time I have before my next meeting begins.
 
 ### **Entities**

articles/iot-central/TOC.yml

@@ -35,8 +35,6 @@
   items:
   - name : Connect devices
     items:
-      - name: Generate a device connection string
-        href: howto-generate-connection-string.md
       - name: Prepare and connect a Node.js (generic) application 
         href: howto-connect-nodejs.md
       - name: Prepare and connect an MXChip IoT DevKit

articles/iot-central/concepts-connectivity-pnp.md

@@ -29,15 +29,18 @@ Using DPS enables:
 
 This article describes the following use cases:
 
-1. [Quickly connect a single device using SAS](#connect-a-single-device)
-1. [Connect devices at scale using SAS](#connect-devices-at-scale-using-sas)
-1. [Connect devices at scale using X.509 certificates](#connect-devices-using-x509-certificates) this is the recommended approach for production environments.
-1. [Connect without first registering devices](#connect-without-registering-devices)
-1. [Connect devices using IoT Plug and Play features](howto-connect-pnp-device-pnp.md?toc=/azure/iot-central-pnp/toc.json&bc=/azure/iot-central-pnp/breadcrumb/toc.json)
+- [Quickly connect a single device using SAS](#connect-a-single-device)
+- [Connect devices at scale using SAS](#connect-devices-at-scale-using-sas)
+- [Connect devices at scale using X.509 certificates](#connect-devices-using-x509-certificates) this is the recommended approach for production environments.
+- [Connect without first registering devices](#connect-without-registering-devices)
+- [Connect devices using IoT Plug and Play features](howto-connect-pnp-device-pnp.md?toc=/azure/iot-central-pnp/toc.json&bc=/azure/iot-central-pnp/breadcrumb/toc.json)
 
 ## Connect a single device
 
-This approach is useful when you're experimenting with IoT Central or testing devices. You can use the device connection information from your IoT Central application to generate the connection string for a device. For detailed steps, see [How to generate a device connection string to connect to an Azure IoT Central application](howto-generate-connection-string.md?toc=/azure/iot-central-pnp/toc.json&bc=/azure/iot-central-pnp/breadcrumb/toc.json).
+This approach is useful when you're experimenting with IoT Central or testing devices. You can use the device connection information from your IoT Central application to connect a device to your IoT Central application using the Device Provisioning Service (DPS). You can find sample DPS device client code for the following languages:
+
+- [C\#](https://github.com/Azure-Samples/azure-iot-samples-csharp/tree/master/provisioning/Samples/device)
+- [Node.js](https://github.com/Azure-Samples/azure-iot-samples-node/tree/master/provisioning/Samples/device)
 
 ## Connect devices at scale using SAS
 
@@ -186,8 +189,6 @@ The Azure Device SDKs offer the easiest way for you implement your device code.
 - [Azure IoT SDK for Java](https://github.com/azure/azure-iot-sdk-java)
 - [Azure IoT SDK for .NET](https://github.com/azure/azure-iot-sdk-csharp)
 
-Each device connects using a unique connection string that identifies the device. A device can only connect to the IoT hub where it's registered. When you create a real device in your Azure IoT Central application, the application generates the information you need to construct a connection string using `dps-keygen`.
-
 ### SDK features and IoT Hub connectivity
 
 All device communication with IoT Hub uses the following IoT Hub connectivity options:

articles/iot-central/concepts-connectivity.md

@@ -29,14 +29,17 @@ Using DPS enables:
 
 This article describes the following four use cases:
 
-1. [Quickly connect a single device using SAS](#connect-a-single-device)
-1. [Connect devices at scale using SAS](#connect-devices-at-scale-using-sas)
-1. [Connect devices at scale using X.509 certificates](#connect-devices-using-x509-certificates) this is the recommended approach for production environments.
-1. [Connect without first registering devices](#connect-without-registering-devices)
+- [Quickly connect a single device using SAS](#connect-a-single-device)
+- [Connect devices at scale using SAS](#connect-devices-at-scale-using-sas)
+- [Connect devices at scale using X.509 certificates](#connect-devices-using-x509-certificates) this is the recommended approach for production environments.
+- [Connect without first registering devices](#connect-without-registering-devices)
 
 ## Connect a single device
 
-This approach is useful when you're experimenting with IoT Central or testing devices. You can use the device connection information from your IoT Central application to generate the connection string for a device. For detailed steps, see [How to generate a device connection string to connect to an Azure IoT Central application](howto-generate-connection-string.md).
+This approach is useful when you're experimenting with IoT Central or testing devices. You can use the device connection information from your IoT Central application to connect a device to your IoT Central application using the Device Provisioning Service (DPS). You can find sample DPS device client code for the following languages:
+
+- [C\#](./howto-connect-raspberry-pi-csharp.md)
+- [Node.js](./howto-connect-nodejs.md)
 
 ## Connect devices at scale using SAS
 
@@ -159,8 +162,6 @@ The Azure Device SDKs offer the easiest way for you implement your device code.
 - [Azure IoT SDK for Java](https://github.com/azure/azure-iot-sdk-java)
 - [Azure IoT SDK for .NET](https://github.com/azure/azure-iot-sdk-csharp)
 
-Each device connects using a unique connection string that identifies the device. A device can only connect to the IoT hub where it's registered. When you create a real device in your Azure IoT Central application, the application generates the information you need to construct a connection string using `dps-keygen`.
-
 ### SDK features and IoT Hub connectivity
 
 All device communication with IoT Hub uses the following IoT Hub connectivity options: