From 56e6312fc0d06fa6913e59412fb5b05d043e7ea3 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Fri, 26 Jul 2019 09:10:02 +0800 Subject: [PATCH 1/5] docs: explain .gitignore for generated site --- docs/getting-started-preparation.md | 22 +++++++++---------- .../getting-started-preparation.md | 22 +++++++++---------- .../getting-started-preparation.md | 22 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/getting-started-preparation.md b/docs/getting-started-preparation.md index 2949af520a13..932448c6ddda 100644 --- a/docs/getting-started-preparation.md +++ b/docs/getting-started-preparation.md @@ -11,6 +11,7 @@ As shown after you [installed Docusaurus](getting-started-installation.md), the ```bash root-directory +├── .gitignore ├── docs │ ├── doc1.md │ ├── doc2.md @@ -35,23 +36,22 @@ root-directory ### Directory Descriptions -* **Documentation Source Files**: The `docs` directory - contains example documentation files written in Markdown. -* **Blog**: The `website/blog` directory contains examples of blog posts written in markdown. -* **Pages**: The `website/pages` directory contains example top-level pages for the site. -* **Static files and images**: The `website/static` directory contains static assets used by the example site. +- **Documentation Source Files**: The `docs` directory contains example documentation files written in Markdown. +- **Blog**: The `website/blog` directory contains examples of blog posts written in markdown. +- **Pages**: The `website/pages` directory contains example top-level pages for the site. +- **Static files and images**: The `website/static` directory contains static assets used by the example site. ### Key Files -* **Footer**: The `website/core/Footer.js` file is a React component that acts - as the footer for the site generated by Docusaurus and should be customized by the user. -* **Configuration file**: The `website/siteConfig.js` file is the main - configuration file used by Docusaurus. -* **Sidebars**: The `sidebars.json` file contains the structure and order - of the documentation files. +- **Footer**: The `website/core/Footer.js` file is a React component that acts as the footer for the site generated by Docusaurus and should be customized by the user. +- **Configuration file**: The `website/siteConfig.js` file is the main configuration file used by Docusaurus. +- **Sidebars**: The `sidebars.json` file contains the structure and order of the documentation files. +- **.gitignore**: The `.gitignore` file lists the necessary ignore files for the generated site so that they do not get added to the git repo. ## Preparation Notes You will need to keep the `website/siteConfig.js` and `website/core/Footer.js` files but may edit them as you wish. The value of the `customDocsPath` key in `website/siteConfig.js` can be modified if you wish to use a different directory name or path. The `website` directory can also be renamed to anything you want it to be. However, you should keep the `website/pages` and `website/static` directories. You may change the content inside them as you wish. At the bare minimum, you should have an `en/index.js` or `en/index.html` file inside `website/pages` and an image to use as your header icon inside `website/static`. + +If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all node_modules, build files, system files (.DS_Store), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. diff --git a/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md b/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md index a55df75d6431..53dd4f4c2947 100644 --- a/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md +++ b/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md @@ -12,6 +12,7 @@ As shown after you [installed Docusaurus](getting-started-installation.md), the ```bash root-directory +├── .gitignore ├── docs │ ├── doc1.md │ ├── doc2.md @@ -36,23 +37,22 @@ root-directory ### Directory Descriptions -* **Documentation Source Files**: The `docs` directory - contains example documentation files written in Markdown. -* **Blog**: The `website/blog` directory contains examples of blog posts written in markdown. -* **Pages**: The `website/pages` directory contains example top-level pages for the site. -* **Static files and images**: The `website/static` directory contains static assets used by the example site. +- **Documentation Source Files**: The `docs` directory contains example documentation files written in Markdown. +- **Blog**: The `website/blog` directory contains examples of blog posts written in markdown. +- **Pages**: The `website/pages` directory contains example top-level pages for the site. +- **Static files and images**: The `website/static` directory contains static assets used by the example site. ### Key Files -* **Footer**: The `website/core/Footer.js` file is a React component that acts - as the footer for the site generated by Docusaurus and should be customized by the user. -* **Configuration file**: The `website/siteConfig.js` file is the main - configuration file used by Docusaurus. -* **Sidebars**: The `sidebars.json` file contains the structure and order - of the documentation files. +- **Footer**: The `website/core/Footer.js` file is a React component that acts as the footer for the site generated by Docusaurus and should be customized by the user. +- **Configuration file**: The `website/siteConfig.js` file is the main configuration file used by Docusaurus. +- **Sidebars**: The `sidebars.json` file contains the structure and order of the documentation files. +- **.gitignore**: The `.gitignore` file lists the necessary ignore files for the generated site so that they do not get added to the git repo. ## Preparation Notes You will need to keep the `website/siteConfig.js` and `website/core/Footer.js` files but may edit them as you wish. The value of the `customDocsPath` key in `website/siteConfig.js` can be modified if you wish to use a different directory name or path. The `website` directory can also be renamed to anything you want it to be. However, you should keep the `website/pages` and `website/static` directories. You may change the content inside them as you wish. At the bare minimum, you should have an `en/index.js` or `en/index.html` file inside `website/pages` and an image to use as your header icon inside `website/static`. + +If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all node_modules, build files, system files (.DS_Store), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. diff --git a/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md b/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md index d17178a8f729..d34ee8d20b2c 100644 --- a/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md +++ b/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md @@ -12,6 +12,7 @@ As shown after you [installed Docusaurus](getting-started-installation.md), the ```bash root-directory +├── .gitignore ├── docs │ ├── doc1.md │ ├── doc2.md @@ -36,23 +37,22 @@ root-directory ### Directory Descriptions -* **Documentation Source Files**: The `docs` directory - contains example documentation files written in Markdown. -* **Blog**: The `website/blog` directory contains examples of blog posts written in markdown. -* **Pages**: The `website/pages` directory contains example top-level pages for the site. -* **Static files and images**: The `website/static` directory contains static assets used by the example site. +- **Documentation Source Files**: The `docs` directory contains example documentation files written in Markdown. +- **Blog**: The `website/blog` directory contains examples of blog posts written in markdown. +- **Pages**: The `website/pages` directory contains example top-level pages for the site. +- **Static files and images**: The `website/static` directory contains static assets used by the example site. ### Key Files -* **Footer**: The `website/core/Footer.js` file is a React component that acts - as the footer for the site generated by Docusaurus and should be customized by the user. -* **Configuration file**: The `website/siteConfig.js` file is the main - configuration file used by Docusaurus. -* **Sidebars**: The `sidebars.json` file contains the structure and ordering - of the documentation files. +- **Footer**: The `website/core/Footer.js` file is a React component that acts as the footer for the site generated by Docusaurus and should be customized by the user. +- **Configuration file**: The `website/siteConfig.js` file is the main configuration file used by Docusaurus. +- **Sidebars**: The `sidebars.json` file contains the structure and ordering of the documentation files. +- **.gitignore**: The `.gitignore` file lists the necessary ignore files for the generated site so that they do not get added to the git repo. ## Preparation Notes You will need to keep the `website/siteConfig.js` and `website/core/Footer.js` files, but may edit them as you wish. The value of the `customDocsPath` key in `website/siteConfig.js` can be modified if you wish to use a different directory name or path. The `website` directory can also be renamed to anything you want it to be. However, you should keep the `website/pages` and `website/static` directories. You may change the content inside them as you wish. At the bare minimum you should have an `en/index.js` or `en/index.html` file inside `website/pages` and an image to use as your header icon inside `website/static`. + +If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all node_modules, build files, system files (.DS_Store), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. From a1c36d0aaec52d1df0bfc2710ae1ddaccd49e772 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Fri, 26 Jul 2019 09:13:40 +0800 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f916566eb0a..b4c191345b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [Unreleased] +**Docs** + +- docs: document what should be in .gitignore ([https://github.com/facebook/docusaurus/pull/1709](https://github.com/facebook/docusaurus/pull/1709)) + ## [1.12.0] - 2019-07-20 ### Changes From 5f5c3f91cde6ce60cf03beee46983e95872bc1ed Mon Sep 17 00:00:00 2001 From: Yangshun Tay Date: Fri, 26 Jul 2019 00:28:04 -0700 Subject: [PATCH 3/5] Update getting-started-preparation.md --- docs/getting-started-preparation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started-preparation.md b/docs/getting-started-preparation.md index 932448c6ddda..36eaeb2352c1 100644 --- a/docs/getting-started-preparation.md +++ b/docs/getting-started-preparation.md @@ -54,4 +54,4 @@ You will need to keep the `website/siteConfig.js` and `website/core/Footer.js` f However, you should keep the `website/pages` and `website/static` directories. You may change the content inside them as you wish. At the bare minimum, you should have an `en/index.js` or `en/index.html` file inside `website/pages` and an image to use as your header icon inside `website/static`. -If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all node_modules, build files, system files (.DS_Store), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. +If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all `node_modules`, build files, system files (`.DS_Store`), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. From ec568f4f020757cb79e44dbc7bf46d3eab188516 Mon Sep 17 00:00:00 2001 From: Yangshun Tay Date: Fri, 26 Jul 2019 00:28:33 -0700 Subject: [PATCH 4/5] Update getting-started-preparation.md --- .../version-1.10.x/getting-started-preparation.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md b/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md index 53dd4f4c2947..95b47ebb5cb7 100644 --- a/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md +++ b/website-1.x/versioned_docs/version-1.10.x/getting-started-preparation.md @@ -55,4 +55,5 @@ You will need to keep the `website/siteConfig.js` and `website/core/Footer.js` f However, you should keep the `website/pages` and `website/static` directories. You may change the content inside them as you wish. At the bare minimum, you should have an `en/index.js` or `en/index.html` file inside `website/pages` and an image to use as your header icon inside `website/static`. -If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all node_modules, build files, system files (.DS_Store), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. +If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all `node_modules`, build files, system files (`.DS_Store`), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. + From 6e1e1eb8b6dc3bb2087f5e91050ed943a973ffb1 Mon Sep 17 00:00:00 2001 From: Yangshun Tay Date: Fri, 26 Jul 2019 00:28:50 -0700 Subject: [PATCH 5/5] Update getting-started-preparation.md --- .../versioned_docs/version-1.9.x/getting-started-preparation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md b/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md index d34ee8d20b2c..c209b05568db 100644 --- a/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md +++ b/website-1.x/versioned_docs/version-1.9.x/getting-started-preparation.md @@ -55,4 +55,4 @@ You will need to keep the `website/siteConfig.js` and `website/core/Footer.js` f However, you should keep the `website/pages` and `website/static` directories. You may change the content inside them as you wish. At the bare minimum you should have an `en/index.js` or `en/index.html` file inside `website/pages` and an image to use as your header icon inside `website/static`. -If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all node_modules, build files, system files (.DS_Store), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects. +If your directory does not yet have a `.gitignore`, we generate it with the necessary ignored files listed. As a general rule, you should ignore all `node_modules`, build files, system files (`.DS_Store`), logs, etc. [Here](https://github.com/github/gitignore/blob/master/Node.gitignore) is a more comprehensive list of what is normally ignored for Node.js projects.