Resolve syncing conflicts from repo_sync_working_branch to master

.openpublishing.publish.config.json

@@ -15,6 +15,18 @@
       },
       "build_entry_point": "docs",
       "template_folder": "_themes"
+    },
+    {
+      "docset_name": "writing-style-guide-msft-internal",
+      "build_source_folder": "writing-style-guide-msft-internal",
+      "build_output_subfolder": "writing-style-guide-msft-internal",
+      "locale": "en-us",
+      "monikers": [],
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content"
+      },
+      "build_entry_point": "docs"
     }
   ],
   "notification_subscribers": [],
@@ -24,21 +36,19 @@
   ],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/microsoft-style-guide",
-  "git_repository_branch_open_to_public_contributors": "master",
-  "skip_source_output_uploading": false,
+  "git_repository_branch_open_to_public_contributors": "main",
   "need_preview_pull_request": true,
-  "contribution_branch_mappings": {},
   "dependent_repositories": [
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "_themes.pdf",
       "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     }
   ],
@@ -48,13 +58,13 @@
       "Pdf"
     ]
   },
-  "need_generate_pdf_url_template": true,
-  "Targets": {
+  "targets": {
     "Pdf": {
       "template_folder": "_themes.pdf"
     }
   },
-  "docs_build_engine": {
-    "name": "docfx_v3"
-  }
-}
+  "docs_build_engine": {},
+  "skip_source_output_uploading": false,
+  "contribution_branch_mappings": {},
+  "need_generate_pdf_url_template": true
+}

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

styleguide/TOC.md

@@ -79,7 +79,6 @@
 ### [back end, back-end](a-z-word-list-term-collections/b/back-end.md)
 ### [back up, backup](a-z-word-list-term-collections/b/back-up-backup.md)
 ### [backbone](a-z-word-list-term-collections/b/backbone.md)
-### [backlight](a-z-word-list-term-collections/b/backlight.md)
 ### [backspace](a-z-word-list-term-collections/b/backspace.md)
 ### [backtab](a-z-word-list-term-collections/b/backtab.md)
 ### [badge](a-z-word-list-term-collections/b/badge.md)
@@ -143,7 +142,7 @@
 ### [chart](a-z-word-list-term-collections/c/chart.md)
 ### [chat](a-z-word-list-term-collections/c/chat.md)
 ### [chatbot](a-z-word-list-term-collections/c/chatbot.md)
-### [check, check box, check mark](a-z-word-list-term-collections/c/check-check-box-check-mark.md)
+### [check, checkbox, check mark](a-z-word-list-term-collections/c/check-checkbox-check-mark.md)
 ### [check in](a-z-word-list-term-collections/c/check-in.md)
 ### [child folder](a-z-word-list-term-collections/c/child-folder.md)
 ### [choose](a-z-word-list-term-collections/c/choose.md)
@@ -187,13 +186,15 @@
 ### [control-menu box](a-z-word-list-term-collections/c/control-menu-box.md)
 ### [conversation as a platform (CaaP)](a-z-word-list-term-collections/c/conversation-as-a-platform-caap.md)
 ### [conversational user interface (CUI)](a-z-word-list-term-collections/c/conversational-user-interface-cui.md)
+### [Copilot, copilot](a-z-word-list-term-collections/c/Copilot-copilot.md)
 ### [-core](a-z-word-list-term-collections/c/dash-core.md)
 ### [corrupted](a-z-word-list-term-collections/c/corrupted.md)
 ### [country or region](a-z-word-list-term-collections/c/country-or-region.md)
 ### [crash](a-z-word-list-term-collections/c/crash.md)
 ### [cut, cut-and-paste](a-z-word-list-term-collections/c/cut-and-paste.md)
 ### [cyber-](a-z-word-list-term-collections/c/cyber.md)
 ## D
+### [dark mode](a-z-word-list-term-collections/d/dark-mode.md)
 ### [data, datum](a-z-word-list-term-collections/d/data-datum.md)
 ### [data binding](a-z-word-list-term-collections/d/data-binding.md)
 ### [data record](a-z-word-list-term-collections/d/data-record.md)
@@ -224,7 +225,8 @@
 ### [dimmed](a-z-word-list-term-collections/d/dimmed.md)
 ### [direction keys](a-z-word-list-term-collections/d/direction-keys.md)
 ### [directory](a-z-word-list-term-collections/d/directory.md)
