Confirm merge from repo_sync_working_branch to live to sync with http…

…s://github.com/microsoftdocs/live-share (branch master) (#123) * docs: typo fix (#1646) @@ line 367 old: ```simply needs to hare state button``` @@ line 367 new: ```needs to click the share / session``` * Adding user profile entry to ToC * fix: docs/reference/manual-join.md (#1697) - Adjust heading levels not to skip - joinign -> joining - indentify -> identify * fix: Add code fence language to JSON examples (#1692) * fix: docs/reference/platform-support.md (#1698) - Double word "the" - Double word "features" - Use https for links
microsoft · Feb 17, 2019 · a57e7eb · a57e7eb
1 parent 9bbe69a
commit a57e7eb
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 43 deletions.
diff --git a/docs/reference/manual-join.md b/docs/reference/manual-join.md
@@ -22,7 +22,7 @@ The exact instructions vary between [Visual Studio](#join-from-visual-studio) an
 
 ## Join from Visual Studio Code
 
-#### 1. Sign in
+### 1. Sign in
 
 >**Note:** If you want to join a collaboration session as a read-only guest, you can skip signing in. You will have access to viewing and navigating around the code that is shared but not be able to make edits.
 
@@ -36,37 +36,37 @@ Your browser will launch while a notification will appear launch asking you to s
 
 If you are running into problems with VS Code not picking up a successful sign-in, click on the "Having trouble" link on the success screen in the browser and follow the directions. Check out [troubleshooting](../troubleshooting.md#sign-in) for more tips.
 
-#### 2. Use the join command
+### 2. Use the join command
 
 Open the Live Share viewlet in the VS Code activity bar, and select the "Join collaboration session..." icon or entry.
 
 ![Join viewlet icon](../media/vscode-join-viewlet.png)
 
->**Note:** If you are joinign as a read-only guest, you will then be asked to enter a display name to help participants indentify you in the session. 
+>**Note:** If you are joining as a read-only guest, you will then be asked to enter a display name to help participants identify you in the session.
 
-#### 3. Paste the invite link
+### 3. Paste the invite link
 
 Paste in the invite URL you were sent and hit 'Enter' to confirm.
 
 That's it! You should be connected to the collaboration session momentarily.
 
 ## Join from Visual Studio
 
-#### 1. Sign in
+### 1. Sign in
 
 Once installed, start Visual Studio and sign in if you have not already. If you need to use a different sign-in for Visual Studio than your [personalization account](https://docs.microsoft.com/en-us/visualstudio/ide/signing-in-to-visual-studio), go to **Tools &gt; Options &gt; Live Share &gt; User account**.
 
 ![VS sign in](../media/vs-sign-in-button.png)
 
 Still having trouble? See [troubleshooting](../troubleshooting.md#sign-in).
 
-#### 2. Use the join command
+### 2. Use the join command
 
 Simply go to **File > Join Collaboration Session**.
 
 ![VS Join menu](../media/vs-join.png)
 
-#### 3. Paste the invite link
+### 3. Paste the invite link
 
 Paste in the invite URL you were sent and hit 'Enter' to confirm.
 

diff --git a/docs/reference/platform-support.md b/docs/reference/platform-support.md
@@ -39,7 +39,7 @@ All languages / platforms have same file intellisense (when the respective exten
 | Ballerina | ✅ | ✅ |
 | Bash | ✅ | ✅ |
 | C++ | ✅ | ✅ |
-| C# | ✅ | ✅ | 
+| C# | ✅ | ✅ |
 | Clojure | ✅ | *N/A* <sup>4</sup> |
 | [ColdFusion (CFML)](https://marketplace.visualstudio.com/items?itemName=KamasamaK.vscode-cfml) | ✅ | *N/A* <sup>4</sup> |
 | [Crystal](https://marketplace.visualstudio.com/items?itemName=faustinoaq.crystal-lang) | ✅ | *N/A* <sup>4</sup> |
@@ -123,13 +123,13 @@ All languages / platforms have same file intellisense (when the respective exten
 <sup>4</sup> Supported via shared terminals.<br />
 <sup>5</sup> Debugging database stored procs is not currently supported <br />
 <sup>6</sup> Via "preview". However, images do not appear due to known issue. [Vote (👍) here.](https://github.com/MicrosoftDocs/live-share/issues/61)<br />
-<sup>7</sup> Cordova apps can be shared via the the "browser" platform<br />
+<sup>7</sup> Cordova apps can be shared via the "browser" platform<br />
 <sup>8</sup> React Native apps can be shared via Expo and [shared servers](../use/vscode.md#share-a-server).<br />
 <sup>9</sup> Live Share doesn't currently support sharing windows/screens. [Vote (👍) here.](https://github.com/MicrosoftDocs/live-share/issues/236)
 
 ## Visual Studio
 
-While most languages have some single file Intellisense support, there are some caveats outlined below. All languages/platforms support co-editing. The remainder of the list covers advanced features features currently without complete, universal support:
+While most languages have some single file Intellisense support, there are some caveats outlined below. All languages/platforms support co-editing. The remainder of the list covers advanced features currently without complete, universal support:
 
 ### Languages
 
@@ -166,7 +166,7 @@ While most languages have some single file Intellisense support, there are some
 | Web app (Front-end) | ✅ <sup>2</sup> | ✅ <sup>3</sup> |
 | Azure Functions | ✅  | ✅ <sup>5</sup> |
 | Azure Service Fabric | ✅ | ✅ <sup>5</sup> |
-| [Azure Dev Spaces](http://aka.ms/devspaces) | ✅ | ✅ <sup>1</sup> |
+| [Azure Dev Spaces](https://aka.ms/devspaces) | ✅ | ✅ <sup>1</sup> |
 | Databases | <sup>4</sup> | ✅ <sup>5</sup> |
 | Console / CLI | ✅ | ✅ <sup>6</sup> |
 | Desktop (WinForms) | ✅ | |

diff --git a/docs/reference/security.md b/docs/reference/security.md
@@ -111,20 +111,22 @@ You can accomplish this by adding a **.vsls.json** file to the folder or project
 
 Here's an example .vsls.json file:
 
-    {
-        "$schema": "http://json.schemastore.org/vsls",
-        "gitignore":"none",
-        "excludeFiles":[
-            "*.p12",
-            "*.cer",
-            "token",
-            ".gitignore"
-        ],
-        "hideFiles": [
-            "bin",
-            "obj"
-        ]
-    }
+```json
+{
+    "$schema": "http://json.schemastore.org/vsls",
+    "gitignore":"none",
+    "excludeFiles":[
+        "*.p12",
+        "*.cer",
+        "token",
+        ".gitignore"
+    ],
+    "hideFiles": [
+        "bin",
+        "obj"
+    ]
+}
+```
 
 > **Note:** You can also make the all files/folders you share **read-only** when you start a collaboration session. See [below](#read-only-mode) for details.
 
@@ -146,26 +148,30 @@ The **gitignore** setting establishes how Live Share should process the contents
 
 A downside of the `exclude` setting is that the contents of folders like node_modules are frequently in .gitignore but can be useful to step into during debugging. Consequently, Live Share supports the ability to reverse a rule using "!" in the excludeFiles property. For example, this .vsls.json file would exclude everything in ".gitignore" except for node_modules:
 
-    {
-        "$schema": "http://json.schemastore.org/vsls",
-        "gitignore":"exclude",
-        "excludeFiles":[
-            "!node_modules"
-        ]
-    }
+```json
+{
+    "$schema": "http://json.schemastore.org/vsls",
+    "gitignore":"exclude",
+    "excludeFiles":[
+        "!node_modules"
+    ]
+}
+```
 
 The hide and exclude rules are processed separately, so if you still wanted to hide node_modules to reduce clutter without actually excluding it, you can simply edit the file as follows:
 
-    {
-        "$schema": "http://json.schemastore.org/vsls",
-        "gitignore":"exclude",
-        "excludeFiles":[
-            "!node_modules"
-        ],
-        "hideFiles":[
-            "node_modules"
-        ]
-    }
+```json
+{
+    "$schema": "http://json.schemastore.org/vsls",
+    "gitignore":"exclude",
+    "excludeFiles":[
+        "!node_modules"
+    ],
+    "hideFiles":[
+        "node_modules"
+    ]
+}
+```
 
 ### .vsls.json files in sub-folders
 
@@ -178,7 +184,9 @@ By default, Live Share will also share any files the host opens that are externa
 If you would prefer to disable this feature:
 * In **VS Code**, add the following to settings.json:
 
-        liveshare.shareExternalFiles: false
+```json
+liveshare.shareExternalFiles: false
+```
 
 * In **Visual Studio**, set Tools &gt; Options &gt; Live Share &gt; "Share External Files" to False