Resolve syncing conflicts from live-sync-work to live

articles/includes/code/dotnet-input-hints.cs

@@ -22,33 +22,33 @@ public async Task OnTurn(ITurnContext context)
             if (context.Activity.Type == ActivityTypes.Message)
             {
                 {
-                    // <InputHintAcceptingInput>
+                    // <Accepting input>
                     var reply = MessageFactory.Text(
                         "This is the text that will be displayed.",
                         "This is the text that will be spoken.",
                         InputHints.AcceptingInput);
                     await context.SendActivity(reply).ConfigureAwait(false);
-                    // </InputHintAcceptingInput>
+                    // </Accepting input>
                 }
                 {
-                    // <InputHintExpectingInput>
+                    // <Expecting input>
                     var reply = MessageFactory.Text(
                         "This is the text that will be displayed.",
                         "This is the text that will be spoken.",
                         InputHints.ExpectingInput);
                     await context.SendActivity(reply).ConfigureAwait(false);
-                    // </InputHintExpectingInput>
+                    // </Expecting input>
                 }
                 {
-                    // <InputHintIgnoringInput>
+                    // <Ignoring input>
                     var reply = MessageFactory.Text(
                         "This is the text that will be displayed.",
                         "This is the text that will be spoken.",
                         InputHints.IgnoringInput);
                     await context.SendActivity(reply).ConfigureAwait(false);
-                    // </InputHintIgnoringInput>
+                    // </Ignoring input>
                 }
             }
         }
     }
-}
+}

articles/javascript/bot-builder-javascript-quickstart.md

@@ -28,10 +28,6 @@ This quickstart walks you through building a bot by using the Yeoman Bot Builder
 > For some installations the install step for restify is giving an error related to node-gyp.
 > If this is the case try running `npm install -g windows-build-tools`.
 
-> [!NOTE]
-> For some installations the install step for restify is giving an error related to node-gyp.
-> If this is the case try running `npm install -g windows-build-tools`.
-
 
 The Bot Builder SDK for JavaScript consists of a series of [packages](https://github.com/Microsoft/botbuilder-js/tree/master/libraries) which can be installed from NPM using a special `@preview` tag.
 

articles/v4sdk/bot-builder-howto-add-input-hints.md

@@ -47,7 +47,13 @@ To indicate that your bot is passively ready for input but is not awaiting a res
 
 # [C#](#tab/cs)
 
-[!code-csharp[Accepting input](~/includes/code/dotnet-input-hints.cs?name=Accepting&highlight=4)]
+```csharp
+var reply = MessageFactory.Text(
+    "This is the text that will be displayed.",
+    "This is the text that will be spoken.",
+    InputHints.AcceptingInput);
+await context.SendActivity(reply).ConfigureAwait(false);
+```
 
 # [JavaScript](#tab/js)
 
@@ -64,7 +70,13 @@ To indicate that your bot is awaiting a response from the user, set the message'
 
 # [C#](#tab/cs)
 
-[!code-csharp[Expecting input](~/includes/code/dotnet-input-hints.cs?name=Expecting&highlight=4)]
+```csharp
+var reply = MessageFactory.Text(
+    "This is the text that will be displayed.",
+    "This is the text that will be spoken.",
+    InputHints.ExpectingInput);
+await context.SendActivity(reply).ConfigureAwait(false);
+```
 
 # [JavaScript](#tab/js)
 
@@ -81,7 +93,13 @@ To indicate that your bot is not ready to receive input from the user, set the m
 
 # [C#](#tab/cs)
 
-[!code-csharp[Ignoring input](~/includes/code/dotnet-input-hints.cs?name=Ignoring&highlight=4)]
+```csharp
+var reply = MessageFactory.Text(
+    "This is the text that will be displayed.",
+    "This is the text that will be spoken.",
+    InputHints.IgnoringInput);
+await context.SendActivity(reply).ConfigureAwait(false);
+```
 
 # [JavaScript](#tab/js)