-### [disable, disabled](a-z-word-list-term-collections/d/disable-disabled.md)
+### [disable, disables (functionality)](a-z-word-list-term-collections/d/disable-disabled.md)
+### [disabled (person)](a-z-word-list-term-collections/d/disabled-(person).md)
 ### [disc](a-z-word-list-term-collections/d/disc.md)
 ### [disjoint selection](a-z-word-list-term-collections/d/disjoint-selection.md)
 ### [disk](a-z-word-list-term-collections/d/disk.md)
@@ -245,7 +247,7 @@
 ### [drill down, drill up, drill through](a-z-word-list-term-collections/d/drill-down-drill-up-drill-through.md)
 ### [drive](a-z-word-list-term-collections/d/drive.md)
 ### [drive name](a-z-word-list-term-collections/d/drive-name.md)
-### [drop-down](a-z-word-list-term-collections/d/drop-down.md)
+### [dropdown](a-z-word-list-term-collections/d/dropdown.md)
 ### [DVD](a-z-word-list-term-collections/d/dvd.md)
 ### [dynamic-link library (DLL)](a-z-word-list-term-collections/d/dynamic-link-library-dll.md)
 ### [dynamic service capacity](a-z-word-list-term-collections/d/dynamic-service-capacity.md)
@@ -424,6 +426,7 @@
 ### [Internet of Things (IoT)](a-z-word-list-term-collections/i/internet-of-things-iot.md)
 ### [internet service provider (ISP)](a-z-word-list-term-collections/i/internet-service-provider.md)
 ### [invalid, not valid](a-z-word-list-term-collections/i/invalid-not-valid.md)
+### [invite](a-z-word-list-term-collections/i/invite.md)
 ### [invoke](a-z-word-list-term-collections/i/invoke.md)
 ### [IP address](a-z-word-list-term-collections/i/ip-address.md)
 ### [issue](a-z-word-list-term-collections/i/issue.md)
@@ -439,6 +442,8 @@
 ## K
 ### [Kerberos protocol](a-z-word-list-term-collections/k/kerberos-protocol.md)
 ### [key combination](a-z-word-list-term-collections/k/key-combination.md)
+### [key performance indicator (KPI)](a-z-word-list-term-collections/k/key-performance-indicator-(KPI).md)
+### [key result (KR)](a-z-word-list-term-collections/k/key-result-(KR).MD)
 ### [key sequence](a-z-word-list-term-collections/k/key-sequence.md)
 ### [keyboard shortcut](a-z-word-list-term-collections/k/keyboard-shortcut.md)
 ### [keypad](a-z-word-list-term-collections/k/keypad.md)
@@ -491,7 +496,7 @@
 ### [management information systems](a-z-word-list-term-collections/m/management-information-systems.md)
 ### [manipulate](a-z-word-list-term-collections/m/manipulate.md)
 ### [marquee](a-z-word-list-term-collections/m/marquee.md)
-### [master/slave, master/subordinate](a-z-word-list-term-collections/m/master-slave-master-subordinate.md)
+### [master/slave](a-z-word-list-term-collections/m/master-slave.md)
 ### [mathematical](a-z-word-list-term-collections/m/mathematical.md)
 ### [matrix, matrices](a-z-word-list-term-collections/m/matrix-matrices.md)
 ### [Maximize button, maximize](a-z-word-list-term-collections/m/maximize-button-maximize.md)
@@ -563,6 +568,7 @@
 ### [numeric](a-z-word-list-term-collections/n/numeric.md)
 ## O
 ### [object](a-z-word-list-term-collections/o/object.md)
+### [objectives and key results (OKR)](a-z-word-list-term-collections/o/objectives-and-key-results-(OKR).md)
 ### [obsolete](a-z-word-list-term-collections/o/obsolete.md)
 ### [of](a-z-word-list-term-collections/o/of.md)
 ### [offline](a-z-word-list-term-collections/o/offline.md)
@@ -607,7 +613,7 @@
 ### [peripheral](a-z-word-list-term-collections/p/peripheral.md)
 ### [permissions](a-z-word-list-term-collections/p/permissions.md)
 ### [personal digital assistant](a-z-word-list-term-collections/p/personal-digital-assistant.md)
-### [phone](a-z-word-list-term-collections/p/phone.md)
+### [phone, phone number](a-z-word-list-term-collections/p/phone.md)
 ### [photo](a-z-word-list-term-collections/p/photo.md)
 ### [pin, unpin](a-z-word-list-term-collections/p/pin-unpin.md)
 ### [pinch](a-z-word-list-term-collections/p/pinch.md)
@@ -642,7 +648,7 @@
 ### [profile](a-z-word-list-term-collections/p/profile.md)
 ### [program](a-z-word-list-term-collections/p/program.md)
 ### [program file](a-z-word-list-term-collections/p/program-file.md)
