From 5b4fb69d54a5ca97c35b6894cd3c6a5c4a80ae42 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 16 Dec 2020 14:56:14 -0700 Subject: [PATCH] docs: fix codetour and docs --- .tours/contributing.tour | 6 +++--- doc/CONTRIBUTING.md | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.tours/contributing.tour b/.tours/contributing.tour index 7a92c71b..2bece390 100644 --- a/.tours/contributing.tour +++ b/.tours/contributing.tour @@ -143,9 +143,9 @@ "description": "Static images and the manifest live here in `src/browser/media` (see the explorer)." }, { - "file": "ci/dev/vscode.patch", + "directory": "lib/vscode", "line": 1, - "description": "code-server makes use of VS Code's frontend web/remote support. Most of the patch implements the remote server since that portion of the code is closed source and not released with VS Code.\n\nWe also have a few bug fixes and have added some features (like client-side extensions). See [https://github.com/cdr/code-server/blob/master/doc/CONTRIBUTING.md#vs-code-patch](https://github.com/cdr/code-server/blob/master/doc/CONTRIBUTING.md#vs-code-patch) for a list.\n\nWe make an effort to keep the patch as small as possible." + "description": "code-server makes use of VS Code's frontend web/remote support. Most of the modifications implement the remote server since that portion of the code is closed source and not released with VS Code.\n\nWe also have a few bug fixes and have added some features (like client-side extensions). See [https://github.com/cdr/code-server/blob/master/doc/CONTRIBUTING.md#modifications-to-vs-code](https://github.com/cdr/code-server/blob/master/doc/CONTRIBUTING.md#modifications-to-vs-code) for a list.\n\nWe make an effort to keep the modifications as few as possible." } ] -} +} \ No newline at end of file diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 238b6617..b9df5558 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -2,13 +2,12 @@ # Contributing -- [Contributing](#contributing) - [Pull Requests](#pull-requests) - [Requirements](#requirements) - [Development Workflow](#development-workflow) - [Build](#build) - [Structure](#structure) - - [VS Code Patch](#vs-code-patch) + - [Modifications to VS Code](#modifications-to-vs-code) - [Currently Known Issues](#currently-known-issues) @@ -114,7 +113,7 @@ The CLI code is in [./src/node](./src/node) and the HTTP routes are implemented Most of the meaty parts are in the VS Code portion of the codebase under [./lib/vscode](./lib/vscode), which we described next. -### VS Code Patch +### Modifications to VS Code In v1 of code-server, we had a patch of VS Code that split the codebase into a front-end and a server. The front-end consisted of all UI code, while the server ran the extensions