diff --git a/editor/publish.mdx b/editor/publish.mdx index 90d0366d5..cc012c10a 100644 --- a/editor/publish.mdx +++ b/editor/publish.mdx @@ -2,7 +2,7 @@ title: "Publish changes" sidebarTitle: "Publish" description: "Publish changes from the editor to your live site. Branches and protection rules determine what happens when you publish." -keywords: ["publish", "branch", "git", "commit", "conflicts", "deploy", "pull request", "granular publishing", "request review"] +keywords: ["publish", "branch", "git", "commit", "conflicts", "deploy", "pull request", "show teammates' changes", "request review"] --- Your changes save automatically as you edit, but they only reach your live site when you publish them. What happens when you publish depends on which branch you work on and whether that branch has branch protections. @@ -12,7 +12,7 @@ Your changes save automatically as you edit, but they only reach your live site If there is no branch selector, [show the branch selector](#show-the-branch-selector). - If you only see your own changes in the **Publish** menu, turn on [granular publishing](#publish-specific-changes) to see everyone's changes. + If you only see your own changes in the **Publish** menu, turn on [Show teammates' changes](/editor/settings#show-teammates-changes) to see everyone's changes. ## Pending changes @@ -54,15 +54,19 @@ If any page on your branch has invalid MDX, the editor disables the **Publish** ## Publish specific changes -When several people have pending changes on your deployment branch, the [**Granular publishing**](/editor/settings#granular-publishing) setting controls which changes the **Publish** menu shows. +When several people have pending changes on your deployment branch, the [**Show teammates' changes**](/editor/settings#show-teammates-changes) setting controls which changes the **Publish** menu lists. -**Granular publishing off (default)**: The **Publish** menu shows only your changes. That includes files you edited, files that you and teammates both edited, and files with no recorded author. **Publish** and **Discard all** apply only to those changes. If teammates have other pending changes, a notice says that their changes are hidden. +**Show teammates' changes off (default)**: The **Publish** menu lists only your changes under **Your changes**. That includes files you edited, files that you and teammates both edited, and files with no recorded author. Teammates' other pending changes don't appear in the menu. -**Granular publishing on**: The **Publish** menu splits pending changes into **Your changes** and **Modified by others**. Your changes start selected, and others' changes start unselected. Use the checkboxes to select which changes to publish. Each section has its own **Discard** button. +Each of your changes has a checkbox, and all of them start selected. Clear the checkboxes for changes you want to leave out, then click **Publish**. Only the selected changes publish. If you clear every checkbox, the editor disables **Publish**. + +**Show teammates' changes on**: The **Publish** menu splits pending changes into **Your changes** and **Modified by others**. Your changes start selected, and others' changes start unselected. Use the checkboxes to select which changes to publish. + +Each section has its own **Discard** button that applies only to the changes in that section. A contributors icon marks files that someone other than you edited. Hover over it to see who edited the file. -- Granular publishing only applies on a deployment branch without branch protections. On feature branches, publishing includes every pending change. +- Selecting changes to publish only applies on a deployment branch without branch protections. On feature branches, publishing includes every pending change. - Deleting a folder deletes every page inside it. Those deletions publish together. You can't partially delete a folder. - Some changes depend on each other, like a page and its navigation entry. If your selection leaves out a change that a selected change depends on, the publish fails with an error. Adjust your selection to include the dependency, then publish again. diff --git a/editor/settings.mdx b/editor/settings.mdx index 3d2348f87..c2dced05e 100644 --- a/editor/settings.mdx +++ b/editor/settings.mdx @@ -52,12 +52,12 @@ When this setting is on, each commit the editor makes includes the person who ma If you connect your GitHub account to Mintlify, the co-author attribution uses your GitHub no-reply email address. Otherwise, it uses the email address on your Mintlify account. -## Granular publishing +## Show teammates' changes -Granular publishing controls which pending changes the **Publish** menu shows on your deployment branch. +Show teammates' changes controls whether the **Publish** menu lists your teammates' pending changes on your deployment branch. -- **Off (default)**: The **Publish** menu shows and publishes only your own changes. Changes that only teammates made are hidden. -- **On**: The **Publish** menu shows everyone's pending changes, split into **Your changes** and **Modified by others**, with a checkbox on each change so you can select what to publish. +- **Off (default)**: The **Publish** menu lists only your own changes. Select which of them to publish. Changes that only teammates made don't appear. +- **On**: The **Publish** menu also lists your teammates' pending changes, split into **Your changes** and **Modified by others**, so you can publish them too. This setting only takes effect while you work on your deployment branch and that branch has no branch protections. See [Publish specific changes](/editor/publish#publish-specific-changes) for more information.