-### [prompt](a-z-word-list-term-collections/p/prompt.md)
+### [prompt, prompting](a-z-word-list-term-collections/p/prompt.md)
 ### [prop](a-z-word-list-term-collections/p/prop.md)
 ### [property](a-z-word-list-term-collections/p/property.md)
 ### [property sheet, property page](a-z-word-list-term-collections/p/property-sheet-property-page.md)
@@ -706,6 +712,7 @@
 ### [search, search and replace](a-z-word-list-term-collections/s/search-and-replace.md)
 ### [search box](a-z-word-list-term-collections/s/search-box.md)
 ### [secondary menu](a-z-word-list-term-collections/s/secondary-menu.md)
+### [see, see also, and similar phrases](a-z-word-list-term-collections/s/see-see-also-and-similar-phrases.md)
 ### [select](a-z-word-list-term-collections/s/select.md)
 ### [server](a-z-word-list-term-collections/s/server.md)
 ### [service-level agreement (SLA)](a-z-word-list-term-collections/s/service-level-agreement-sla.md)
@@ -732,6 +739,7 @@
 ### [small caps](a-z-word-list-term-collections/s/small-caps.md)
 ### [smart card, Smart Card](a-z-word-list-term-collections/s/smart-card.md)
 ### [smartphone](a-z-word-list-term-collections/s/smartphone.md)
+### [smb](a-z-word-list-term-collections/s/smb.md)
 ### [snap-in](a-z-word-list-term-collections/s/snap-in.md)
 ### [social chatbot](a-z-word-list-term-collections/s/social-chatbot.md)
 ### [soft copy](a-z-word-list-term-collections/s/soft-copy.md)
@@ -798,6 +806,7 @@
 ### [top-level folder](a-z-word-list-term-collections/t/top-level-folder.md)
 ### [touchpad](a-z-word-list-term-collections/t/touchpad.md)
 ### [touchscreen](a-z-word-list-term-collections/t/touchscreen.md)
+### [touch-sensitive](a-z-word-list-term-collections/t/touch-sensitive.md)
 ### [toward](a-z-word-list-term-collections/t/toward.md)
 ### [trackball](a-z-word-list-term-collections/t/trackball.md)
 ### [trailing](a-z-word-list-term-collections/t/trailing.md)
@@ -856,6 +865,7 @@
 ### [wearable, wearable device](a-z-word-list-term-collections/w/wearable-wearable-device.md)
 ### [web, World Wide Web, WWW](a-z-word-list-term-collections/w/web-world-wide-web-www.md)
 ### [web services](a-z-word-list-term-collections/w/web-services.md)
+### [wellbeing](a-z-word-list-term-collections/w/wellbeing.md)
 ### [where](a-z-word-list-term-collections/w/where.md)
 ### [while](a-z-word-list-term-collections/w/while.md)
 ### [white hat hacker](a-z-word-list-term-collections/w/white-hat-hacker.md)
@@ -867,7 +877,7 @@
 ### [wildcard character](a-z-word-list-term-collections/w/wildcard-character.md)
 ### [window](a-z-word-list-term-collections/w/window.md)
 ### [Windows, Windows-based](a-z-word-list-term-collections/w/windows-windows-based.md)
-### [Windows 7, Windows 8, Windows 10](a-z-word-list-term-collections/w/windows-7-windows-8-windows-10.md)
+### [Windows 10, Windows 11](a-z-word-list-term-collections/w/windows-10-windows-11.md)
 ### [Windows Explorer](a-z-word-list-term-collections/w/windows-explorer.md)
 ### [wireframe](a-z-word-list-term-collections/w/wireframe.md)
 ### [wireless](a-z-word-list-term-collections/w/wireless.md)
@@ -879,6 +889,7 @@
 ### [workgroup](a-z-word-list-term-collections/w/workgroup.md)
 ### [working memory](a-z-word-list-term-collections/w/working-memory.md)
 ### [workstation](a-z-word-list-term-collections/w/workstation.md)
+### [workstream](a-z-word-list-term-collections/w/workstream.md)
 ### [worldwide vs. international](a-z-word-list-term-collections/w/worldwide-vs-international.md)
 ### [write-only](a-z-word-list-term-collections/w/write-only.md)
 ### [write-protect, write-protected](a-z-word-list-term-collections/w/write-protect-write-protected.md)
@@ -902,6 +913,7 @@
 ## [Graphics, design, and media](accessibility/graphics-design-media.md)
 # [Acronyms](acronyms.md)
 # [Bias-free communication](bias-free-communication.md)
