From a57e7eba81b230892c25078780406db11f179e70 Mon Sep 17 00:00:00 2001 From: Open Publishing Build Robots Date: Sun, 17 Feb 2019 12:35:05 +0800 Subject: [PATCH] Confirm merge from repo_sync_working_branch to live to sync with https://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 --- docs/reference/manual-join.md | 14 +++--- docs/reference/platform-support.md | 8 ++-- docs/reference/security.md | 72 +++++++++++++++++------------- 3 files changed, 51 insertions(+), 43 deletions(-) diff --git a/docs/reference/manual-join.md b/docs/reference/manual-join.md index faa1c774..7212bc60 100644 --- 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,15 +36,15 @@ 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. @@ -52,7 +52,7 @@ 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 > Options > Live Share > User account**. @@ -60,13 +60,13 @@ Once installed, start Visual Studio and sign in if you have not already. If you 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 index c752cafc..bb32a9f5 100644 --- 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* 4 | | [ColdFusion (CFML)](https://marketplace.visualstudio.com/items?itemName=KamasamaK.vscode-cfml) | ✅ | *N/A* 4 | | [Crystal](https://marketplace.visualstudio.com/items?itemName=faustinoaq.crystal-lang) | ✅ | *N/A* 4 | @@ -123,13 +123,13 @@ All languages / platforms have same file intellisense (when the respective exten 4 Supported via shared terminals.
5 Debugging database stored procs is not currently supported
6 Via "preview". However, images do not appear due to known issue. [Vote (👍) here.](https://github.com/MicrosoftDocs/live-share/issues/61)
-7 Cordova apps can be shared via the the "browser" platform
+7 Cordova apps can be shared via the "browser" platform
8 React Native apps can be shared via Expo and [shared servers](../use/vscode.md#share-a-server).
9 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) | ✅ 2 | ✅ 3 | | Azure Functions | ✅ | ✅ 5 | | Azure Service Fabric | ✅ | ✅ 5 | -| [Azure Dev Spaces](http://aka.ms/devspaces) | ✅ | ✅ 1 | +| [Azure Dev Spaces](https://aka.ms/devspaces) | ✅ | ✅ 1 | | Databases | 4 | ✅ 5 | | Console / CLI | ✅ | ✅ 6 | | Desktop (WinForms) | ✅ | | diff --git a/docs/reference/security.md b/docs/reference/security.md index 4455e353..a050a1d8 100644 --- 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 > Options > Live Share > "Share External Files" to False