Resolve syncing conflicts from live-sync-work to live #1449
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-Authored-By: Emily Olshefski <emilygraceolshefski@gmail.com>
Co-Authored-By: Emily Olshefski <emilygraceolshefski@gmail.com>
openpublishbuild
pushed a commit
that referenced
this pull request
Nov 26, 2019
nt-7
pushed a commit
to nt-7/bot-docs
that referenced
this pull request
Nov 27, 2021
* merge master into community-content (#1007) * Sync community content branch (#1006) * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1008) * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1013) * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1028) * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1033) * Fix git push error for protected CLA branch (#1075) * Fix git push error for protected CLA branch (#1080) * Adding support statement for regional LUIS apps (MicrosoftDocs#224) Customers requesting official documentation of lack of support for non US LUIS apps for speech priming feature for EU due to GDPR requirements to keep data in EU and no workaround currently available. * Update tutorial doc (MicrosoftDocs#240) inserted line 74, as missing it in the global.asax.cs file causes a 404 error for customers. * Update bot-builder-dotnet-sdk-quickstart.md * Update bot-builder-basics.md (MicrosoftDocs#314) Incorporate feedback from the grammar checking bot while making the sentence more precise at the same time. * Update bot-builder-basics.md (MicrosoftDocs#317) Incorporate grammar bot feedback. * Update bot-builder-concept-middleware.md (MicrosoftDocs#318) Typo. Replace "alos" with "also" * Update bot-builder-howto-v4-state.md 1. Fixed code to use variables than hardcoded string in Startup.cs, variables were defined but not used previously. 2. Fixed typo Modift -> Modify * Update bot-service-quickstart.md updated to indicate that placing resources within the same region should be preferred * Update node-send-card-buttons.js Add a line of code to actually send the message as well. * Misspell (MicrosoftDocs#386) * typo : Double Use of words (MicrosoftDocs#374) Fixing the typo double use of 'to', 'the' Fixing typo of 'teh' * Correcting typo (MicrosoftDocs#341) Typo in header, assuming it should be using instead of usubg * Resolution for grammar issue #294 (MicrosoftDocs#340) * typo: teh -> the (MicrosoftDocs#321) * Update bot-builder-concept-luis.md (MicrosoftDocs#380) Fixed the missing links for speech and LUIS. * Typo dd => add * Update image alignment in bot-builder-dotnet-sqk-quickstart.md * Update bot-service-design-pattern-knowledge-base.md The link was redirecting to the v3 bot builder templates which was missing the context of the paragraph. * fix formatting and typo * Resolve syncing conflicts from live-sync-work to live * Update README.md "About your contributions to Bot Framework content" link updated * add additional fixes to this file * Resolve syncing conflicts from live-sync-work to live (MicrosoftDocs#399) * Release 'live' 10-13-2018 (MicrosoftDocs#1003) * Release 'live' 10-15-2018 (#1011) * Release 'live' 10-17-2018 (#1012) * Release 'live' 10-18-2018 (#1016) * Update bot-framework-rest-direct-line-3-0-api-reference.md (MicrosoftDocs#431) Add a comment about max activity size. * Update bot-builder-enterprise-template-deployment.md (MicrosoftDocs#427) Added solution for common MSA app provisioning error. * Update command to create metadata for qna maker (MicrosoftDocs#405) Previous command does not work. We should put one space. * Wrongly used MD h2 title at "usage" section (MicrosoftDocs#432) Missing a space behind the second # at the "usage" section. The h2 style isn't rendered. By adding a space behind ## it renders the title as an h2. * Moved language-agnostic instruction (MicrosoftDocs#460) This snippet fell under a C# specific snippet, which made it unclear that it also applies to Node: "The `botFilePath` references the name of your bot, simply replace "yourbasicBot.bot" with your own bot name. To obtain the `botFileSecret` key, refer to [Bot File Encryption](https://aka.ms/bot-file-encryption) article on generating a key for your bot." * Add "Dialog Lifecycle" header (MicrosoftDocs#454) The documentation opens with an overview and then flows right into discussing dialog lifecycle. I think adding a header would be a good to break that up and call more attention to the specific topic that is being discussed. * Update issue templates * Update issue templates * Update issue templates * Release 'live' 11-08-2018 (#1074) * Replaced 'This topics' with 'This topic' (MicrosoftDocs#512) * Fix intro text for SDK v4 (MicrosoftDocs#508) As far as I know, the v4 of the C# and NodeJS SDK-s are not in preview anymore. * Delete bot-builder-enterprise-template-overview-detail - Copy.md * Fix git push error for protected CLA branch (#1103) * Adding support statement for regional LUIS apps (MicrosoftDocs#224) Customers requesting official documentation of lack of support for non US LUIS apps for speech priming feature for EU due to GDPR requirements to keep data in EU and no workaround currently available. * Update tutorial doc (MicrosoftDocs#240) inserted line 74, as missing it in the global.asax.cs file causes a 404 error for customers. * Update bot-builder-dotnet-sdk-quickstart.md * Update bot-builder-basics.md (MicrosoftDocs#314) Incorporate feedback from the grammar checking bot while making the sentence more precise at the same time. * Update bot-builder-basics.md (MicrosoftDocs#317) Incorporate grammar bot feedback. * Update bot-builder-concept-middleware.md (MicrosoftDocs#318) Typo. Replace "alos" with "also" * Update bot-builder-howto-v4-state.md 1. Fixed code to use variables than hardcoded string in Startup.cs, variables were defined but not used previously. 2. Fixed typo Modift -> Modify * Update bot-service-quickstart.md updated to indicate that placing resources within the same region should be preferred * Update node-send-card-buttons.js Add a line of code to actually send the message as well. * Misspell (MicrosoftDocs#386) * typo : Double Use of words (MicrosoftDocs#374) Fixing the typo double use of 'to', 'the' Fixing typo of 'teh' * Correcting typo (MicrosoftDocs#341) Typo in header, assuming it should be using instead of usubg * Resolution for grammar issue #294 (MicrosoftDocs#340) * typo: teh -> the (MicrosoftDocs#321) * Update bot-builder-concept-luis.md (MicrosoftDocs#380) Fixed the missing links for speech and LUIS. * Typo dd => add * Update image alignment in bot-builder-dotnet-sqk-quickstart.md * Update bot-service-design-pattern-knowledge-base.md The link was redirecting to the v3 bot builder templates which was missing the context of the paragraph. * fix formatting and typo * Resolve syncing conflicts from live-sync-work to live * Update README.md "About your contributions to Bot Framework content" link updated * add additional fixes to this file * Resolve syncing conflicts from live-sync-work to live (MicrosoftDocs#399) * Release 'live' 10-13-2018 (MicrosoftDocs#1003) * Release 'live' 10-15-2018 (#1011) * Release 'live' 10-17-2018 (#1012) * Release 'live' 10-18-2018 (#1016) * Update bot-framework-rest-direct-line-3-0-api-reference.md (MicrosoftDocs#431) Add a comment about max activity size. * Update bot-builder-enterprise-template-deployment.md (MicrosoftDocs#427) Added solution for common MSA app provisioning error. * Update command to create metadata for qna maker (MicrosoftDocs#405) Previous command does not work. We should put one space. * Wrongly used MD h2 title at "usage" section (MicrosoftDocs#432) Missing a space behind the second # at the "usage" section. The h2 style isn't rendered. By adding a space behind ## it renders the title as an h2. * Moved language-agnostic instruction (MicrosoftDocs#460) This snippet fell under a C# specific snippet, which made it unclear that it also applies to Node: "The `botFilePath` references the name of your bot, simply replace "yourbasicBot.bot" with your own bot name. To obtain the `botFileSecret` key, refer to [Bot File Encryption](https://aka.ms/bot-file-encryption) article on generating a key for your bot." * Add "Dialog Lifecycle" header (MicrosoftDocs#454) The documentation opens with an overview and then flows right into discussing dialog lifecycle. I think adding a header would be a good to break that up and call more attention to the specific topic that is being discussed. * Update issue templates * Update issue templates * Update issue templates * Replaced 'This topics' with 'This topic' (MicrosoftDocs#512) * Fix intro text for SDK v4 (MicrosoftDocs#508) As far as I know, the v4 of the C# and NodeJS SDK-s are not in preview anymore. * Fix typo in the Welcome message. (MicrosoftDocs#513) * Update bot-builder-dialog-manage-conversation-flow.md (MicrosoftDocs#522) Fixed the typo. * typo: succesful -> successful (MicrosoftDocs#520) * typo: pannel -> panel (MicrosoftDocs#518) * typo: Actvity -> Activity (MicrosoftDocs#517) * One '''csharp too much (MicrosoftDocs#478) * Release 'live' 11-13-2018 (#1101) * Update bot-builder-enterprise-template-customize.md * Update bot-builder-enterprise-template-deployment.md * Update bot-file-basics.md * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1141) * Release 'live' 12-11-2018 (#1190) (#1193) * Updated values in #update-the-.bot-file (#1191) * Create BotFrameworkAdapter.xml * bot deploy clarity (#1196) * Updated dispatch content (#1142) * Update docfx.json * Update docfx.json * Update Deployment steps (#1205) * Fix deployment (MicrosoftDocs#1206) * Update bot-builder-deploy-az-cli.md * Add deployment (#1209) * Add the MSA account instructions back in with some modifications. (#1208) * Update bot-service-resources-bot-framework-faq.md (#1212) * Updates to deploying samples article (MicrosoftDocs#1215) * Updates to deploying samples article * Update per feedback * Fix copy-paste error, some formatting. * enteprise bot updates to include chitchat in qna (MicrosoftDocs#1218) * Fixes for various bot-docs issues (#1217) * wip * Addresses bot-docs issue 628 * Fix for bot-docs issue [624](https://github.com/MicrosoftDocs/bot-docs/issues/624) * Fix for Microsoft/bot-docs#655. * copy edit * Fix for [bot-docs 630](https://github.com/MicrosoftDocs/bot-docs/issues/630) * Fix for (Microsoft/bot-docs#612). * Add Troubleshoot bot configuration issues * Add second troubleshooting article, fix warnings in the first. * fix moniker range. * fix metadata keywords in second topic. * Experimental fix. * Fix markup * Minor correction. * Fixes welcome user sample code pointers (#1221) * Fixed aka.ms sample code pointers Somehow these changed to point to the wrong sample, not the one documented step-by-step in our article. * added Ivor's aka.ms link * corrected my "author" name and date * fixed author name again! * Various issue fixes. (#1224) * Fix link to point to the new article. * Remove transparency, expand border. * Remove transparency from images. * Update screenshot per (Microsoft/bot-docs#603) * makes it clearer how you train and publish the LUIS dispatch app (#1225) * Issues fixes 12-20 (#1222) * update dotnet emulator screenshot * update screenshot for dotnet project * fix sentence from issue 607 * make manage toc alphabetic * Issues fixes - samples links, redirect fixes (MicrosoftDocs#1227) * Added reference to the BotFramework-Samples directory * attempted fix at redirect url * Update bot-builder-enterprise-template-deployment.md (MicrosoftDocs#1232) Update to remove "az extension" step. Latest msbot version no longer requires the botservice extension. * Update bot-service-quickstart.md (#1242) * Update bot-service-quickstart.md * Update bot-service-quickstart.md * Update bot-service-quickstart.md (#1244) * Updated ET PowerBI doc to point users to the Conversational AI Telemetry doc on Microsoft/AI repo & updated telemetry properties. (#1214) * Fix java (#1246) * Fix for bot-docs (#684)[Microsoft/bot-docs#684] (MicrosoftDocs#1235) * Fix for bot-docs (#684)[https://github.com/MicrosoftDocs/bot-docs/issues/684] * Attempt to fix markdown * Continue to try to fix markdown * yet one more fix * Add instruction to create resource group before using az bot create * Fix for bot-docs issue 685 * Fix for bot-docs 685 * Update the --proj-name description for JS * include a fix from loc folks. * Update Slack channel doc and bing speech (#1249) * Update Slack channel doc * Update text * tweak wording * remove bing speech from v3 docs * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1253) * Community content merge (#1255) * Rename Bot Builder (#1252) * remove sample * Revert "remove sample" This reverts commit 840f423b9ab9082d8d7effa87a63488b187db1c5. * fix references to bot builder * Fix terminology (#1251) * Update bot-builder-basics.md * Update bot-service-overview-introduction.md * Update bot-service-overview-introduction.md * Update bot-builder-basics.md * Update bot-builder-basics.md * Various issues fixes - dispatch pointer, helpful tips (MicrosoftDocs#1233) * add tip to authentication about url encoding * Initially fixed Github pointer to point to correct subdirectory Really want to make this an aka.ms pointer, but my access seems to have disappeared. * tested link, fixed link * add auth tip * Added a short step-by-step for folks who don't know how to download from Git Plus the aka.ms link pointing directly to the 4 files. * change botservice extension info for new msbot version * Revert "change botservice extension info for new msbot version" This reverts commit 3a01f1098fd8a864953a7766c6bb1c37698633ad. * add explanatory text about different repos for dispatch files * update v4 appID and password info * try to fix layout issues for quickstart * Update bot-builder-howto-direct-line.md (#1258) * Fix directline (#1261) * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1257) * Community content (#1264) * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1266) * Community content (#1267) * added link pointing to update/create LUIS model info (#1263) * C56914: Missing break line (MicrosoftDocs#1238) * Resolve syncing conflicts from community-content-live-sync-work to community-content (#1269) * Fix samples (#1272) * Community content (MicrosoftDocs#1276) * Update bot-builder-deploy-az-cli.md * Updating CosmosDB with partition info (#1280) * New basics tutorial (MicrosoftDocs#1241) * Fix for bot-docs bugs (#1260) * Added info on Azure Service Name character restrictions (#1285) Also changed uses of YOUR_BOT_NAME to YOUR-BOT-NAME since underscores are not allowed in this name. * Fix for various bot-docs issues (#1282) * Address: Seemingly no mention of card styling * Fix for bot-docs issues - for: No docs on how to initialize a dialog with data - for: The .values property that hangs off of stepContext in JS is not properly documented. * copy edit * Add note that ABS and local development are parallel paths to the quickstarts. * Various issues fixes (#1286) * Per review feedback * per review feedback * Added Call that creates Dictionary to C# code example. (#1291) Resolves Bot-docs Issue #726 * Fix landing page (#1292) * Update bot-builder-enterprise-template-deployment.md (#1287) * added warning about password character "|" (#1295) per issue #741 * Various doc fixes (#1296) * Bugs and issues fixes (MicrosoftDocs#1290) * remove localized part of link * First draft of v3-v4 migration use case (#1298) * Clarifies qna connection info (#1301) * Update bot-framework-rest-direct-line-3-0-concepts.md (#1303) * Add telemetry (#1299) * Updates details for welcome users (#1307) * Issue fixes (#1308) * Fix bugs (#1309) * fixed getAnswers parameter for NodeJS (#1310) * Add a conceptual topic for v3-4 migration (#1305) * Line channel docs (MicrosoftDocs#1236) * Line channel doc and screenshots * line channel * scrub screenshots * added line channel functionality * add new images * add TOC entry * line feedback bug fixes * updates based on bugbash and feedback * small bug fixes * fix conversation screenshot * add more space for image * more feedback * Additional changes to line channeldata * Various issues and bug fixes (MicrosoftDocs#1321) * Add to the FAQ a link to main migration topic. (MicrosoftDocs#1322) * Add link to main migration topic to the FAQ. * line fix (#1324) * Common issues PR for week of 2/25 (#1323) * Fix markdown formatting. * update update date * Fix the "real" markdown issue * Jumbled sentence fixed. * Add cross linking between debugging and troubleshooting articles - partial fix for bot-docs issue [888](https://github.com/MicrosoftDocs/bot-docs/issues/888) * Update 4.2 VSIX screenshot - For issue [894](https://github.com/MicrosoftDocs/bot-docs/issues/894) * Immediate fix for QnA Maker article re: bot-docs issue [905](https://github.com/MicrosoftDocs/bot-docs/issues/905) * Immediate fix for C# code in Suggested actions and Rich media how-tos re: bot-docs issue [897](https://github.com/MicrosoftDocs/bot-docs/issues/897) * Changed Sample code pointers from tree/master to tree/v3-sdk-samples * Add notes on re-encrypting the .bot file - In response to bot-docs issue [902](https://github.com/MicrosoftDocs/bot-docs/issues/902). * fix for bot-docs issue 911 - Fix for [911](https://github.com/MicrosoftDocs/bot-docs/issues/911). - We jumped the gun. `getAnswers` will go live with 4.3. * Make the link to the card thumbnails more visible - Fix for bot-docs issue [910](https://github.com/MicrosoftDocs/bot-docs/issues/910) * Changed Service name pointer info to be more clear per issue #912. * few issues fixes with proactive * remove old metadata tags (#1328) * Channel behavior (#1330) * Create bot-service-channels-reference.md * Update TOC.md * Update bot-service-channels-reference.md * Update bot-service-channels-reference.md * Update config file to support out-of-repo code links. (#1331) * Enterprise Bot Template 4.3 updates (#1337) * enterprise template doc updates * updated emulator link * updated enterprise template docs * fixed broken links * updated file path * add mention of new dialog for downloading keys (#1338) * Issues-03-01 (#1334) * Fix landing page and broken links (#1388) * Bug fixes 3-28 (MicrosoftDocs#1384) * C76850: Adding two spaces after line (#1382) Localization team has reported source content issue that causes localized version to have broken/different format compared to en-us version. * SfB update * Update bot-service-channel-connect-skypeforbusiness.md * add fb api version info * Update bot-service-channel-connect-skypeforbusiness.md * CI Update (#1366) * CI Update * CI Update * CI Update * CI Update * CI Update * Fix deployment (MicrosoftDocs#1395) * fix deployment (MicrosoftDocs#1399) * Update bot-builder-deploy-az-cli.md (MicrosoftDocs#1401) * Port auth updates forward to master (MicrosoftDocs#1409) * remove jointoc plugin as it is unused (#1412) * Remove bot-service-continuous-deployment.md (MicrosoftDocs#1411) * Community content (#1417) * Create .openpublishing.redirection.json (#1425) * Fix redirects (#1427) * Community content (#1430) * Delete channel-facebook.md * Delete channel-groupme.md * Delete channel-kik.md * Delete channel-slack.md * Delete channel-telegram.md * Delete channel-twilio.md * fix redirects (MicrosoftDocs#1433) * C76850: Reversing the order of string 14 and 16 (#1434) * Update overview topic + applies to label (#1438) * Add knowledgebase with no .bot file (MicrosoftDocs#1414) * Community content (MicrosoftDocs#1444) * Update .openpublishing.redirection.json (MicrosoftDocs#1449) * Update JS ref links (MicrosoftDocs#1457) * Direct Line Speech -- Release Date: 5/2/19 (#1453) * Update bot-service-design-pattern-handoff-human.md (#1475) * MVC changes (#1325) * Update TOC.md (#1477) * qna snippet fixes (#1479) * /build fixes (MicrosoftDocs#1482) * Quickstart (#1484) * Update index.md (MicrosoftDocs#1486) * Update what-is-new.md (#1488) * Update what-is-new.md * Update what-is-new.md * Update index.md * Update to reflect latest VA content (#1491) * Fix Image Link (MicrosoftDocs#1493) * CI Update (#1481)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request opened by Docs to resolve syncing conflicts from live-sync-work to live.