@@ -50,9 +50,9 @@ The locale to use.
 |---|---|---|---|
 | Any value except 1 | Valid single byte or lead byte | `_MBC_SINGLE` (0) | Single byte (0x20 - 0x7E, 0xA1 - 0xDF) |
 | Any value except 1 | Valid single byte or lead byte | `_MBC_LEAD` (1) | Lead byte of multibyte character (0x81 - 0x9F, 0xE0 - 0xFC) |
-| Any value except 1 | Valid single-byte or lead byte | `_MBC_ILLEGAL`<br /><br /> (-1) | Invalid character (any value except 0x20 - 0x7E, 0xA1 - 0xDF, 0x81 - 0x9F, 0xE0 - 0xFC |
+| Any value except 1 | Valid single-byte or lead byte | `_MBC_ILLEGAL` (-1) | Invalid character: not single or lead (0x00 - 0x1F, 0x7F, 0x80, 0xA0, 0xFD, 0xFE, 0xFF) |
 | 1 | Valid trail byte | `_MBC_TRAIL` (2) | Trailing byte of multibyte character (0x40 - 0x7E, 0x80 - 0xFC) |
-| 1 | Valid trail byte | `_MBC_ILLEGAL`<br /><br /> (-1) | Invalid character (any value except 0x20 - 0x7E, 0xA1 - 0xDF, 0x81 - 0x9F, 0xE0 - 0xFC |
+| 1 | Valid trail byte | `_MBC_ILLEGAL` (-1) | Invalid character: not trailing (0x00 - 0x3F, 0x7F, 0xFD, 0xFE, 0xFF) |
 
 ## Remarks
 
 
@@ -16,33 +16,37 @@ For example, the following code uses a function call in the *filter* expression:
 ```cpp
 // exceptions_Writing_an_Exception_Filter.cpp
 #include <windows.h>
+int Eval_Exception(int);
 int main() {
-   int Eval_Exception( int );
-
-   __try {}
-
-   __except ( Eval_Exception( GetExceptionCode( ))) {
-      ;
-   }
-
+    __try {
+        ;
+    }
+    __except (Eval_Exception(GetExceptionCode())) {
+        ;
+    }
+}
+void HandleOverflow() {
+    // Gracefully recover
 }
-void ResetVars( int ) {}
-int Eval_Exception ( int n_except ) {
-   if ( n_except != STATUS_INTEGER_OVERFLOW &&
-      n_except != STATUS_FLOAT_OVERFLOW )   // Pass on most exceptions
-   return EXCEPTION_CONTINUE_SEARCH;
-
-   // Execute some code to clean up problem
-   ResetVars( 0 );   // initializes data to 0
-   return EXCEPTION_CONTINUE_EXECUTION;
+int Eval_Exception(int n_except) {
+    if (
+        n_except != STATUS_INTEGER_OVERFLOW &&
+        n_except != STATUS_FLOAT_OVERFLOW
+    ) {
+        // Pass on most exceptions
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+    // Execute some code to clean up problem
+    HandleOverflow();
+    return EXCEPTION_CONTINUE_EXECUTION;
 }
 ```
 
 It's a good idea to use a function call in the *filter* expression whenever *filter* needs to do anything complex. Evaluating the expression causes execution of the function, in this case, `Eval_Exception`.
 
 Note the use of [`GetExceptionCode`](/windows/win32/Debug/getexceptioncode) to determine the exception. This function must be called inside the filter expression of the **`__except`** statement. `Eval_Exception` can't call `GetExceptionCode`, but it must have the exception code passed to it.
 
-This handler passes control to another handler unless the exception is an integer or floating-point overflow. If it is, the handler calls a function (`ResetVars` is only an example, not an API function) to reset some global variables. The **`__except`** statement block, which in this example is empty, can never be executed because `Eval_Exception` never returns `EXCEPTION_EXECUTE_HANDLER` (1).
+This handler passes control to another handler unless the exception is an integer or floating-point overflow. If it is, the handler calls a function (`HandleOverflow` is only an example, not an API function) to appropriately try to recover from the exception. The **`__except`** statement block, which in this example is empty, can never be executed because `Eval_Exception` never returns `EXCEPTION_EXECUTE_HANDLER` (1).
 
 Using a function call is a good general-purpose technique for dealing with complex filter expressions. Two other C language features that are useful are:
 
@@ -53,21 +57,21 @@ Using a function call is a good general-purpose technique for dealing with compl
 The conditional operator is frequently useful here. It can be used to check for a specific return code and then return one of two different values. For example, the filter in the following code recognizes the exception only if the exception is `STATUS_INTEGER_OVERFLOW`:
 
 ```cpp
-__except( GetExceptionCode() == STATUS_INTEGER_OVERFLOW ? 1 : 0 ) {
+__except (GetExceptionCode() == STATUS_INTEGER_OVERFLOW ? 1 : 0)
 ```
 
 The purpose of the conditional operator in this case is mainly to provide clarity, because the following code produces the same results:
 
 ```cpp
-__except( GetExceptionCode() == STATUS_INTEGER_OVERFLOW ) {
+__except (GetExceptionCode() == STATUS_INTEGER_OVERFLOW)
 ```
 
 The conditional operator is more useful in situations where you might want the filter to evaluate to -1, `EXCEPTION_CONTINUE_EXECUTION`.
 
 The comma operator lets you execute multiple expressions in sequence. It then returns the value of the last expression. For example, the following code stores the exception code in a variable and then tests it:
 
 ```cpp
-__except( nCode = GetExceptionCode(), nCode == STATUS_INTEGER_OVERFLOW )
+__except (nCode = GetExceptionCode(), nCode == STATUS_INTEGER_OVERFLOW)
 ```
 
 ## See also
 
@@ -85,14 +85,14 @@ If `ssh` isn't already set up and running on your Linux system, follow these ste
    | **Password** | Password for the entered user name |
    | **Private key file** | Private key file created for ssh connection |
    | **Passphrase** | Passphrase used with private key selected above |
-   
+
    You can't click the **Connect** button until all the required fields are completed and the port is set to an integer between 1 and 65535.
-   
-   You can use either a password or a key file and passphrase for authentication. For many development scenarios, password authentication is sufficient, but key files are more secure. If you already have a key pair, it's possible to reuse it.
 
-   Versions of Visual Studio before 17.10 support EC, RSA, and DSA keys for remote connections. Because of security concerns, RSA and DSA keys are no longer supported in VS 17.10 and later. Only EC keys are currently supported. To create a key pair compatible with the connection manager use the command:
+   You can use either a password or a key file and passphrase for authentication. Key files are more secure than username/password. If you already have a key pair, it's possible to reuse it.
+
+   Versions of Visual Studio before 17.10 support Elliptic Curve (EC), Rivert-Shamir-Adleman (RSA), and Digital signature algorithm (DSA) keys for remote connections. Because of security concerns, RSA and DSA keys are no longer supported in VS 17.10 and later. Only EC keys are currently supported. To create a key pair compatible with the connection manager use the command:
    `ssh-keygen -m pem -t ecdsa -f <key-name>`
-   
+
    > [!NOTE]
    > If using `ssh-keygen` to create the private key, you must specify the switch `-m pem`, or the key will not be accepted by Visual Studio. If your private key begins with `-----BEGIN OPENSSH PRIVATE KEY-----`, you must convert it with `ssh-keygen -p -f <FILE> -m pem`.
 
 
@@ -9,17 +9,17 @@ helpviewer_keywords: ["ConnectionManager program"]
 
 ::: moniker range="<=msvc-150"
 
-ConnectionManager.exe is available in Visual Studio 2019 version 16.5 and later.
+`ConnectionManager.exe` is available in Visual Studio 2019 version 16.5 and later.
 
 ::: moniker-end
 
 ::: moniker range=">=msvc-160"
 
 ConnectionManager.exe is a command-line utility to manage remote development connections outside of Visual Studio. It's useful for tasks such as provisioning a new development machine. Or, use it to set up Visual Studio for continuous integration. You can use it in a Developer Command Prompt window. For more information about the Developer Command Prompt, see [Use the Microsoft C++ toolset from the command line](../build/building-on-the-command-line.md).
 
-ConnectionManager.exe is available in Visual Studio 2019 version 16.5 and later. It's part of the **Linux development with C++** workload in the Visual Studio Installer. It's also installed automatically when you choose the **Connection Manager** component in the installer. It's installed in *%VCIDEInstallDir%\\Linux\\bin\\ConnectionManagerExe\\ConnectionManager.exe*.
+`ConnectionManager.exe` is available in Visual Studio 2019 version 16.5 and later. It's part of the **Linux development with C++** workload in the Visual Studio Installer. It's also installed automatically when you choose the **Connection Manager** component in the installer. It's installed in `%VCIDEInstallDir%\Linux\bin\ConnectionManagerExe\ConnectionManager.exe`.
 
-The functionality of ConnectionManager.exe is also available in Visual Studio. To manage remote development connections in the IDE, on the menu bar, choose **Tools** > **Options** to open the Options dialog. In the Options dialog, select **Cross Platform** > **Connection Manager**.
+The functionality of `ConnectionManager.exe` is also available in Visual Studio. To manage remote development connections in the IDE, on the menu bar, choose **Tools** > **Options** to open the Options dialog. In the Options dialog, select **Cross Platform** > **Connection Manager**.
 
 ## Syntax
 
@@ -29,7 +29,13 @@ The functionality of ConnectionManager.exe is also available in Visual Studio. T
 
 - **`add`** *user\@host* \[**`--port`** *port*] \[**`--password`** *password*] \[**`--privatekey`** *privatekey_file*]
 
-  Authenticates and adds a new connection. By default, it uses port 22 and password authentication. (You'll be prompted to enter a password.) Use both **-`-password`** and **`--privatekey`** to specify a password for a private key.
+  Authenticates and adds a new connection. By default, it uses port 22 and password authentication. (You are prompted to enter a password.)
+
+  You can use either a password or a key file and passphrase for authentication. Key files are more secure than username/password. If you already have a key pair, it's possible to reuse it. Use both **-`-password`** and **`--privatekey`** to specify a passphrase for a private key file.
+
+  Versions of Visual Studio before 17.10 support Elliptic Curve (EC), Rivert-Shamir-Adleman (RSA), and Digital signature algorithm (DSA) keys for remote connections. Because of security concerns, RSA and DSA keys are no longer supported in VS 17.10 and later. Only EC keys are currently supported.
+
+  To create a key pair compatible with the connection manager, use the command `ssh-keygen -m pem -t ecdsa -f <key-name>`. If you use `ssh-keygen` to create the private key, you must specify the switch `-m pem`, or the key won't be accepted by Visual Studio. If your private key begins with `-----BEGIN OPENSSH PRIVATE KEY-----`, you must convert it with `ssh-keygen -p -f <FILE> -m pem`.
 
 - **`clean`**
 
@@ -48,7 +54,7 @@ The functionality of ConnectionManager.exe is also available in Visual Studio. T
   Defines or modifies a property on a connection.\
   If *value* is empty, then the property *key* is deleted.\
   If authentication fails, no changes will be made.\
-  If no connection is specified (what is meant by *default*, above), the user's default remote connection is used.
+  If no connection is specified, the user's default remote connection is used.
 
 - **`remove`** \[*connection_id* \| *user\@host* \[**`--port`** *port*]]
 
@@ -57,7 +63,7 @@ The functionality of ConnectionManager.exe is also available in Visual Studio. T
 - **`remove-all`**
 
   Removes all stored connections.
-    
+
 - **`update`** \[*default* \| *all* \| *connection_id* \| *user\@host* \[**`--port`** *port*]] \[**`--previous`**] [**`--fingerprint`**]
 
   Added in Visual Studio 16.10. Updates the host key fingerprint of the specified connection(s).
@@ -135,7 +141,7 @@ ConnectionManager.exe remove 1975957870
 | `port` | The port used for the connection.<br/>Change the port for the specified connection: `ConnectionManager.exe modify -21212121 --property port=22`|
 | `shell` | The preferred shell to use on the remote system. Supported shells are `sh, csh, bash, tcsh, ksh, zsh, dash`<br/>To set the preferred shell to be zsh for the remote machine on the specified connection: `ConnectionManager.exe modify -21212121 --property shell=zsh`<br/>If the shell found on the Linux system isn't supported, then **`sh`** is used for all commands. |
 | `systemID` | The remote system type, such as `"OSX"`, `"Ubuntu"`. |
-| `timeout` | The connection timeout in milliseconds. Change the timeout for the specified connection with: `ConnectionManager.exe modify -21212121 --property timeout=100`
+| `timeout` | The connection timeout in milliseconds. Change the timeout for the specified connection with: `ConnectionManager.exe modify -21212121 --property timeout=100` |
 | `username` | The name of the user logged into the remote computer.<br/>To add a connection for a user named `"user"` on localhost: `ConnectionManager.exe add user@127.0.0.1`|
 
 ## See also