Skip to content

Commit

Permalink
Merge pull request #244 from marp-team/workspace-trust-stable
Browse files Browse the repository at this point in the history
Update documentation of workspace trust (for stable)
  • Loading branch information
yhatt authored Jun 7, 2021
2 parents cdc676c + 1b9bac4 commit 4fc363a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Changed

- Update documentation of workspace trust ([#244](https://github.com/marp-team/marp-vscode/pull/244))
- Upgrade dependent packages to the latest version ([#245](https://github.com/marp-team/marp-vscode/pull/245))

## v1.0.1 - 2021-05-18
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ You can fold the content of slide in editor while editing Marp Markdown.

### Security

#### [Workspace Trust](https://github.com/microsoft/vscode/issues/106488)
#### [Workspace Trust]

<!-- TODO: Update link to the formal documentation -->
Some features that may met malicious are restricted in the untrusted workspace/window. Please read [VS Code's user guide][workspace trust] for details.

Some features that may met malicious are restricted in the untrusted workspace (marked by the shield icon :shield: in this documentation).
Features may be restricted are marked by the shield icon 🛡️ in this documentation. Marp for VS Code is available even if the current workspace is not trusted but you can use only a basic Marp preview and IntelliSense.

If the workspace is not trusted, you can use only a basic Marp preview and IntelliSense.
[workspace trust]: https://code.visualstudio.com/docs/editor/workspace-trust

#### Enable HTML in Marp Markdown :shield:

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"capabilities": {
"untrustedWorkspaces": {
"supported": "limited",
"description": "Required for exporting Markdown, and using themes configured in the workspace.",
"description": "Workspace trust is required for exporting slide deck, and using themes configured in the workspace.",
"restrictedConfigurations": [
"markdown.marp.enableHtml",
"markdown.marp.themes"
Expand Down

0 comments on commit 4fc363a

Please sign in to comment.