Merge pull request #7894 from MicrosoftDocs/main637853188600669987

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: ghogen

.openpublishing.redirection.mac.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/mac/accessibility-ide-options.md",
+      "redirect_url": "/visualstudio/mac/accessibility",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/mac/accessibility-macos.md",
+      "redirect_url": "/visualstudio/mac/accessibility",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/mac/accessibility-voiceover.md",
       "redirect_url": "/visualstudio/mac/accessibility-macos?view=vsmac-2019",

docs/index.yml

@@ -36,8 +36,10 @@ productDirectory:
     - title: Visual Studio for Mac
       imageSrc: ./media/vs-mac-2019.svg
       links:
-        - url: /visualstudio/mac
-          text: Visual Studio 2019 for Mac (current)
+        - url: /visualstudio/mac/?view=vsmac-2022&preserve-view=true
+          text: Visual Studio 2022 for Mac (current)
+        - url: /visualstudio/mac/?view=vsmac-2019&preserve-view=true
+          text: Visual Studio 2019 for Mac
         - url: /previous-versions/visualstudio/mac/
           text: Visual Studio 2017 for Mac
         - url: /visualstudio/releasenotes/vs2019-mac-relnotes

mac/TOC.yml

@@ -6,8 +6,6 @@
       href: ide-tour.md
     - name: Visual Studio for Mac for Windows users
       href: vsmac-for-windows-users.md
-    - name: Integrated terminal
-      href: integrated-terminal.md
 - name: Installation
   items: 
     - name: Install
@@ -64,6 +62,8 @@
       href: managing-solutions-and-project-properties.md
     - name: Multitargeting
       href: project-multitargeting.md
+    - name: Integrated terminal
+      href: integrated-terminal.md
     - name: Managing references in a project
       items: 
         - name: Overview
@@ -184,10 +184,6 @@
   items: 
     - name: Overview
       href: accessibility.md
-    - name: Setting IDE accessibility options
-      href: accessibility-ide-options.md
-    - name: Using macOS Accessibility Tools
-      href: accessibility-macos.md
     - name: Using Keyboard Navigation
       href: accessibility-keyboard.md
 - name: Reference

mac/accessibility-ide-options.md

@@ -1,30 +1,101 @@
 ---
-title: "Accessibility"
-description: "Introduction of accessibility features in Visual Studio for Mac and how they can be enabled."
+title: "Accessibility options in Visual Studio for Mac IDE and macOS"
+description: "Introduction of accessibility features in Visual Studio for Mac and how they can be enabled. Also learn about using macOS accessibility options and features, such as high contrast, keyboard navigation, and VoiceOver in Visual Studio for Mac"
 author: jmatthiesen
 ms.author: jomatthi
 manager: dominicn
-ms.date: 09/23/2019
+ms.date: 02/23/2022
 ms.assetid: 2C4AAC2E-3B4A-4496-8BE0-1F5A7F81D1CA
 ms.topic: overview
 ---
 
 # Accessibility
 
-There are a number of accessibility tools and features built right into macOS to assist you when using Visual Studio for Mac.  In addition to these, Visual Studio for Mac also has the following features to make it more accessible for people of varying abilities:
+There are a number of accessibility tools and features built right into macOS to assist you when using Visual Studio for Mac. These features include a high-contrast mode, keyboard navigation, and VoiceOver (the macOS screen reader).
+
+In addition to these, Visual Studio for Mac also has the following features to make it more accessible for people of varying abilities:
 
 * Editor text enlargement
 * Tool window text enlargement
 * Code editor color theme customization
 * Keyboard shortcut customization
 * Keyboard navigation
 
+In this article, learn how to use macOS accessibility features, and to set accessibility options in the Visual Studio for Mac IDE.
+
 > [!NOTE]
 > This guide refers to Visual Studio for Mac. For Visual Studio on Windows, see [Accessibility features of Visual Studio](/visualstudio/ide/reference/accessibility-features-of-visual-studio).
 
