Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4361 commits
Select commit Hold shift + click to select a range
02f98c4
Update bot-builder-howto-proactive-message.md
JonathanFingold Nov 24, 2020
d6a8621
Update bot-builder-howto-proactive-message.md
JonathanFingold Nov 24, 2020
95110a2
Create bot-service-debug-adaptive-tool.md
Nov 25, 2020
affb1dc
Added links to debug with adaptive tool article
Nov 25, 2020
dce5ad1
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Nov 25, 2020
fc4caf6
Update bot-service-debug-adaptive-tool.md
Nov 25, 2020
92aba15
Update bot-service-debug-adaptive-tool.md
Nov 25, 2020
2d11e03
Update bot-builder-howto-proactive-message.md
JonathanFingold Nov 25, 2020
3988e31
Fix typo
JonathanFingold Nov 30, 2020
9243ab7
Fixed content.
Nov 30, 2020
6d68a57
Update bot-service-channel-directline-extension-net-bot.md
Nov 30, 2020
f175cdd
Incoroporate John's feedback
JonathanFingold Dec 1, 2020
01cb348
Update bot-service-debug-adaptive-tool.md
Dec 1, 2020
ecae3e7
Update bot-service-debug-adaptive-tool.md
Dec 1, 2020
ff44324
Update bot-service-debug-adaptive-tool.md
Dec 1, 2020
429eab8
Update TOC.yml
Dec 1, 2020
0dd6b82
Update adaptive-expressions-prebuilt-functions.md
Dec 1, 2020
ce56814
Update adaptive-expressions-prebuilt-functions.md
Dec 1, 2020
53dac95
Address John's feedback
JonathanFingold Dec 1, 2020
f0d0399
Merge pull request #2481 from MicrosoftDocs/jf/proactive-1124
JonathanFingold Dec 1, 2020
6539c51
Merge branch 'master' into mm-bot-issue-1958
JonathanFingold Dec 1, 2020
7d9e41b
Merge pull request #2483 from MicrosoftDocs/mm-bot-issue-1958
JonathanFingold Dec 1, 2020
450249a
Added image and fixed content to explain trusted origins based on a d…
Dec 2, 2020
2d3b6e8
Chnaged new articel title and fixed related links.
Dec 2, 2020
ee65032
Fixed based on CK feedback
Dec 2, 2020
88505de
Update C# quickstart post R11
JonathanFingold Dec 2, 2020
0ae142d
Merge branch 'master' into mm-bot-enhanced-dl-oauth
JonathanFingold Dec 2, 2020
8ac390b
Update bot-service-resources-faq-security.md
Dec 2, 2020
e9a443e
Merge branch 'mm-bot-enhanced-dl-oauth' of https://github.com/Microso…
Dec 2, 2020
a02ba1f
Fix links
JonathanFingold Dec 2, 2020
f4f1c70
fix more links
JonathanFingold Dec 2, 2020
281755c
Fix one more link
JonathanFingold Dec 2, 2020
d0fc089
Update bot-service-resources-faq-security.md
Dec 2, 2020
f3edb4a
Merge pull request #2485 from MicrosoftDocs/jf/cs-templates-r11
JonathanFingold Dec 3, 2020
bb41ac0
Added new FAQ entry
Dec 3, 2020
1e1318b
Apply suggestions from code review
Dec 3, 2020
bbc675c
Update bot-builder-security-enhanced.md
Dec 3, 2020
2bd19f9
Merge branch 'mm-bot-enhanced-dl-oauth' of https://github.com/Microso…
Dec 3, 2020
bad7037
Merge branch 'master' into mm-bot-enhanced-dl-oauth
JonathanFingold Dec 3, 2020
a7be994
Merge pull request #2472 from MicrosoftDocs/mm-bot-enhanced-dl-oauth
JonathanFingold Dec 3, 2020
c002b7b
Update bot-service-channel-connect-directline.md
Dec 3, 2020
7af0ead
Update bot-service-channel-connect-directline.md
Dec 3, 2020
a4f3a37
Update bot-service-channel-connect-directline.md
Dec 3, 2020
a8d2440
Removed link syntax.
jdmartinez36 Dec 4, 2020
a1144e5
Merge pull request #2488 from MicrosoftDocs/mm-bot-enhanced-auth-adde…
JonathanFingold Dec 7, 2020
9a8f237
Merge branch 'master' into mm-bot-add-faq-entry
JonathanFingold Dec 7, 2020
2b7ce5c
Fix various issues
JonathanFingold Dec 7, 2020
56ece5b
Merge pull request #2490 from MicrosoftDocs/jf/telemetry-1207
JonathanFingold Dec 7, 2020
82bea80
Updated links to cross-repo.
jdmartinez36 Dec 7, 2020
5386501
Merge branch 'master' into linksyntaxbranch
JonathanFingold Dec 7, 2020
052ccc7
Added new troubleshooting entry
Dec 7, 2020
3da756f
Merge pull request #2489 from jdmartinez36/linksyntaxbranch
JonathanFingold Dec 7, 2020
674b520
Fixed title
Dec 7, 2020
01540f6
Update TOC.yml
Dec 8, 2020
9cf71fb
Update TOC.yml
Dec 8, 2020
a7fc422
Update bot-service-resources-faq-general.md
Dec 8, 2020
1a8ce7a
Update bot-builder-howto-add-media-attachments.md
Dec 9, 2020
172a646
Update bot-builder-howto-add-media-attachments.md
Dec 9, 2020
e26ac0c
Merge pull request #2492 from MicrosoftDocs/mm-bot-security-toc-impro…
JonathanFingold Dec 9, 2020
866233b
Merge branch 'master' into mm-bot-add-faq-entry
JonathanFingold Dec 9, 2020
0ae72c9
Merge pull request #2486 from MicrosoftDocs/mm-bot-add-faq-entry
JonathanFingold Dec 9, 2020
0f2ddfb
fixed link to iso 8601 wiki page
Dec 9, 2020
0f162c3
Update bot-service-troubleshoot-general-problems.md
Dec 9, 2020
c1aef89
Add installation update info
JonathanFingold Dec 9, 2020
e968301
fix link
JonathanFingold Dec 9, 2020
67ad040
Update articles/bot-service-troubleshoot-general-problems.md
Dec 9, 2020
bc196f9
Merge pull request #2493 from MicrosoftDocs/jf/activity-handler-1209
JonathanFingold Dec 9, 2020
f47b378
Update bot-service-channel-connect-email.md
Dec 9, 2020
3820988
Update bot-service-channel-connect-email.md
Dec 9, 2020
c9c2a65
Update bot-service-channel-connect-email.md
Dec 10, 2020
5138dc7
Update snippet-channeldata.md
Dec 10, 2020
076f43a
Update bot-service-channel-connect-email.md
Dec 10, 2020
056fb96
Fixed include file, shared this file . fixed content
Dec 11, 2020
468185a
Update snippet-channeldata.md
Dec 11, 2020
dd9b338
Fixed content
Dec 11, 2020
8ae2653
Fixed content
Dec 11, 2020
1ef8bb6
Update snippet-channelData-email.md
Dec 11, 2020
4f56d9b
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1927
Dec 11, 2020
cfe6cdb
Fixed content based on feedback. Added images.
Dec 14, 2020
fef2b0b
Update bot-service-troubleshoot-general-problems.md
Dec 14, 2020
421acd3
Update bot-service-troubleshoot-general-problems.md
Dec 14, 2020
3668090
Fixed content and added a couple of supporting images.
Dec 15, 2020
1e6ff41
Fixed image
Dec 15, 2020
c641291
Merge branch 'master' into mm-email-channeldata-schema
JonathanFingold Dec 15, 2020
b8bff07
Update bot-service-channel-directline.md
Dec 15, 2020
8f0a135
Merge pull request #2494 from MicrosoftDocs/mm-email-channeldata-schema
JonathanFingold Dec 16, 2020
3ec0db8
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1927
JonathanFingold Dec 16, 2020
f0ebaf4
Merge pull request #2484 from MicrosoftDocs/v-emolsh/issue-fix/bot-do…
JonathanFingold Dec 16, 2020
c2ac006
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 16, 2020
16889e5
Update bot-service-channel-directline.md
Dec 16, 2020
976b5b1
Update bot-framework-rest-connector-api-reference.md
Dec 17, 2020
9599a39
Merge branch 'master' into mm-bot-dl-speech
JonathanFingold Dec 17, 2020
23330a5
Merge pull request #2497 from MicrosoftDocs/mm-bot-dl-speech
JonathanFingold Dec 17, 2020
68b9929
Added images and fixed content.
Dec 17, 2020
c78ad6c
Update articles/rest-api/bot-framework-rest-connector-api-reference.md
Dec 17, 2020
80304bf
Update directline-speech-bot.md
Dec 17, 2020
9aaa7ea
Merge branch 'master' into mm-bot-rest-api-http-status-codes
JonathanFingold Dec 17, 2020
8605f4a
Merge pull request #2498 from MicrosoftDocs/mm-bot-rest-api-http-stat…
JonathanFingold Dec 17, 2020
be2025d
Update bot-service-overview-introduction.md
Dec 18, 2020
9bd62b9
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
JonathanFingold Dec 18, 2020
732b15a
Update articles/bot-service-troubleshoot-general-problems.md
Dec 21, 2020
fb62147
Apply suggestions from code review
Dec 21, 2020
43ffc41
Update bot-service-troubleshoot-general-problems.md
Dec 21, 2020
d9ad673
Merge branch 'mm-bot-test-network-connectivity' of https://github.com…
Dec 21, 2020
09039e4
Update bot-service-troubleshoot-general-problems.md
Dec 21, 2020
91dd6e8
Merge branch 'master' into mm-bot-channel-fb
Dec 21, 2020
c440d16
Apply suggestions from code review
Dec 21, 2020
739c190
Update bot-builder-lu-file-format.md
Dec 21, 2020
f308a6f
Merge branch 'master' into mm-bot-test-network-connectivity
JonathanFingold Dec 21, 2020
a07332d
Merge pull request #2491 from MicrosoftDocs/mm-bot-test-network-conne…
JonathanFingold Dec 21, 2020
aa0e66e
Apply suggestions from code review
Dec 21, 2020
304c97a
Update quickstart-dotnet-prerequisites.md
Dec 21, 2020
3959188
Update snippet-deploy-without-bot.md
Dec 22, 2020
a01efd5
Fixed typos.
Dec 22, 2020
2a589d7
Update bot-service-channel-directline-extension.md
Dec 22, 2020
05568f2
Update bot-service-channel-connect-facebook.md
Dec 22, 2020
37fd2da
Update bot-service-design-user-experience.md
Dec 22, 2020
ba1dd2f
Merge branch 'master' into mm-bot-channel-fb
JonathanFingold Dec 22, 2020
4f350f6
Merge pull request #2496 from MicrosoftDocs/mm-bot-channel-fb
JonathanFingold Dec 22, 2020
2732d48
Update bot-builder-webchat-overview.md
Dec 22, 2020
269112d
Update bot-builder-webchat-overview.md
Dec 23, 2020
0b7deaa
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1969
Dec 23, 2020
8aa21f1
Update bot-builder-webchat-overview.md
Dec 23, 2020
09cfa28
Moved v3 section to FAQ article
Dec 23, 2020
7ee8429
Update contributor-guide-index.md
JonathanFingold Dec 23, 2020
db93632
Merge branch 'master' into mm-bot-fix-issues
JonathanFingold Dec 23, 2020
7adb045
Merge pull request #2499 from MicrosoftDocs/mm-bot-fix-issues
JonathanFingold Dec 23, 2020
9f49cc5
Add GitHub tips and tricks article
JonathanFingold Dec 23, 2020
29bd5e2
Added links in the index page and organized content
Dec 23, 2020
85c52c2
Update bot-service-resources-bot-framework-faq.md
Dec 23, 2020
8320fc5
Update bot-builder-webchat-overview.md
Dec 23, 2020
7756a4b
Merge branch 'master' into mm-bot-webchat-cleanup
Dec 23, 2020
f1b622b
Added links fixed wording
Dec 23, 2020
9b2de96
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/Microsoft…
Dec 23, 2020
5b0615f
Merge branch 'master' into jf/contrib-1223
JonathanFingold Dec 23, 2020
c3d787d
Update bot-builder-webchat-overview.md
Dec 23, 2020
84ea173
Merge pull request #2502 from MicrosoftDocs/jf/contrib-1223
JonathanFingold Dec 23, 2020
9f2f37c
Add messageBack to table, convert table to snippet
JonathanFingold Dec 23, 2020
2c98bde
Fixed content
Dec 23, 2020
f9148cc
Update snippet-card-action-types.md
JonathanFingold Dec 23, 2020
3d5c627
Merge branch 'master' into v-emolsh/issue-fix/bot-docs-1969
Dec 23, 2020
51009d2
Changed AKA links to relative path or site-relative link.s
WashingtonKayaker Dec 23, 2020
9ddee5b
Merge pull request #2500 from MicrosoftDocs/v-emolsh/issue-fix/bot-do…
JonathanFingold Dec 23, 2020
6c890bd
Merge branch 'master' into jf/messageBack
Dec 23, 2020
4e171dc
Merge branch 'live' into master
JonathanFingold Dec 23, 2020
772e2fe
Update what-is-new-archive.md
WashingtonKayaker Dec 23, 2020
d9966e0
Merge branch 'master' into SM-AKA-Link-Conversion
WashingtonKayaker Dec 23, 2020
2a5af38
link issues
WashingtonKayaker Dec 24, 2020
95e98c9
minor updates to fix checkin validation warnings.
WashingtonKayaker Dec 24, 2020
cb15f3f
Update articles/includes/snippet-card-action-types.md
JonathanFingold Dec 24, 2020
2e7f761
Fix random typos.
JonathanFingold Dec 24, 2020
5a8649d
Merge branch 'jf/messageBack' of https://github.com/MicrosoftDocs/bot…
JonathanFingold Dec 24, 2020
ba41064
Merge branch 'master' into jf/messageBack
JonathanFingold Dec 24, 2020
77b32f0
Merge pull request #2503 from MicrosoftDocs/jf/messageBack
JonathanFingold Dec 24, 2020
01d4338
Fix more typos
JonathanFingold Dec 24, 2020
6a10e1e
Merge pull request #2506 from MicrosoftDocs/jf/fixes-for-live-sync-1223
JonathanFingold Dec 24, 2020
8c1f668
Merge pull request #2505 from MicrosoftDocs/master
JonathanFingold Dec 24, 2020
a932bb4
Changed Adaptive Tool --> Adaptive Tools
Dec 27, 2020
5fca27f
changed tool --> tools in file name and related files
Dec 27, 2020
9144b3c
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 27, 2020
6111183
Update bot-service-resources-faq-availability.md
Dec 28, 2020
2dbe436
Apply suggestions from code review
Dec 28, 2020
070953c
Update articles/file-format/bot-builder-lg-file-format.md
Dec 28, 2020
d93d165
Update bot-service-resources-faq-availability.md
Dec 28, 2020
9ed9669
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/Microsoft…
Dec 28, 2020
a9c2b9c
Update articles/bot-service-resources-faq-availability.md
Dec 28, 2020
d1ba2e4
removed references to lg and lu
Dec 28, 2020
fc318d4
Update bot-service-resources-faq-availability.md
Dec 28, 2020
e9b7229
Merge branch 'mm-bot-webchat-cleanup' of https://github.com/Microsoft…
Dec 28, 2020
c1dafaa
Update bot-service-resources-bot-framework-faq.md
Dec 28, 2020
b7739ce
Merge branch 'master' into mm-bot-webchat-cleanup
JonathanFingold Dec 28, 2020
e86dda6
Fix for bot-docs issue 1987
JonathanFingold Dec 28, 2020
f2a0234
Merge pull request #2501 from MicrosoftDocs/mm-bot-webchat-cleanup
JonathanFingold Dec 28, 2020
9504b15
Update bot-framework-rest-connector-api-reference.md
JonathanFingold Dec 28, 2020
1ca039d
Fixed quotes
Dec 28, 2020
904c968
Fixed quotes
Dec 28, 2020
06a893d
Update security-baseline.md
Dec 28, 2020
ca0215a
Update security-baseline.md
Dec 28, 2020
c2bb209
Update bot-service-design-pattern-knowledge-base.md
Dec 29, 2020
93f241d
Update bot-service-design-pattern-knowledge-base.md
Dec 29, 2020
a2046f3
Update bot-service-design-navigation.md
Dec 29, 2020
e168989
Update bot-service-manage-settings.md
Dec 29, 2020
007eb9a
Fixed alt-text
Dec 29, 2020
79753f9
Update bot-builder-telemetry.md
Dec 29, 2020
c4ef222
fix missing pdf template (#2511)
herohua Dec 29, 2020
98511a5
Merge branch 'master' into jf/http-status-codes
JonathanFingold Dec 29, 2020
6358213
Merge pull request #2507 from MicrosoftDocs/jf/http-status-codes
JonathanFingold Dec 29, 2020
90ee6bc
Merge branch 'master' into mm-wht-alt-text
JonathanFingold Dec 29, 2020
bfc6ccb
Merge pull request #2510 from MicrosoftDocs/mm-wht-alt-text
JonathanFingold Dec 29, 2020
85ff1e7
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 29, 2020
006460a
Update articles/bot-service-channel-connect-directlinespeech.md
WashingtonKayaker Dec 29, 2020
41829f1
Minor updates to bot-builder-telemetry-qnamaker.md
WashingtonKayaker Dec 29, 2020
6b9081a
Merge branch 'SM-AKA-Link-Conversion' of https://github.com/Microsoft…
WashingtonKayaker Dec 29, 2020
963aa65
Apply suggestions from code review
Dec 29, 2020
3673250
Update security-baseline.md
Dec 29, 2020
17e0e58
Merge branch 'mm-wht-curly-quotes' of https://github.com/MicrosoftDoc…
Dec 29, 2020
9b16054
Apply suggestions from code review
Dec 29, 2020
4b58e40
Feedback incorporated.
WashingtonKayaker Dec 29, 2020
a85a80e
fixed link
WashingtonKayaker Dec 29, 2020
e5346ee
Update articles/includes/bot-service-debug-bot/python-vscode.md
WashingtonKayaker Dec 29, 2020
e66acf1
Update articles/includes/telemetry-javascript-main.md
WashingtonKayaker Dec 29, 2020
7da4937
Update articles/includes/telemetry-dotnet-main.md
WashingtonKayaker Dec 29, 2020
9a2ec8b
Update articles/includes/telemetry-dotnet-main.md
WashingtonKayaker Dec 29, 2020
d264e21
Update bot-builder-concept-adaptive-dialog-generators.md
WashingtonKayaker Dec 29, 2020
27a0233
Merge branch 'SM-AKA-Link-Conversion' of https://github.com/Microsoft…
WashingtonKayaker Dec 29, 2020
f71f12a
Merge branch 'master' into SM-AKA-Link-Conversion
JonathanFingold Dec 29, 2020
822d31e
Merge pull request #2504 from MicrosoftDocs/SM-AKA-Link-Conversion
JonathanFingold Dec 29, 2020
ff8cf6e
Merge branch 'master' into mm-wht-curly-quotes
JonathanFingold Dec 29, 2020
a0dbc7d
Merge pull request #2509 from MicrosoftDocs/mm-wht-curly-quotes
JonathanFingold Dec 29, 2020
48876f9
Update contributor-guide-pr-criteria.md
Dec 29, 2020
24ebd42
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
Dec 30, 2020
ca8ff44
Merge branch 'master' into mm-wht-curly-quotes-internal-guides
JonathanFingold Dec 30, 2020
f783886
Merge pull request #2508 from MicrosoftDocs/mm-wht-curly-quotes-inter…
JonathanFingold Dec 30, 2020
ab76289
Merge branch 'master' into v-emolsh/11-2020/debug-adaptive-tool
JonathanFingold Dec 30, 2020
a2d121c
Merge pull request #2482 from MicrosoftDocs/v-emolsh/11-2020/debug-ad…
JonathanFingold Dec 30, 2020
d140516
Update quickstart-python-prerequisites.md
Dec 31, 2020
6edd49e
Merge pull request #2514 from MicrosoftDocs/v-emolsh/issue-fix/bot-do…
JonathanFingold Jan 4, 2021
1b9bd37
mm-wht-here-links (#2515)
Jan 5, 2021
401f28c
Issue 1982 fix - replace unowned AKA links (#2516)
Jan 6, 2021
7b5b341
Add a text formatting article to the local contributors guide (#2517)
JonathanFingold Jan 7, 2021
776c4fd
Fixed broken link (#2520)
WashingtonKayaker Jan 7, 2021
c205c08
Fixed file extention formating for .lu, .lg, .qna (#2522)
WashingtonKayaker Jan 7, 2021
bd137fe
Fixed file extension formatting for .lu, .lg, .qna in all remaining f…
WashingtonKayaker Jan 7, 2021
20b5d95
zxyanliu-grammar-pass (1/4) (#2524)
zxyanliu Jan 11, 2021
03dbf3f
Grammar, tone, spelling, and typography pass (jf: 1/x) (#2512)
JonathanFingold Jan 11, 2021
3e20411
Changes to grammar and formatting, with minor technical changes. (#2525)
WashingtonKayaker Jan 11, 2021
bcdacac
Update bot-builder-howto-cross-train.md (#2473)
WashingtonKayaker Jan 12, 2021
dcb546e
mm-wht-doc-cleanup-01 (#2518)
Jan 12, 2021
4fe19f0
Grammar pass on bot-builder-dotnet-sdk-quickstart (#2530)
WashingtonKayaker Jan 12, 2021
9efc030
Merge branch 'master' of https://github.com/MicrosoftDocs/bot-docs-pr…
v-alje Jan 12, 2021
35f1084
Moving reference to new repo
v-alje Jan 12, 2021
2ca38ab
Fixing invalid json
v-alje Jan 12, 2021
b6275a0
mm-bot-snippet-update (#2527)
Jan 12, 2021
4e58702
mm-wht-writers-faqs (#2513)
Jan 12, 2021
b4ed2f2
mm-wht-public-faqs (#2519)
Jan 12, 2021
b62a465
Update TOC.yml (#2539)
Jan 13, 2021
e80161b
Update bot-framework-glossary.md (#2521)
JonathanFingold Jan 13, 2021
9947e63
Merge branch 'master' into smoke-test
v-alje Jan 13, 2021
4bdf31c
Merge pull request #2537 from MicrosoftDocs/smoke-test
v-alje Jan 14, 2021
f06b02b
Port Artur's changes to the bot-docs-pr repo. (#2534)
JonathanFingold Jan 14, 2021
e523d1d
zxyanliu/grammar pass 2/4 (#2536)
zxyanliu Jan 14, 2021
7465e57
TIP on handling the "none" intent (#2495)
WashingtonKayaker Jan 14, 2021
9a85232
Formatting text guide updates (#2546)
Jan 15, 2021
cf132ae
Incorporate fixes from bot-docs PRs. (#2543)
JonathanFingold Jan 15, 2021
acafa55
mm-wht-writers-faqs (#2544)
Jan 19, 2021
c12209d
Merge branch 'live' into master
v-alje Jan 19, 2021
aa5cc17
Merge pull request #2549 from MicrosoftDocs/master
v-alje Jan 19, 2021
662e41d
Release 'live' 01-20-2021 (#2551)
JonathanFingold Jan 22, 2021
7e32468
Initialize Docs repository: https://github.com/MicrosoftDocs/bot-docs…
v-alje Jan 26, 2021
22a92bc
Release 'live' 02-11-2021 (#2587)
JonathanFingold Feb 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a text formatting article to the local contributors guide (#2517)
* Start on text formatting article.

* wip

* Update formatting-text.md

* Update formatting-text.md

* Update formatting-text.md

* Update formatting-text.md

* wip

* Update formatting-text.md

* Update formatting-text.md

* Update formatting-text.md

* transient FAQ test

* revert FAQ changes

* Update formatting-text.md

* Update formatting-text.md

* Update formatting-text.md

* Start work on a glossary.

* Update bot-framework-glossary.md

* Update bot-framework-glossary.md

* Update bot-framework-glossary.md

* Added meeting notes

* Update bot-framework-glossary.md

* Update bot-framework-glossary.md

Co-authored-by: Emily Olshefski <[email protected]>
  • Loading branch information
JonathanFingold and Emily Olshefski authored Jan 7, 2021
commit 7b5b34159a2399eeb2de404aabc4b6f52431bb92
168 changes: 168 additions & 0 deletions contributor-guide/bot-framework-glossary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
# Bot Framework glossary

Contains a consolidated list of collected terms for the Bot Framework SDK docs, and by extension, the Composer docs. This is not meant to be the definitive source of truth, but notes taken as we hunt down the official terms to use. Meant to be a living document, as definitions and official terms will change over time.

To try to keep this from exploding, the intent to to capture terms that either are not easy to otherwise look up or we are constantly looking up but are not likely to change frequently.

<hr/>

[A](#a) | [B](#b) | [C](#c) | [D](#d) | [E](#e) | [F](#f) | [G](#g) | [H](#h) | [I](#i) | [J](#j) | [K](#k) | [L](#l) | [M](#m) | [N](#n) | [O](#o) | [P](#p) | [Q](#q) | [R](#r) | [S](#s) | [T](#t) | [U](#u) | [V](#v) | [W](#w) | [X](#x) | [Y](#y) | [Z](#z)

<hr/>

### Resources

These should be considered the sources of truth, and you _should not_ "use Microsoft.com, any other web page, or product UI as a source for product and feature names, capitalization, spelling, and usage".

#### On Corpnet

- [Term Studio][] &mdash; In theory, the source of truth, at least for product names.
- [Microsoft Cloud Style Guide][] / A–Z names + terms dictionary &mdash; Cloud-specific style guide. Searches here should also pick up terms in the Microsoft Writing Style Guide.
- [Microsoft Writing Style Guide][] / A–Z word list and term collections &mdash; Microsoft-wide style guide.

[Term Studio]: https://termstudio.azurewebsites.net/default.aspx
[Microsoft Cloud Style Guide]: https://styleguides.azurewebsites.net/StyleGuide/Read?id=2696
[Microsoft Writing Style Guide]: https://styleguides.azurewebsites.net/StyleGuide/Read?id=2700

#### On the web

- [American Heritage Dictionary][] &mdash; Source of truth for [most] common (non-Microsoft-specific) terms.

[American Heritage Dictionary]: https://www.ahdictionary.com/

#### Other

When in doubt and we don't have guidance yet, check with an appropriate subject matter expert, and get a second opinion, if the first answer seems odd or otherwise dubious.

- The Connector API team for the Connector REST API, Direct Line, and the Azure Bot Service channel connectors.
- The Bot Framework SDK dev team for the SDK and the channel adaptors.
- The Bot Framework Composer team.
- The Bot Framework Emulator team.

### General entry format

- **Heading**: The complete term to use on first mention, including proper casing and official acronym (if applicable).
- **Status**: Indicates whether the term is approved, in Term Studio, or just internal jargon.
- **Short form**: If applicable, shorter forms of the term that can be used on subsequent mention in an article, as long as context is clear.
- **Definition**: More or less official definition of the term.
- **Notes**: Additional notes, if any.
- **See also**: Links to related terms.

### Context

For many terms that start with the word Microsoft or Azure, like Microsoft Azure App Service Environment

<a id="a"></a>

## Azure App Service Environment

- **Status**: Approved, in Term Studio.
- **Short form**: App Service Environment, environment.
- **Definition**: The Azure App Service feature that provides a fully isolated and dedicated environment for securely running App Service apps at high scale.
- **Notes**: Don't use ASE as an acronym.
- **See also**: [Direct Line App Service extension](#direct-line-app-service-extension).

## Azure Bot Service

- **Status**: Approved, in Term Studio.
- **Short form**: Bot Service.
- **Definition**: The service that accelerates the process of developing a bot. It provisions a web host with one of five bot templates that can be modified in an integrated environment.
- **See also**: [Microsoft Bot Framework](#microsoft-bot-framework), [bot service](#bot-service).

<a id="b"></a>

## Bot Framework

See [Microsoft Bot Framework](#microsoft-bot-framework).

## bot service

- **Status**: Approved, in Term Studio.
- **Definition**: An instance created by the user using Azure Bot Service.
- **See also**: [Azure Bot Service](#azure-bot-service).

<a id="c"></a>
<a id="d"></a>

## Direct Line API

- **Status**: Approved, in Term Studio.
- **Short form**: Direct Line.
- **Definition**: The API that allows you to enable communication between your bot and your own client application.

## Direct Line App Service extension

- **Status**: Approved, not in Term Studio.
- **Short form**: App Service extension, extension.
- **Definition**: Allows clients to connect directly with the host, where the bot is located. It runs inside the same subscription, App Service, and Azure network as your bot and provides network isolation and, in some cases, improved performance.
- **Notes**: Don't use ASE as an acronym.
- **See also**: [Azure App Service Environment](#azure-app-service-environment).

## Direct Line Speech

- **Status**: Approved, in Term Studio.
- **Definition**: The solution used to create a voice assistant with richer and more sophisticated capabilities.

<a id="e"></a>
<a id="f"></a>
<a id="g"></a>
<a id="h"></a>
<a id="i"></a>
<a id="j"></a>
<a id="k"></a>
<a id="l"></a>
<a id="m"></a>

## Microsoft Bot Framework

- **Status**: Approved, in Term Studio.
- **Short form**: Bot Framework, framework.
- **Definition**: The comprehensive offering to build and deploy high quality bots for users to enjoy wherever they are talking. Users can start conversations with your bot from any channel that you've configured your bot to work on, such as SMS, Skype, Slack, Facebook, and other popular services.
- **Notes**: Do not shorten to BF.

### Bot Framework CLI tool

- **Status**: tbd
- **Short form**: CLI.
- **Definition**: A CLI (command-line interface) for managing Bot Framework bots and related services.

### Bot Framework Composer

- **Status**: Approved, in Term Studio.
- **Short form**: Composer.
- **Definition**: The open-source visual authoring tool that is used to build bots.

### Bot Framework Emulator

- **Status**: Approved, in Term Studio.
- **Short form**: Emulator.
- **Definition**: The application that allows bot developers to test and debug their bots locally or run them remotely through a tunnel.
- **Notes**: Do not use "Bot Framework Channel Emulator".

### Bot Framework SDK

## Microsoft Bot Framework Connector

- **Status**: Approved, in Term Studio, potentially stale.
- **Definition**: The communication service that helps you connect your bot with many different communication channels, such as SMS, email, and Skype.

<a id="n"></a>
<a id="o"></a>
<a id="p"></a>
<a id="q"></a>
<a id="r"></a>
<a id="s"></a>
<a id="t"></a>
<a id="u"></a>
<a id="v"></a>
<a id="w"></a>

## Web Chat

- **Status**: Approved, in Term Studio.
- **Definition**: The embeddable web chat control for the Microsoft Bot Framework using the Direct Line API.
- **Notes**: You may need to qualify this term, as there is a Web Chat control (to embed in a web page) and a Web Chat channel (in Azure).

<a id="x"></a>
<a id="y"></a>
<a id="z"></a>
2 changes: 2 additions & 0 deletions contributor-guide/contributor-guide-index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ ms.author: tysonn
- [Contribute to Bot Framework documentation](../README.md)
- [Content channel guidance](content-channel-guidance.md)
- [Style and voice](style-and-voice.md)
- [Formatting text](formatting-text.md)
- [Bot Framework terms (glossary)](bot-framework-glossary.md)

## Authoring articles: tools, processes, guidance

Expand Down
60 changes: 60 additions & 0 deletions contributor-guide/formatting-text.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Formatting text

This article attempts to bring together the sometimes contradictory guidance from the Docs contributors guide and Microsoft Style Guide, and when applicable, our own specific take on it.

## Referenced articles

These are the articles referenced in rough order of relevance

| Last checked | Article | Shorthand |
|:-|:-|:-|
| 1/1/2021 | Docs contributors guide / Resources / [Format text](https://review.docs.microsoft.com/en-us/help/contribute/text-formatting-guidelines?branch=master) | Format text |
| | MS Style Guide / Developer content / [Formatting developer text elements](https://docs.microsoft.com/en-us/style-guide/developer-content/formatting-developer-text-elements) | Dev text |
| | MS Style Guide / Procedures and instructions / [Describing interactions with UI](https://docs.microsoft.com/en-us/style-guide/procedures-instructions/describing-interactions-with-ui) | Describing UI |
| | MS Style Guide / Procedures and instructions / [Formatting text in instructions](https://docs.microsoft.com/en-us/style-guide/procedures-instructions/formatting-text-in-instructions) | Instructions |
| | MS Style Guide / Text formatting / [Formatting common text elements](https://docs.microsoft.com/en-us/style-guide/text-formatting/formatting-common-text-elements) | Common text |
| na | None. Agreed upon within the Bot Framework writing team, or based on input from the **Docs Support** Teams team. | The rough date of the last discussion on a specific element. |

## Guidance

| Element | Convention | Example | Source and notes |
|:-|:-|:-|:-|
| Code element [language-agnostic] | _Italic_ (when the meaning might be ambiguous) or normal. Use lower case (except where the element name includes a proper noun) and separate words with spaces. Treat this a little bit like a [new term](#new-term). | To receive a simple text message, use the _text_ property of the _activity_ object. | 2018: Decided to use descriptive terms in italic for SDK elements because the names are not identical across languages. However, this means that such text may get localized with formatting. |
| Code element [language-specific] | `Code`. Match the exact form of the element. In general, qualify what type of element you're talking about, such as namespace, class, method, property, keyword, and so on. Don't add () to the end of a method to indicate that it's a method, unless you need to include the full signature. | The `Attachments` property of the `Activity` object contains an array of `Attachment` objects that represent the media attachments and rich cards attached to the message. | Format text > [Code style](https://review.docs.microsoft.com/en-us/help/contribute/text-formatting-guidelines?branch=master#code-style) |
| Command-line commands | `Code`, inline or fenced. | Use `dotnet run` to start the bot. | Format text > [Code style](https://review.docs.microsoft.com/en-us/help/contribute/text-formatting-guidelines?branch=master#code-style)<br/>(Fenced code blocks include a copy button but take up more visual space.) |
| Emphasis | _Italic_. Use sparingly. Do not capitalize a word just for emphasis. | Cybercriminals might call you and claim to be from Microsoft. Be aware that Microsoft will _never_ call you to charge for security or software fixes. | [Common text](https://docs.microsoft.com/en-us/style-guide/text-formatting/formatting-common-text-elements) |
| <a id="file-names"></a>File names, folder names, and paths | **Bold**. Match the casing of the path. | Update **run.csx** with the following code: | 2018: We wanted some visual distinction that wasn't as jarring as the `code` format. Locallization shouldn't be an issue, since most file names and paths are not translatable. |
| File extensions | Normal. Lower case. Include the . before the extension name. | An .lu file contains Markdown-like, simple text based definitions for language understanding resources. | [Instructions](https://docs.microsoft.com/en-us/style-guide/procedures-instructions/formatting-text-in-instructions)<br/>When choosing between "a" or "an", assume the dot (.) is unvoiced. |
| Literals | TBD | TBD | TBD |
| <a id="new-term"></a>New term | _Italic_. Lower case, unless it is a proper noun. Only italicize on first mention, and include a description or example. | An app runs in an _App Service plan_. An App Service plan defines a set of compute resources for a web app to run on. | Format text > [Italics](https://review.docs.microsoft.com/en-us/help/contribute/text-formatting-guidelines?branch=master#italics) |
| Package names - TBD | **Bold**. Match the casing of the package name as it appears on the package repository site, such as on [NuGet](https://www.nuget.org/), [npm](https://www.npmjs.com/), and so on. Qualify the name with what type of package it is. | To use dialogs, install the **Microsoft.Bot.Builder.Dialogs** NuGet package. <br><br>OR<br><br> To use dialogs, install the *Microsoft.Bot.Builder.Dialogs* NuGet package. | 2018: Same reasoning as for [file names](#file-names). There is guidance suggesting [italics](https://review.docs.microsoft.com/help/contribute/text-formatting-guidelines?branch=master#code-style).|
| Sample names | **Bold** on first use. Match the sample name (use the name in the README). | A copy of the **Proactive messages** sample in [**C#**](#), [**JavaScript**](#), or [**Python**](#). | 2018: See [Localization](#localization) note. |
| UI elements [with a label or hover text] | **Bold**. Match the casing of the element's label or hover text. | In **Solution Explorer**, right-click the project node, and then select **Add** > **New Item**. | Format text > [Bold](https://review.docs.microsoft.com/help/contribute/text-formatting-guidelines?branch=master#bold) |
| UI elements [without a label or hover text] | _Italic_ on first use, then normal. Lower case. Treat this like a [new term](#new-term). | Both Azure DevOps Services and Azure DevOps Server 2019 use the new navigation user interface, with a vertical sidebar to go to the main service areas: **Boards**, **Repos**, **Pipelines**, and more. To learn more, see [Web portal navigation](#) in Azure DevOps. | 12/2020: The UI element without UI text in this example is the _sidebar_, as opposed to the service areas listed in the sidebar. |
| URLs [clickable] | Use a [link](https://review.docs.microsoft.com/en-us/help/contribute/links-how-to?branch=master#link-text) with link text that is descriptive [within the context] and does not include additional formatting. Do not use "here" as the link text. Use the title case if using the exact section, article, or TOC title. Consider notifying users if they are leaving a docset. | Knowledge of [Bot basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics). | [Links](https://review.docs.microsoft.com/en-us/help/contribute/links-how-to?branch=master#link-text) |
| URLs [clickable, exception] | When including a list of language-specific links to samples, we have been using the language name in **bold** for the link text. Don't include sample after the language name. | A copy of the **Proactive messages** sample in [**C#**](#), [**JavaScript**](#), or [**Python**](#). | 2018: Here, even for screen readers, the context should make the meaning of these links obvious. |
| URLs [non-clickable] | `Code`. | Enter your bot's URL, which is the URL of the local port, with /api/messages added to the path, typically `http://localhost:3978/api/messages`. | Format text > [Code style](https://review.docs.microsoft.com/en-us/help/contribute/text-formatting-guidelines?branch=master#code-style) |
| User input | TBD | TBD | TBD |

## Notes

### Icons

re: Microsoft Style Guide / A–Z word list and term collections / I / [icon](https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/i/icon)

[Icons Guidance](https://review.docs.microsoft.com/en-us/help/contribute/markdown-reference?branch=master#icons)

[Test themes and transparency](https://review.docs.microsoft.com/en-us/help/contribute/contribute-how-to-create-conceptual-art?branch=master#test-multiple-themes-and-transparency)

Avoid using the word _icon_ for icons that include a name or hover text.
To refer to the graphic itself, if there's no other identifying label, use _symbol_, as in _warning symbol_.

**Examples**

- Select **Resources** 📄.
- Select the warning symbol ⚠.
- Most apps have their own settings. Look for the gear icon ⚙ in the app.

### Localization

If you choose an alternate text style where code is normally called for, make sure it's okay for the text to be translated in localized versions of the article. Code is the only style that automatically prevents translation. For scenarios where you want to prevent localization without using code style, see [Non-localized strings](https://review.docs.microsoft.com/en-us/help/contribute/markdown-reference?branch=master#non-localized-strings) in the Contributors guide.