Merge branch 'master' into slorber/prepare-domain-switch

# Conflicts: # CHANGELOG.md
facebook · Mar 22, 2021 · 88d53fe · 88d53fe
2 parents 00b6c52 + af840b7
commit 88d53fe
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 29 deletions.
diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
@@ -1112,7 +1112,7 @@ N/A
 
 ## [1.0.10] - 2018-04-09
 
-This is a general release with mostly bug fixes and documentation updates (which are already live on docusuarus.io).
+This is a general release with mostly bug fixes and documentation updates (which are already live on docusaurus.io).
 
 ### Breaking Changes
 
@@ -1287,7 +1287,7 @@ This is generally a bug fix release, with some code refactoring. Total commits i
 - Links on landing page in `docusaurus-init` test site do not 404 any longer.
 - Refactoring how we check for translations and versioning (PRs #322/#316 and friends).
 - Refactored the example `index.js` page (PR #293).
-- Link errors, typos and grammatical errors in the docusuarus.io documentation.
+- Link errors, typos and grammatical errors in the docusaurus.io documentation.
 
 ### Removed
 

diff --git a/examples/classic/README.md b/examples/classic/README.md
@@ -14,7 +14,7 @@ yarn install
 yarn start
 ```
 
-This command starts a local development server and open up a browser window. Most changes are reflected live without having to restart the server.
+This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
 
 ## Build
 

diff --git a/packages/docusaurus-migrate/README.md b/packages/docusaurus-migrate/README.md
@@ -1,6 +1,6 @@
 # `@docusaurus/migrate`
 
-A CLI tool to migrate from older versions of Docusuarus.
+A CLI tool to migrate from older versions of Docusaurus.
 
 ## Usage
 

diff --git a/packages/docusaurus-migrate/package.json b/packages/docusaurus-migrate/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/migrate",
   "version": "2.0.0-alpha.72",
-  "description": "A CLI tool to migrate from older versions of Docusuarus.",
+  "description": "A CLI tool to migrate from older versions of Docusaurus.",
   "main": "lib/index.js",
   "license": "MIT",
   "engines": {

diff --git a/packages/docusaurus/src/server/__tests__/__snapshots__/brokenLinks.test.ts.snap b/packages/docusaurus/src/server/__tests__/__snapshots__/brokenLinks.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`brokenLinks getBrokenLinksErrorMessage 1`] = `
 "Docusaurus found broken links!
 
-Please check the pages of your site in the list bellow, and make sure you don't reference any path that does not exist.
+Please check the pages of your site in the list below, and make sure you don't reference any path that does not exist.
 Note: it's possible to ignore broken links with the 'onBrokenLinks' Docusaurus configuration, and let the build pass.
 
 Exhaustive list of all broken links found:
@@ -20,13 +20,13 @@ Exhaustive list of all broken links found:
 exports[`brokenLinks getBrokenLinksErrorMessage with potential layout broken links 1`] = `
 "Docusaurus found broken links!
 
-Please check the pages of your site in the list bellow, and make sure you don't reference any path that does not exist.
+Please check the pages of your site in the list below, and make sure you don't reference any path that does not exist.
 Note: it's possible to ignore broken links with the 'onBrokenLinks' Docusaurus configuration, and let the build pass.
 
 It looks like some of the broken links we found appear in many pages of your site.
 Maybe those broken links appear on all pages through your site layout?
 We recommend that you check your theme configuration for such links (particularly, theme navbar and footer).
-Frequent broken links are linking to: 
+Frequent broken links are linking to:
 - ./myBrokenLinkFrequent1
 - ./myBrokenLinkFrequent2
 

diff --git a/packages/docusaurus/src/server/brokenLinks.ts b/packages/docusaurus/src/server/brokenLinks.ts
@@ -130,13 +130,13 @@ export function getBrokenLinksErrorMessage(
       return '';
     }
 
-    return `\n\nIt looks like some of the broken links we found appear in many pages of your site.\nMaybe those broken links appear on all pages through your site layout?\nWe recommend that you check your theme configuration for such links (particularly, theme navbar and footer).\nFrequent broken links are linking to: \n- ${frequentLinks.join(
+    return `\n\nIt looks like some of the broken links we found appear in many pages of your site.\nMaybe those broken links appear on all pages through your site layout?\nWe recommend that you check your theme configuration for such links (particularly, theme navbar and footer).\nFrequent broken links are linking to:\n- ${frequentLinks.join(
       `\n- `,
     )}\n`;
   }
 
   return (
-    `Docusaurus found broken links!\n\nPlease check the pages of your site in the list bellow, and make sure you don't reference any path that does not exist.\nNote: it's possible to ignore broken links with the 'onBrokenLinks' Docusaurus configuration, and let the build pass.${getLayoutBrokenLinksHelpMessage()}` +
+    `Docusaurus found broken links!\n\nPlease check the pages of your site in the list below, and make sure you don't reference any path that does not exist.\nNote: it's possible to ignore broken links with the 'onBrokenLinks' Docusaurus configuration, and let the build pass.${getLayoutBrokenLinksHelpMessage()}` +
     `\n\nExhaustive list of all broken links found:\n${Object.entries(
       allBrokenLinks,
     )

diff --git a/website-1.x/docs/api-pages.md b/website-1.x/docs/api-pages.md
@@ -217,7 +217,7 @@ Static assets should be placed into the `website/static` directory. They can be
 
 You should configure your site's primary, secondary, and code block colors using the `colors` field in `siteConfig` as specified [here](api-site-config.md). You can also configure other colors in the same way as described in the `siteConfig` doc.
 
-There are several ways to access the default styles provided for your site. If you have started developing your website and executed the `docusaurus-init` or `yarn install` command, your default styles can be found at `website/node_modules/docusaurus/lib/static/css/main.css`. Alternatively, the `main.css` file may be inspected directly at the [Docusarus GitHub repository](https://github.com/facebook/docusaurus/blob/master/packages/docusaurus-1.x/lib/static/css/main.css).
+There are several ways to access the default styles provided for your site. If you have started developing your website and executed the `docusaurus-init` or `yarn install` command, your default styles can be found at `website/node_modules/docusaurus/lib/static/css/main.css`. Alternatively, the `main.css` file may be inspected directly at the [Docusaurus GitHub repository](https://github.com/facebook/docusaurus/blob/master/packages/docusaurus-1.x/lib/static/css/main.css).
 
 You can provide your own custom styles by adding them anywhere in the `website/static` directory. Any `.css` files you provide in the `static` directory will get concatenated to the end of Docusaurus' provided styles, allowing you to add to or override Docusaurus default styles as you wish.
 

diff --git a/website-1.x/versioned_docs/version-1.10.x/api-pages.md b/website-1.x/versioned_docs/version-1.10.x/api-pages.md
@@ -218,7 +218,7 @@ Static assets should be placed into the `website/static` directory. They can be
 
 You should configure your site's primary, secondary, and code block colors using the `colors` field in `siteConfig` as specified [here](api-site-config.md). You can also configure other colors in the same way as described in the `siteConfig` doc.
 
-There are several ways to access the default styles provided for your site. If you have started developing your website and executed the `docusaurus-init` or `yarn install` command, your default styles can be found at `website/node_modules/docusaurus/lib/static/css/main.css`. Alternatively, the `main.css` file may be inspected directly at the [Docusarus GitHub repository](https://github.com/facebook/docusaurus/blob/master/packages/docusaurus-1.x/lib/static/css/main.css).
+There are several ways to access the default styles provided for your site. If you have started developing your website and executed the `docusaurus-init` or `yarn install` command, your default styles can be found at `website/node_modules/docusaurus/lib/static/css/main.css`. Alternatively, the `main.css` file may be inspected directly at the [Docusaurus GitHub repository](https://github.com/facebook/docusaurus/blob/master/packages/docusaurus-1.x/lib/static/css/main.css).
 
 You can provide your own custom styles by adding them anywhere in the `website/static` directory. Any `.css` files you provide in the `static` directory will get concatenated to the end of Docusaurus' provided styles, allowing you to add to or override Docusaurus default styles as you wish.
 

diff --git a/website-1.x/versioned_docs/version-1.9.x/api-pages.md b/website-1.x/versioned_docs/version-1.9.x/api-pages.md
@@ -218,7 +218,7 @@ Static assets should be placed into the `website/static` directory. They can be
 
 You should configure your site's primary, secondary, and code block colors using the `colors` field in `siteConfig` as specified [here](api-site-config.md). You can also configure other colors in the same way as described in the `siteConfig` doc.
 
-There are several ways to access the default styles provided for your site. If you have started developing your website and executed the `docusaurus-init` or `yarn install` command, your default styles can be found at `website/node_modules/docusaurus/lib/static/css/main.css`. Alternatively, the `main.css` file may be inspected directly at the [Docusarus GitHub repository](https://github.com/facebook/docusaurus/blob/master/packages/docusaurus-1.x/lib/static/css/main.css).
+There are several ways to access the default styles provided for your site. If you have started developing your website and executed the `docusaurus-init` or `yarn install` command, your default styles can be found at `website/node_modules/docusaurus/lib/static/css/main.css`. Alternatively, the `main.css` file may be inspected directly at the [Docusaurus GitHub repository](https://github.com/facebook/docusaurus/blob/master/packages/docusaurus-1.x/lib/static/css/main.css).
 
 You can provide your own custom styles by adding them anywhere in the `website/static` directory. Any `.css` files you provide in the `static` directory will get concatenated to the end of Docusaurus' provided styles, allowing you to add to or override Docusaurus default styles as you wish.
 

diff --git a/website/community/resources.md b/website/community/resources.md
@@ -23,7 +23,7 @@ See the <a href={require('@docusaurus/useBaseUrl').default('showcase')}>showcase
 ### Search {#search}
 
 - [docusaurus-plugin-lunr](https://github.com/daldridge/docusaurus-plugin-lunr) - Docusaurus v2 plugin to create a local search index for use with Lunr.js
-- [docusaurus-lunr-search](https://github.com/lelouch77/docusurus-lunr-search) - Offline Search for Docusaurus v2
+- [docusaurus-lunr-search](https://github.com/lelouch77/docusaurus-lunr-search) - Offline Search for Docusaurus v2
 - [docusaurus-search-local](https://github.com/cmfcmf/docusaurus-search-local) - Offline/local search for Docusaurus v2
 - [@easyops-cn/docusaurus-search-local](https://github.com/easyops-cn/docusaurus-search-local) - Offline/local search for Docusaurus v2 (language of zh supported)
 

diff --git a/website/docs/guides/docs/docs-multi-instance.mdx b/website/docs/guides/docs/docs-multi-instance.mdx
@@ -47,12 +47,12 @@ We use this pattern on the Docusaurus website itself:
 
 ## Setup {#setup}
 
-Let's consider we 2 documentations:
+Suppose you have 2 documentations:
 
 - Product: some versioned doc about your product
 - Community: some unversioned doc about the community around your product
 
-You have to use twice the same plugin in your site configuration.
+In this case, you should use the same plugin twice in your site configuration.
 
 :::caution
 
@@ -140,7 +140,7 @@ We consider that the `product` instance is the most important one, and make it t
 
 ## Versioned paths {#versioned-paths}
 
-Each instance will store versioned docs in a distinct folder.
+Each plugin instance will store versioned docs in a distinct folder.
 
 The default plugin instance will use these paths:
 

diff --git a/website/docs/guides/docs/sidebar.md b/website/docs/guides/docs/sidebar.md
@@ -64,7 +64,7 @@ In this example, notice the following:
 
 - The key `docs` is the id of the sidebar. The id can be any value, not necessarily `docs`.
 - `Getting Started` is a category within the sidebar.
-- `greeting` and `doc1` are both [sidebar item](#sidebar-item).
+- `greeting` and `doc1` are both [sidebar item](#understanding-sidebar-items).
 
 Shorthand notation can also be used:
 
@@ -314,8 +314,8 @@ To pass in custom props to a swizzled sidebar item, add the optional `customProp
 
 ```js
 {
-  type: 'doc';
-  id: 'doc1';
+  type: 'doc',
+  id: 'doc1',
   customProps: {
     /* props */
   }

diff --git a/website/docs/migration/migration-automated.md b/website/docs/migration/migration-automated.md
@@ -46,7 +46,7 @@ yarn start
 
 :::danger
 
-The migration CLI updates existing files. Be sure to have commited them first!
+The migration CLI updates existing files. Be sure to have committed them first!
 
 :::
 

diff --git a/website/docs/migration/migration-translated-sites.md b/website/docs/migration/migration-translated-sites.md
@@ -118,7 +118,7 @@ There is no ultimate guide we could write to fix these errors, but common errors
 
 - Not marking enough strings as "hidden strings" in Crowdin, leading to pre-translation trying to translate these strings.
 - Having bad v1 translations, leading to invalid markup in v2: bad html elements inside translations and unclosed tags
-- Anything rejected by the MDX parser, like using HTML elements instead of JSX elements (use the [MDX plaground](https://mdxjs.com/playground/) for debugging)
+- Anything rejected by the MDX parser, like using HTML elements instead of JSX elements (use the [MDX playground](https://mdxjs.com/playground/) for debugging)
 
 You might want to repeat this pre-translation process, eventually trying the "Perfect" option and limiting pre-translation only some languages/files.
 

diff --git a/website/docs/search.md b/website/docs/search.md
@@ -30,7 +30,7 @@ module.exports = {
       apiKey: 'YOUR_API_KEY',
       indexName: 'YOUR_INDEX_NAME',
 
-      // Optional: see doc section bellow
+      // Optional: see doc section below
       contextualSearch: true,
 
       // Optional: Algolia search parameters

diff --git a/website/versioned_docs/version-2.0.0-alpha.71/guides/docs/sidebar.md b/website/versioned_docs/version-2.0.0-alpha.71/guides/docs/sidebar.md
@@ -314,8 +314,8 @@ To pass in custom props to a swizzled sidebar item, add the optional `customProp
 
 ```js
 {
-  type: 'doc';
-  id: 'doc1';
+  type: 'doc',
+  id: 'doc1',
   customProps: {
     /* props */
   }

diff --git a/website/versioned_docs/version-2.0.0-alpha.71/search.md b/website/versioned_docs/version-2.0.0-alpha.71/search.md
@@ -30,7 +30,7 @@ module.exports = {
       apiKey: 'YOUR_API_KEY',
       indexName: 'YOUR_INDEX_NAME',
 
-      // Optional: see doc section bellow
+      // Optional: see doc section below
       contextualSearch: true,
 
       // Optional: Algolia search parameters

diff --git a/website/versioned_docs/version-2.0.0-alpha.72/guides/docs/sidebar.md b/website/versioned_docs/version-2.0.0-alpha.72/guides/docs/sidebar.md
@@ -314,8 +314,8 @@ To pass in custom props to a swizzled sidebar item, add the optional `customProp
 
 ```js
 {
-  type: 'doc';
-  id: 'doc1';
+  type: 'doc',
+  id: 'doc1',
   customProps: {
     /* props */
   }

diff --git a/website/versioned_docs/version-2.0.0-alpha.72/search.md b/website/versioned_docs/version-2.0.0-alpha.72/search.md
@@ -30,7 +30,7 @@ module.exports = {
       apiKey: 'YOUR_API_KEY',
       indexName: 'YOUR_INDEX_NAME',
 
-      // Optional: see doc section bellow
+      // Optional: see doc section below
       contextualSearch: true,
 
       // Optional: Algolia search parameters