From 5dc7d17d16666d902b017d5600e7d4ffab469390 Mon Sep 17 00:00:00 2001
From: Ben Potter <me@bpmct.net>
Date: Wed, 15 Sep 2021 00:13:42 -0500
Subject: [PATCH 1/4] add CodeTogether docs

---
 docs/collaboration.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/docs/collaboration.md b/docs/collaboration.md
index d1235ec0e..0a7cc2358 100644
--- a/docs/collaboration.md
+++ b/docs/collaboration.md
@@ -29,3 +29,33 @@ SERVICE_URL=https://open-vsx.org/vscode/gallery \
 ### Sharing with Duckly
 
 As `code-server` is based on VS Code, you can follow the steps described on Duckly's [Pair programming with VS Code](https://duckly.com/tools/vscode) page and skip the installation step.
+
+## Code sharing with CodeTogether
+
+[CodeTogether](https://www.codetogether.com/) is another service with cross-platform live collaborative features:
+
+- sharing ports
+- shared read/write terminals
+- joining via web browser or another IDE
+
+However, some of these are [paid options](https://www.codetogether.com/pricing/).
+
+### Installing the CodeTogether extension
+
+1. Install the CodeTogether extension from OpenVSX on `code-server`.
+
+   ```sh
+   SERVICE_URL=https://open-vsx.org/vscode/gallery \
+     ITEM_URL=https://open-vsx.org/vscode/item \
+     code-server --install-extension genuitecllc.codetogether
+   ```
+
+2. CodeTogether requires VS Code's proposed API to run. Start code-server with the following flag:
+
+   ```sh
+   code-server --enable-proposed-api genuitecllc.codetogether
+   ```
+
+   Or you could add a value in code-server's [config file](https://coder.com/docs/code-server/v3.11.1/FAQ#how-does-the-config-file-work).
+
+3. Refresh code-server and navigate to the CodeTogether icon in the sidebar to start collaborating.

From 3ce2b10076534e56098a8baa44fe9cf2ed006e21 Mon Sep 17 00:00:00 2001
From: Ben Potter <me@bpmct.net>
Date: Wed, 15 Sep 2021 00:17:33 -0500
Subject: [PATCH 2/4] use same formatting

---
 docs/collaboration.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/collaboration.md b/docs/collaboration.md
index 0a7cc2358..393727a1b 100644
--- a/docs/collaboration.md
+++ b/docs/collaboration.md
@@ -34,9 +34,9 @@ As `code-server` is based on VS Code, you can follow the steps described on Duck
 
 [CodeTogether](https://www.codetogether.com/) is another service with cross-platform live collaborative features:
 
-- sharing ports
-- shared read/write terminals
-- joining via web browser or another IDE
+- Sharing ports,
+- Sharing, read/write terminals,
+- Joining via web browser or another IDE.
 
 However, some of these are [paid options](https://www.codetogether.com/pricing/).
 

From 0ed8c8a294cd38741c5a5fb9c40bac9859420598 Mon Sep 17 00:00:00 2001
From: Ben Potter <me@bpmct.net>
Date: Wed, 15 Sep 2021 00:18:50 -0500
Subject: [PATCH 3/4] change language

---
 docs/collaboration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/collaboration.md b/docs/collaboration.md
index 393727a1b..d655b0b79 100644
--- a/docs/collaboration.md
+++ b/docs/collaboration.md
@@ -58,4 +58,4 @@ However, some of these are [paid options](https://www.codetogether.com/pricing/)
 
    Or you could add a value in code-server's [config file](https://coder.com/docs/code-server/v3.11.1/FAQ#how-does-the-config-file-work).
 
-3. Refresh code-server and navigate to the CodeTogether icon in the sidebar to start collaborating.
+3. Refresh code-server and navigate to the CodeTogether icon in the sidebar to host or join a coding session.

From e5d0f966c64e66ce80030940a242359f7f5fb168 Mon Sep 17 00:00:00 2001
From: Ben Potter <me@bpmct.net>
Date: Wed, 15 Sep 2021 00:20:16 -0500
Subject: [PATCH 4/4] improve wording

---
 docs/collaboration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/collaboration.md b/docs/collaboration.md
index d655b0b79..0726435b3 100644
--- a/docs/collaboration.md
+++ b/docs/collaboration.md
@@ -56,6 +56,6 @@ However, some of these are [paid options](https://www.codetogether.com/pricing/)
    code-server --enable-proposed-api genuitecllc.codetogether
    ```
 
-   Or you could add a value in code-server's [config file](https://coder.com/docs/code-server/v3.11.1/FAQ#how-does-the-config-file-work).
+   Another option would be to add a value in code-server's [config file](https://coder.com/docs/code-server/v3.11.1/FAQ#how-does-the-config-file-work).
 
 3. Refresh code-server and navigate to the CodeTogether icon in the sidebar to host or join a coding session.