diff --git a/packages/netlify-cms-core/src/components/UI/SettingsDropdown.js b/packages/netlify-cms-core/src/components/UI/SettingsDropdown.js index a3562c69..cce85908 100644 --- a/packages/netlify-cms-core/src/components/UI/SettingsDropdown.js +++ b/packages/netlify-cms-core/src/components/UI/SettingsDropdown.js @@ -57,7 +57,7 @@ const SettingsDropdown = ({ displayUrl, isTestRepo, imageUrl, onLogoutClick, t } {isTestRepo && ( diff --git a/website/content/docs/add-to-your-site.md b/website/content/docs/add-to-your-site.md index 23ab80a4..4909f306 100755 --- a/website/content/docs/add-to-your-site.md +++ b/website/content/docs/add-to-your-site.md @@ -88,7 +88,7 @@ backend: branch: master # Branch to update (optional; defaults to master) ``` -_(For Bitbucket repositories, use the [Bitbucket backend](../authentication-backends/#bitbucket-backend) instructions instead.)_ +_(For Bitbucket repositories, use the [Bitbucket backend](/docs/bitbucket-backend) instructions instead.)_ The configuration above specifies your backend protocol and your publication branch. Git Gateway is an open source API that acts as a proxy between authenticated users of your site and your site repo. (We'll get to the details of that in the [Authentication section](#authentication) below.) If you leave out the `branch` declaration, it defaults to `master`. @@ -222,7 +222,7 @@ collections: ## Authentication -Now that you have your Netlify CMS files in place and configured, all that's left is to enable authentication. We're using the [Netlify](https://www.netlify.com/) platform here because it's one of the quickest ways to get started, but you can learn about other authentication options in the [Authentication & Backends](../authentication-backends) doc. +Now that you have your Netlify CMS files in place and configured, all that's left is to enable authentication. We're using the [Netlify](https://www.netlify.com/) platform here because it's one of the quickest ways to get started, but you can learn about other authentication options in the [Backends](/docs/backends-overview) doc. ### Setup on Netlify diff --git a/website/content/docs/beta-features.md b/website/content/docs/beta-features.md index e57ed85b..c2a930f6 100644 --- a/website/content/docs/beta-features.md +++ b/website/content/docs/beta-features.md @@ -67,7 +67,7 @@ Learn more about the benefits of GraphQL in the [GraphQL docs](https://graphql.o ## Open Authoring -When using the [GitHub backend](/docs/authentication-backends/#github-backend), you can use Netlify CMS to accept contributions from GitHub users without giving them access to your repository. When they make changes in the CMS, the CMS forks your repository for them behind the scenes, and all the changes are made to the fork. When the contributor is ready to submit their changes, they can set their draft as ready for review in the CMS. This triggers a pull request to your repository, which you can merge using the GitHub UI. +When using the [GitHub backend](/docs/github-backend), you can use Netlify CMS to accept contributions from GitHub users without giving them access to your repository. When they make changes in the CMS, the CMS forks your repository for them behind the scenes, and all the changes are made to the fork. When the contributor is ready to submit their changes, they can set their draft as ready for review in the CMS. This triggers a pull request to your repository, which you can merge using the GitHub UI. At the same time, any contributors who _do_ have write access to the repository can continue to use Netlify CMS normally. diff --git a/website/content/docs/collection-types.md b/website/content/docs/collection-types.md index 1cd650fe..e8d0d2cf 100644 --- a/website/content/docs/collection-types.md +++ b/website/content/docs/collection-types.md @@ -82,7 +82,7 @@ A `files` collection contains one or more uniquely configured files. Unlike item When configuring a `files` collection, configure each file in the collection separately, and list them under the `files` field of the collection. Each file has its own list of `fields` and a unique filepath specified in the `file` field (relative to the base of the repo). -**Note:** Files listed in a file collection must already exist in the hosted repository branch set in your Netlify CMS [backend configuration](../authentication-backends/). Files must also have a valid value for the file type. For example, an empty file works as valid YAML, but a JSON file must have a non-empty value to be valid, such as an empty object. +**Note:** Files listed in a file collection must already exist in the hosted repository branch set in your Netlify CMS [backend configuration](/docs/backends-overview). Files must also have a valid value for the file type. For example, an empty file works as valid YAML, but a JSON file must have a non-empty value to be valid, such as an empty object. Example: diff --git a/website/content/docs/configuration-options.md b/website/content/docs/configuration-options.md index 63298561..e0b8726c 100644 --- a/website/content/docs/configuration-options.md +++ b/website/content/docs/configuration-options.md @@ -20,7 +20,7 @@ You can find details about all configuration options below. Note that [YAML synt *This setting is required.* -The `backend` option specifies how to access the content for your site, including authentication. Full details and code samples can be found in [Authentication & Backends](../authentication-backends). +The `backend` option specifies how to access the content for your site, including authentication. Full details and code samples can be found in [Backends](/docs/backends-overview). **Note**: no matter where you access Netlify CMS — whether running locally, in a staging environment, or in your published site — it will always fetch and commit files in your hosted repository (for example, on GitHub), on the branch you configured in your Netlify CMS config.yml file. This means that content fetched in the admin UI will match the content in the repository, which may be different from your locally running site. It also means that content saved using the admin UI will save directly to the hosted repository, even if you're running the UI locally or in staging. diff --git a/website/content/docs/git-gateway-backend.md b/website/content/docs/git-gateway-backend.md index 02acf84f..218de584 100644 --- a/website/content/docs/git-gateway-backend.md +++ b/website/content/docs/git-gateway-backend.md @@ -4,7 +4,10 @@ weight: 10 group: backends --- -[Git Gateway](https://github.com/netlify/git-gateway) is a Netlify open source project that allows you to add editors to your site CMS without giving them direct write access to your GitHub or GitLab repository. (For Bitbucket repositories, use the [Bitbucket backend](#bitbucket-backend) instead.) The [Netlify Identity](https://www.netlify.com/docs/identity/) service can handle the authentication and provides a simple interface for user management. The Netlify CMS [featured templates](../start-with-a-template) are working examples of this backend. +[Git Gateway](https://github.com/netlify/git-gateway) is a Netlify open source project that allows you to add editors to your site CMS without giving them direct write access to your GitHub or GitLab repository. (For Bitbucket repositories, use the [Bitbucket backend](#bitbucket-backend) instead.) + +## Git Gateway with Netlify +The [Netlify Identity](https://www.netlify.com/docs/identity/) service can handle the authentication and provides a simple interface for user management. The Netlify CMS [featured templates](../start-with-a-template) are working examples of this backend. To use it in your own project stored on GitHub or GitLab, follow these steps: diff --git a/website/content/docs/netlify-large-media.md b/website/content/docs/netlify-large-media.md index 9ea16bab..1687336b 100644 --- a/website/content/docs/netlify-large-media.md +++ b/website/content/docs/netlify-large-media.md @@ -13,7 +13,7 @@ If you have a Netlify site with Large Media enabled, Netlify CMS (version 2.6.0 To use Netlify Large Media with Netlify CMS, you will need to do the following: - [Upgrade Netlify CMS](/docs/update-the-cms-version/) to version 2.6.0 or above. -- Configure Netlify CMS to use the [Git Gateway backend with Netlify Identity](/docs/authentication-backends/#git-gateway-with-netlify-identity). +- Configure Netlify CMS to use the [Git Gateway backend with Netlify Identity](/docs/git-gateway-backend/#git-gateway-with-netlify-identity). - Configure the Netlify site and connected repository to use Large Media, following the [Large Media docs on Netlify](https://www.netlify.com/docs/large-media/). When these are complete, you can use Netlify CMS as normal, and the configured asset files will automatically be handled by Netlify Large Media. diff --git a/website/content/docs/open-authoring.md b/website/content/docs/open-authoring.md index 48472c5f..b6bf0283 100644 --- a/website/content/docs/open-authoring.md +++ b/website/content/docs/open-authoring.md @@ -5,15 +5,15 @@ group: features **This is a [beta feature](/docs/beta-features#open-authoring).** -When using the [GitHub backend](/docs/authentication-backends/#github-backend), you can use Netlify CMS to accept contributions from GitHub users without giving them access to your repository. When they make changes in the CMS, the CMS forks your repository for them behind the scenes, and all the changes are made to the fork. When the contributor is ready to submit their changes, they can set their draft as ready for review in the CMS. This triggers a pull request to your repository, which you can merge using the GitHub UI. +When using the [GitHub backend](/docs/github-backend), you can use Netlify CMS to accept contributions from GitHub users without giving them access to your repository. When they make changes in the CMS, the CMS forks your repository for them behind the scenes, and all the changes are made to the fork. When the contributor is ready to submit their changes, they can set their draft as ready for review in the CMS. This triggers a pull request to your repository, which you can merge using the GitHub UI. At the same time, any contributors who _do_ have write access to the repository can continue to use Netlify CMS normally. ## Requirements -- You must use [the GitHub backend](/docs/authentication-backends/#github-backend). +- You must use [the GitHub backend](/docs/github-backend). - **Note that the [Git Gateway backend](/docs/authentication-backends/#git-gateway-with-netlify-identity) does _not_ support Open Authoring, even when the underlying repo is on GitHub.** + **Note that the [Git Gateway backend](/docs/git-gateway-backend/#git-gateway-with-netlify-identity) does _not_ support Open Authoring, even when the underlying repo is on GitHub.** - Your repo on GitHub must be public. diff --git a/website/data/landing.yaml b/website/data/landing.yaml index aadfc417..2e951c69 100644 --- a/website/data/landing.yaml +++ b/website/data/landing.yaml @@ -25,7 +25,7 @@ editors: description: "Writers and editors can easily manage content from draft to review to publish across any number of custom content types." imgpath: "feature-workflow.svg" - feature: "Instant access without GitHub account" - description: "With [Git Gateway](/docs/authentication-backends/#git-gateway-with-netlify-identity), you can add CMS access for any team member — even if they don’t have a GitHub account. " + description: "With [Git Gateway](/docs/git-gateway-backend/#git-gateway-with-netlify-identity), you can add CMS access for any team member — even if they don’t have a GitHub account. " imgpath: "feature-access.svg" community: diff --git a/website/static/_redirects b/website/static/_redirects index 4d8328f2..d0bb4023 100644 --- a/website/static/_redirects +++ b/website/static/_redirects @@ -1,8 +1,9 @@ -/docs /docs/intro 301 -/docs/custom-authentication /docs/authentication-backends 301 -/docs/extending /docs/custom-widgets 301 -/docs/validation /docs/custom-widgets/#advanced-field-validation 301 -/docs/editorial-workflow /docs/configuration/#publish-mode 301 -/docs/test-drive /docs/start-with-a-template 301 -/docs/quick-start /docs/add-to-your-site 301 -/chat https://join.slack.com/t/netlifycms/shared_invite/enQtODE1NTcxODA5Mjg1LTRjYWExM2MyZDJmODA3YmVkMjI2YmQwZDg2ZDUyYTMyM2Y3Zjc1ZTJhNDBkYmMwNjA2ZTkwODY4YjZjNGNlNTE 301 +/docs /docs/intro 301 +/docs/custom-authentication /docs/backends-overview 301 +/docs/authentication-backends /docs/backends-overview 301 +/docs/extending /docs/custom-widgets 301 +/docs/validation /docs/custom-widgets/#advanced-field-validation 301 +/docs/editorial-workflow /docs/configuration/#publish-mode 301 +/docs/test-drive /docs/start-with-a-template 301 +/docs/quick-start /docs/add-to-your-site 301 +/chat https://join.slack.com/t/netlifycms/shared_invite/enQtODE1NTcxODA5Mjg1LTRjYWExM2MyZDJmODA3YmVkMjI2YmQwZDg2ZDUyYTMyM2Y3Zjc1ZTJhNDBkYmMwNjA2ZTkwODY4YjZjNGNlNTE 301