+## [Militaristic language](militaristic-language.md)
 # [Capitalization](capitalization.md)
 # [Chatbots and virtual agents](chatbots-virtual-agents/index.md)
 ## [Structural and technical considerations](chatbots-virtual-agents/structural-technical-considerations.md)
@@ -935,7 +947,6 @@
 ## [Describing interactions with UI](procedures-instructions/describing-interactions-with-ui.md)
 ## [Describing alternative input methods](procedures-instructions/describing-alternative-input-methods.md)
 ## [Formatting text in instructions](procedures-instructions/formatting-text-in-instructions.md)
-## [Illustrating network traffic flows](procedures-instructions/illustrating-network-traffic-flows.md)
 # [Punctuation](punctuation/index.md)
 ## [Formatting punctuation](punctuation/formatting-punctuation.md)
 ## [Apostrophes](punctuation/apostrophes.md)

styleguide/a-z-word-list-term-collections/a/abort-abortion.md

@@ -1,13 +1,14 @@
 ---
-title: abort, abortion - Microsoft Style Guide
+title: Abort, Abortion - Microsoft Style Guide
+description: This article outlines the use of the words abort and abortion per Microsoft style guidelines.
 author: pallep
 ms.author: pallep
 ms.date: 01/19/2018
 ms.topic: article
-ms.prod: non-product-specific
+ms.service: microsoft-writing-style-guide
 ---
 
-# abort, abortion
+# Abort, Abortion
 
 Never use *abortion.* 
 
@@ -18,7 +19,7 @@ a technical audience only if it's part of the application
 programming interface (API). Use an alternative term
 in comments and descriptions.
 
-## Alternative terms
+## Alternative Terms
 
   - *End:* use for communications and network connections.
   - *Close:* use for apps and programs.

styleguide/a-z-word-list-term-collections/a/above.md

@@ -1,17 +1,18 @@
 ---
-title: above - Microsoft Style Guide
+title: Above - Microsoft Style Guide
+description: This article outlines the use of the word above per Microsoft style guidelines, with examples.
 author: pallep
 ms.author: pallep
-ms.date: 01/19/2018
+ms.date: 01/19/2019
 ms.topic: article
-ms.prod: non-product-specific
+ms.service: microsoft-writing-style-guide
 ---
 
-# above
+# Above
 
 Don't use to mean *earlier*. 
 
-Don't use as an adjective preceding a noun (*the above section*) or following a noun (*the code above*). Use a hyperlink, or use *previous, preceding,* or *earlier.* 
+Don't use as an adjective preceding a noun (*the above section*) or following a noun (*the code above*). Use a link, or use *previous, preceding,* or *earlier.* 
 
 **Examples**  
 Use the preceding code to display information about the database.  

styleguide/a-z-word-list-term-collections/a/access-key.md

@@ -1,12 +1,13 @@
 ---
-title: access key - Microsoft Style Guide
+title: Access Key - Microsoft Style Guide
+description: This article provides a link to a keys and keyboard shortcuts term collection.
 author: pallep
 ms.author: pallep
 ms.date: 01/19/2018
 ms.topic: article
-ms.prod: non-product-specific
+ms.service: microsoft-writing-style-guide
 ---
 
-# access key
+# Access Key
 
 See [Keys and keyboard shortcuts term collection](/style-guide/a-z-word-list-term-collections/term-collections/keys-keyboard-shortcuts)

styleguide/a-z-word-list-term-collections/a/access.md

@@ -1,13 +1,14 @@
 ---
-title: access - Microsoft Style Guide
+title: Access - Microsoft Style Guide
+description: This article outlines the use of the word access per Microsoft style guidelines.
 author: pallep
 ms.author: pallep
 ms.date: 01/19/2018
 ms.topic: article
-ms.prod: non-product-specific
+ms.service: microsoft-writing-style-guide
 ---
 
-# access
+# Access
 
 It's OK to use as a verb to mean *obtain access to*. 
 

styleguide/a-z-word-list-term-collections/a/accessible.md

@@ -1,13 +1,14 @@
 ---
-title: accessible - Microsoft Style Guide
+title: Accessible - Microsoft Style Guide
+description: This article outlines the use of the word accessible per Microsoft style guidelines, with examples.
 author: pallep
 ms.author: pallep
 ms.date: 01/19/2018
 ms.topic: article
-ms.prod: non-product-specific
+ms.service: microsoft-writing-style-guide
 ---
 
-# accessible
+# Accessible
 
 Reserve *accessible* and *accessibility* to refer to things that are easy to use for everyone, including people with disabilities.