From 877763b960f5eeb387cfb5513084f99b578c5c87 Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Tue, 25 Nov 2025 17:08:39 -0500 Subject: [PATCH] More tweaks to collaboration docs (#43494) Release Notes: - N/A --- docs/src/collaboration/channels.md | 7 +++---- .../src/collaboration/contacts-and-private-calls.md | 13 ++++++++++--- docs/src/collaboration/overview.md | 5 ++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/src/collaboration/channels.md b/docs/src/collaboration/channels.md index b20cff2a12ced63cf75c13bfd8b63d25f2c53c50..ebc2760275c7e3382dfabeac296dfede1b58d268 100644 --- a/docs/src/collaboration/channels.md +++ b/docs/src/collaboration/channels.md @@ -18,7 +18,7 @@ You can mix channels for your day job, as well as side-projects in your collab p Joining a channel adds you to a shared room where you can work on projects together. -_[Join our channel tree to get an idea of how you can organize yours.](https://zed.dev/community-links)_ +_Join [our channel tree](https://zed.dev/channel/zed-283) to get an idea of how you can organize yours._ ## Inviting People @@ -93,9 +93,8 @@ This pane-specific behavior allows you to follow someone in one pane while navig ### Following a Terminal -You can follow what a collaborator is doing in their terminal by having them share their screen and following it. - -In the future, we plan to allow you to collaborate in the terminal directly in a shared project. +Following is not currently supported in the terminal in the way it is supported in the editor. +As a workaround, collaborators can share their screen and you can follow that instead. ## Screen Sharing diff --git a/docs/src/collaboration/contacts-and-private-calls.md b/docs/src/collaboration/contacts-and-private-calls.md index e5660a34b643b09272c1a1bb02e026c1a4bf8e03..f011fa2c672c2e6e563e65172705115802262a7e 100644 --- a/docs/src/collaboration/contacts-and-private-calls.md +++ b/docs/src/collaboration/contacts-and-private-calls.md @@ -6,13 +6,20 @@ These calls can be one-on-ones or contain any number of users from your contacts ## Adding a Contact 1. In the collaboration panel, click the `+` button next to the `Contacts` section -1. Search for the contact using their GitHub handle - _Note: The contact must be an existing Zed user who has completed the GitHub authentication flow._ +1. Search for the contact using their GitHub handle.\ + _Note: Your contact must be an existing Zed user who has completed the GitHub authentication sign-in flow._ 1. Your contact will receive a notification. Once they accept, you'll both appear in each other's contact list. ## Private Calls -Simply click on a contact to start a private call. +To start up a private call... + +1. Click the `...` menu next to an online contact's name in the collaboration panel. +1. Click `Call ` + +Once you've begun a private call, you can add other online contacts by clicking on their name in the collaboration panel. + +--- _Aside from a few additional features (channel notes, etc.), collaboration in private calls is largely the same as it is in [channels](./channels.md)._ diff --git a/docs/src/collaboration/overview.md b/docs/src/collaboration/overview.md index fae16290fe0d9eedbff8a27a9e510964bb5aba84..719aa56ee3b62c8562cd03ff8dd29faf25f2df5b 100644 --- a/docs/src/collaboration/overview.md +++ b/docs/src/collaboration/overview.md @@ -4,6 +4,7 @@ At Zed, we believe that great things are built by great people working together. We have designed Zed to help individuals work faster and help teams of people work together more effectively. In Zed, all collaboration happens in the collaboration panel, which can be opened via {#kb collab_panel::ToggleFocus} or `collab panel: toggle focus` from the command palette. + You will need to [sign in](../authentication.md#signing-in) in order to access features within the collaboration panel. ## Collaboration panel @@ -11,7 +12,7 @@ You will need to [sign in](../authentication.md#signing-in) in order to access f The collaboration panel is broken down into two sections: 1. [Channels](./channels.md): Ongoing project rooms where team members can share projects, collaborate on code, and maintain ambient awareness of what everyone is working on. -1. [Contacts](./contacts-and-private-calls.md): Ad-hoc private collaboration with those in your contacts list. +1. [Contacts and Private Calls](./contacts-and-private-calls.md): Your contacts list for ad-hoc private collaboration. --- @@ -19,3 +20,5 @@ The collaboration panel is broken down into two sections: > Since sharing a project gives them access to your local file system, you should not share projects with people you do not trust; they could potentially do some nasty things. > > In the future, we will do more to prevent this type of access beyond the shared project and add more control over what collaborators can do, but for now, only collaborate with people you trust. + +See our [Data and Privacy FAQs](https://zed.dev/faq#data-and-privacy) for collaboration.