-For more information, see the following topics:
+::: moniker range="vsmac-2019"
+## Enable macOS accessibility features in Visual Studio for Mac
+
+In Visual Studio for Mac, support for assistive technologies is turned off by default. To enable accessibility support:
+
+1. Go to **Visual Studio (menu)** > **Preferences** > **Other**, and select **Accessibility**.
+
+1. Select the **Enable Accessibility** check box.
+
+   ![Screenshot of Accessibility Preferences, with Enable Accessibility selected](media/accessibility-preferences.png)
+
+1. Select **Restart Visual Studio** to enable support for the assistive technologies of Apple.
+
+Alternatively, you can use the command line to enable accessibility features. To do this, enter the following command in terminal:
+
+```bash
+defaults write com.microsoft.visual-studio com.monodevelop.AccessibilityEnabled 1
+```
+
+After changing this setting via the command line, you will need to restart Visual Studio.
+
+::: moniker-end
+
+## Increase the contrast in macOS
+
+Visual Studio for Mac supports increased contrast in macOS, increasing the contrast of UI elements and making outlines more defined. To enable this:
+
+1. Open **System Preferences**.
+
+1. Go to **Accessibility**, and select **Display**.
+
+1. Select the **Increase contrast** check box.
+
+## Resize tool windows and editor content
+
+1. Choose the tool window or editor window for which you want to resize the content.
+
+1. Choose **View (menu)**, and then select **Zoom In (⌘+)** or **Zoom Out (⌘-)**.
+
+> [!TIP]
+> To reset the content to the default size, you can choose **View (menu)** > **Normal Size (⌘0)**.
+
+## Change the content font and size
+
+It's possible to customize the font and size of content in most tool windows in Visual Studio for Mac. Here's how:
+
+1. Go to **Visual Studio (menu)** > **Preferences... (⌘,)**.
+
+1. In **Preferences**, go to **Environment** > **Fonts**.
+
+1. For either **Text Editor**, **General Tool Window Text**, or **Output Window Contents**, select the font and size button.
+
+1. Select your desired font, style, and size, and select **OK**.
+
+> [!TIP]
+> To return to the default font and style for each setting, select **Set to Default**.
+
+## Change the editor syntax highlighting
+
+Some users might find that the default color scheme doesn't meet their contrast or color requirements. Visual Studio for Mac has a number of alternative themes that the user can select, including two high contrast themes.
+
+1. Go to **Visual Studio (menu)** > **Preferences... (⌘,)**.
+
+1. In **Preferences**, go to **Text Editor** > **Color Theme**.
+
+1. Select your desired theme.
+
+> [!TIP]
+> The theme will update in the editor in real time, so you can preview and select your preferred theme.
+
+For more information, see the following topic:
 
-* [Set IDE accessibility options](accessibility-ide-options.md)
-* [Use macOS accessibility features and tools](accessibility-macos.md)
-* [Use keyboard navigation](accessibility-keyboard.md)
-* [Use macOS VoiceOver with Visual Studio for Mac](accessibility-voiceover.md)
+* [Use keyboard navigation](accessibility-keyboard.md)

mac/accessibility-macos.md

@@ -32,7 +32,7 @@
           "ThirdPartyNotices"
         ],
         "src": "./",
-        "group": "vsmac-2019"
+        "group": "vsmac-2019-2022"
       }
     ],
     "resource": [
@@ -63,7 +63,7 @@
           "**/includes/**"
         ],
         "src": "./",
-        "group": "vsmac-2019"
+        "group": "vsmac-2019-2022"
       }
     ],
     "overwrite": [],
@@ -125,9 +125,9 @@
         "dest": "2017",
         "moniker_range": "vsmac-2017"
       },
-      "vsmac-2019": {
-        "dest": "2019",
-        "moniker_range": "vsmac-2019"
+      "vsmac-2019-2022": {
+        "dest": "2019-2022",
+        "moniker_range": ">=vsmac-2019"
       }
     }
   }