Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
**Your team edits together.** Multiple people can edit the same page at once, with live cursors showing who is working where. Comments and suggestions are visible to everyone.

<Tip>
If the editor ever appears out of sync with your repository, use [Reset editor](/editor/settings#reset-editor) to force a resync. For example, an empty file tree or the error `Unable to find docs.json` appears when the file is present on your deployment branch.
If the editor ever appears out of sync with your repository, use [Reset editor](/editor/settings#reset-editor) to force a resync. For example, an empty file tree or the error `Unable to find docs.json` appears even when the file is present on your deployment branch.
</Tip>

## Editor layout
Expand Down Expand Up @@ -67,7 +67,7 @@
Combining changes from one branch into another. Merging into your deployment branch publishes those changes.
</Accordion>
<Accordion title="Conflict">
Two branches with incompatible changes to the same lines. The editor prompts you to choose which version to keep in order to resolve conflicts before merging.

Check warning on line 70 in editor/index.mdx

View check run for this annotation

Mintlify / Mintlify Validation (mintlify) - vale-spellcheck

editor/index.mdx#L70

Use 'to' instead of 'in order to'.
</Accordion>
<Accordion title="Diff">
A comparison between two versions of a file. The editor shows a diff of your pending changes before you publish.
Expand Down
2 changes: 1 addition & 1 deletion editor/pages.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
keywords: ["editor", "content", "pages", "navigation", "version history", "media", "images", "private pages"]
---

## Home and Publishing

Check warning on line 8 in editor/pages.mdx

View check run for this annotation

Mintlify / Mintlify Validation (mintlify) - vale-spellcheck

editor/pages.mdx#L8

'Home and Publishing' should use sentence-style capitalization.

The editor workspace is split into two tabs: **Home** and **Publishing**.

Check warning on line 10 in editor/pages.mdx

View check run for this annotation

Mintlify / Mintlify Validation (mintlify) - vale-spellcheck

editor/pages.mdx#L10

In general, use active voice instead of passive voice ('is split').

**Home** is your workspace. It shows the content files in your repository, including your private pages, whether or not they appear on your published site.

Check warning on line 12 in editor/pages.mdx

View check run for this annotation

Mintlify / Mintlify Validation (mintlify) - vale-spellcheck

editor/pages.mdx#L12

Use the Oxford comma in 'It shows the content files in your repository, including your private pages, whether or'.

**Publishing** is your published site. It shows the navigation your visitors see, along with your site settings.

Home hides some files by default including `docs.json`, files and folders whose names start with a dot, files with no extension, all-caps Markdown files like `README.md`, and `.css`, `.js`, `.jsx`, `.mjs`, `.cjs`, and `.pdf` files. To see all files, turn on [Show all files](/editor/settings#appearance) or press <kbd>Cmd</kbd> + <kbd>Shift</kbd> + <kbd>.</kbd> (macOS) or <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>.</kbd> (Windows).
Home hides some files by default, including `docs.json`, files and folders whose names start with a dot, files with no extension, all-caps Markdown files like `README.md`, and `.css`, `.js`, `.jsx`, `.mjs`, `.cjs`, and `.pdf` files. To see all files, turn on [Show all files](/editor/settings#appearance) or press <kbd>Cmd</kbd> + <kbd>Shift</kbd> + <kbd>.</kbd> (macOS) or <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>.</kbd> (Windows).

## Create a page

Expand Down Expand Up @@ -59,7 +59,7 @@

To view version history, click <Icon icon="ellipsis" /> **More options** in the top-right of the page, then click **Version history**.

If you restore a version, it overwrites any unsaved changes you made to the page. When you restore a public page, it is only restored on your current branch. When you restore a private page, it is restored on all branches.

Check warning on line 62 in editor/pages.mdx

View check run for this annotation

Mintlify / Mintlify Validation (mintlify) - vale-spellcheck

editor/pages.mdx#L62

In general, use active voice instead of passive voice ('is restored').

## Private pages

Expand Down