From 80980465d7bf5cdd31b082244bbc633d472eba66 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 4 Oct 2021 17:53:07 +0800 Subject: [PATCH] Correct grammar and spelling in docs & issue templates Also improve the Markdown code style --- .github/CONTRIBUTING.md | 4 +-- .github/ISSUE_TEMPLATE/bug_report.md | 4 +-- .github/ISSUE_TEMPLATE/feature_request.md | 4 +-- .github/ISSUE_TEMPLATE/question.md | 8 +++--- .github/PULL_REQUEST_TEMPLATE.md | 2 +- README.md | 30 +++++++++++----------- _posts/2019-08-08-write-a-new-post.md | 24 ++++++++--------- _posts/2019-08-09-getting-started.md | 19 +++++++------- _posts/2019-08-11-customize-the-favicon.md | 6 ++--- _posts/2021-01-03-enable-google-pv.md | 20 +++++++-------- docs/README.zh-CN.md | 7 +++-- 11 files changed, 63 insertions(+), 65 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ca532e0..162cb5f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,6 +1,6 @@ # How to Contribute -I want to thank you for sparing a time to improve this project! Here are some guidelines for contributing： +I want to thank you for sparing time to improve this project! Here are some guidelines for contributing： To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a [`Feature Request`](https://github.com/cotes2020/jekyll-theme-chirpy/issues/new?labels=enhancement&template=feature_request.md) issue to discuss whether your idea fits the project. @@ -13,4 +13,4 @@ Generally, contribute to the project by: --- -:tada: Your volunteering will make the open source world more beautiful, thanks again! :tada: \ No newline at end of file +:tada: Your volunteering will make the open-source world more beautiful, thanks again! :tada: diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ecf0631..8dd46c7 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,10 +6,10 @@ about: Create a report to help us improve ## Checklist - + - [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design. - [ ] There are no similar reports on existing issues (including closed ones). -- [ ] I found the bug on the latest code of `master` branch. +- [ ] I found the bug on the latest code of the `master` branch. ## Describe the bug diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index f6ddfda..23975f0 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,9 +7,9 @@ labels: enhancement ## Checklist - + - [ ] I have read the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/CONTRIBUTING.md). -- [ ] There are no similar request on existing issues (including closed ones). +- [ ] There is no similar request on existing issues (including closed ones). - [ ] I have read the [project progress](https://github.com/cotes2020/jekyll-theme-chirpy/projects) and know the current progress of the project. - [ ] I was in the `master` branch of the latest code. diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 50f1240..b271ea2 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -8,12 +8,12 @@ labels: question ## Checklist - + - [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design. -- [ ] There are no similar question on existing issues (including closed ones). -- [ ] I searched the Internet for related problems, but still couldn't solve it. -- [ ] My question is based on the latest code of `master` branch. +- [ ] There is no similar question on existing issues (including closed ones). +- [ ] I searched the Internet for related problems, but still couldn't solve them. +- [ ] My question is based on the latest code of the `master` branch. ## Description diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8beb763..5fede19 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -37,7 +37,7 @@ Please describe the tests that you ran to verify your changes. Provide instructi - [ ] My code follows the [Google style guidelines](https://google.github.io/styleguide/) - [ ] I have performed a self-review of my own code -- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works diff --git a/README.md b/README.md index 74a36a1..d163af8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ A minimal, responsive, and powerful Jekyll theme for presenting professional writing. - **[Live Demo →](https://chirpy.cotes.info)** + [**Live Demo →**](https://chirpy.cotes.info) [![Devices Mockup](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/commons/devices-mockup.png)](https://chirpy.cotes.info) @@ -44,7 +44,7 @@ ## Prerequisites -Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of `Ruby`, `RubyGems`, `Jekyll` and `Bundler`. +Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of `Ruby`, `RubyGems`, `Jekyll`, and `Bundler`. ## Installation @@ -52,9 +52,8 @@ Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installat There are two ways to create a new repository for this theme: -- **[Using the Chirpy Starter](#option-1-using-the-chirpy-starter)** - Easy to upgrade, isolates irrelevant project files so you can focus on writing. - -- **[Forking on GitHub](#option-2-forking-on-github)** - Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended. +- [**Using the Chirpy Starter**](#option-1-using-the-chirpy-starter) - Easy to upgrade, isolates irrelevant project files so you can focus on writing. +- [**Forking on GitHub**](#option-2-forking-on-github) - Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended. #### Option 1. Using the Chirpy Starter @@ -62,7 +61,7 @@ Create a new repository from the [**Chirpy Starter**][use-starter] and name it ` #### Option 2. Forking on GitHub -[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) on GitHub and rename it to `.github.io`. Please note that the default branch code is in development. If you want the site to be stable, please switch to the [latest tag](https://github.com/cotes2020/jekyll-theme-chirpy/tags) and start writing. +[Fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork) on GitHub and rename it to `.github.io`. Please note that the default branch code is in development. If you want the site to be stable, please switch to the [latest tag][latest-tag] and start writing. And then execute: @@ -79,7 +78,7 @@ The above command will: - files under `_posts` - folder `docs` -2. If the option `--no-gh` is provided, the directory `.github` will be deleted. Otherwise, setup the GitHub Action workflow by removing the extension `.hook` of `.github/workflows/pages-deploy.yml.hook`, and then remove the other files and directories in the folder `.github`. +2. If the option `--no-gh` is provided, the directory `.github` will be deleted. Otherwise, set up the GitHub Action workflow by removing the extension `.hook` of `.github/workflows/pages-deploy.yml.hook`, and then remove the other files and directories in the folder `.github`. 3. Removes item `Gemfile.lock` from `.gitignore`. @@ -87,7 +86,7 @@ The above command will: ### Installing Dependencies -Before running for the first time, go the root directory of your site, and install dependencies as follows: +Before running for the first time, go to the root directory of your site, and install dependencies as follows: ```console $ bundle @@ -106,7 +105,7 @@ Update the variables of `_config.yml` as needed. Some of them are typical option ### Customing Stylesheet -If you need to customize stylesheet, copy the theme's `assets/css/style.scss` to the same path on your Jekyll site, and then add the custom style at the end of the style file. +If you need to customize the stylesheet, copy the theme's `assets/css/style.scss` to the same path on your Jekyll site, and then add the custom style at the end of the style file. Starting from [`v4.1.0`][chirpy-4.1.0], if you want to overwrite the SASS variables defined in `_sass/addon/variables.scss`, create a new file `_sass/variables-hook.scss` and assign new values to the target variable in it. @@ -131,7 +130,7 @@ After a while, the local service will be published at __. ### Deployment -Before the deployment begins, checkout the file `_config.yml` and make sure the `url` is configured correctly. Furthermore, if you prefer the [**project site**](https://help.github.com/en/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites) and don't use a custom domain, or you want to visit your website with a base URL on a web server other than **GitHub Pages**, remember to change the `baseurl` to your project name that starting with a slash, e.g, `/project-name`. +Before the deployment begins, check out the file `_config.yml` and make sure the `url` is configured correctly. Furthermore, if you prefer the [**project site**](https://help.github.com/en/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites) and don't use a custom domain, or you want to visit your website with a base URL on a web server other than **GitHub Pages**, remember to change the `baseurl` to your project name that starts with a slash, e.g, `/project-name`. Now you can choose ONE of the following methods to deploy your Jekyll site. @@ -145,7 +144,7 @@ Quickly check the files needed for GitHub Actions build: - Ensure your Jekyll site has file `tools/deploy.sh`. Otherwise, copy it from here to your Jekyll site. -- Furthermore, if you have committed `Gemfile.lock` to the repo, and your runtime system is not Linux, don't forget to update the platform list in the lockfile: +- Furthermore, if you have committed `Gemfile.lock` to the repo, and your runtime system is not Linux, don't forget to update the platform list in the lock file: ```console $ bundle lock --add-platform x86_64-linux @@ -189,7 +188,8 @@ Unless you specified the output path, the generated site files will be placed in It depends on how you use the theme: -- If you are using the theme gem (there will be `gem "jekyll-theme-chirpy"` in the `Gemfile`), editing the `Gemfile` and update the version number of the them gem, for example: +- If you are using the theme gem (there will be `gem "jekyll-theme-chirpy"` in the `Gemfile`), editing the `Gemfile` and update the version number of the theme gem, for example: + ```diff - gem "jekyll-theme-chirpy", "~> 3.2", ">= 3.2.1" + gem "jekyll-theme-chirpy", "~> 3.3", ">= 3.3.0" @@ -208,7 +208,7 @@ The merge is likely to conflict with your local modifications. Please be patient ## Documentation -For more details and a better reading experience, please check out the [tutorials on the demo site](https://chirpy.cotes.info/categories/tutorial/). In the meanwhile, a copy of the tutorial is also available on the [Wiki](https://github.com/cotes2020/jekyll-theme-chirpy/wiki). Please note that the tutorials on the demo website or Wiki are based on the latest release, and the features of `master` branch usually ahead of the documentation. +For more details and a better reading experience, please check out the [tutorials on the demo site](https://chirpy.cotes.info/categories/tutorial/). In the meanwhile, a copy of the tutorial is also available on the [Wiki](https://github.com/cotes2020/jekyll-theme-chirpy/wiki). Please note that the tutorials on the demo website or Wiki are based on the latest release, and the features of `master` branch are usually ahead of the documentation. ## Contributing @@ -216,9 +216,9 @@ The old saying, "Two heads are better than one." Consequently, welcome to report ## Credits -This theme is mainly built with [Jekyll](https://jekyllrb.com/) ecosystem, [Bootstrap](https://getbootstrap.com/), [Font Awesome](https://fontawesome.com/) and some other wonderful tools (their copyright information can be found in the relevant files). The avatar and favicon design comes from [Clipart Max](https://www.clipartmax.com/middle/m2i8b1m2K9Z5m2K9_ant-clipart-childrens-ant-cute/). +This theme is mainly built with [Jekyll](https://jekyllrb.com/) ecosystem, [Bootstrap](https://getbootstrap.com/), [Font Awesome](https://fontawesome.com/) and some other wonderful tools (their copyright information can be found in the relevant files). The avatar and favicon design come from [Clipart Max](https://www.clipartmax.com/middle/m2i8b1m2K9Z5m2K9_ant-clipart-childrens-ant-cute/). -:tada: Thanks to all the volunteers who contributed to this project, their GitHub IDs are on [this list](https://github.com/cotes2020/jekyll-theme-chirpy/graphs/contributors). Also, I won't forget those guys who submitted the issues or unmerged PR because they reported bugs, shared ideas, or inspired me to write more readable documentation. +:tada: Thanks to all the volunteers who contributed to this project, their GitHub IDs are on [this list](https://github.com/cotes2020/jekyll-theme-chirpy/graphs/contributors). Also, I won't forget those guys who submitted the issues or unmerged PR because they reported bugs, shared ideas or inspired me to write more readable documentation. Last but not least, thank [JetBrains][jb] for providing the open source license. diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index d001006..110be90 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -24,15 +24,15 @@ tags: [TAG] # TAG names should always be lowercase --- ``` -> **Note**: The posts' ***layout*** has been set to `post` by default, so there is no need to add the variable ***layout*** in Front Matter block. +> **Note**: The posts' ***layout*** has been set to `post` by default, so there is no need to add the variable ***layout*** in the Front Matter block. ### Timezone of date -In order to accurately record the release date of a post, you should not only setup the `timezone` of `_config.yml` but also provide the the post's timezone in field `date` of its Front Matter block. Format: `+/-TTTT`, e.g. `+0800`. +In order to accurately record the release date of a post, you should not only set up the `timezone` of `_config.yml` but also provide the post's timezone in variable `date` of its Front Matter block. Format: `+/-TTTT`, e.g. `+0800`. ### Categories and Tags -The `categories` of each post is designed to contain up to two elements, and the number of elements in `tags` can be zero to infinity. For instance: +The `categories` of each post are designed to contain up to two elements, and the number of elements in `tags` can be zero to infinity. For instance: ```yaml categories: [Animal, Insect] @@ -41,7 +41,7 @@ tags: [bee] ## Table of Contents -By default, the **T**able **o**f **C**ontents (TOC) is displayed on the right panel of the post. If you want to turn it off globally, go to `_config.yml` and set the value of variable `toc` to `false`. If you want to turn off TOC for specific post, add the following to post's [Front Matter](https://jekyllrb.com/docs/front-matter/): +By default, the **T**able **o**f **C**ontents (TOC) is displayed on the right panel of the post. If you want to turn it off globally, go to `_config.yml` and set the value of variable `toc` to `false`. If you want to turn off TOC for a specific post, add the following to the post's [Front Matter](https://jekyllrb.com/docs/front-matter/): ```yaml --- @@ -51,7 +51,7 @@ toc: false ## Comments -Similar to TOC, the [Disqus](https://disqus.com/) comments is loaded by default in each post, and the global switch is defined by variable `comments` in file `_config.yml` . If you want to close the comment for specific post, add the following to the **Front Matter** of the post: +Similar to TOC, the [Disqus](https://disqus.com/) comments are loaded by default in each post, and the global switch is defined by variable `comments` in file `_config.yml` . If you want to close the comment for a specific post, add the following to the **Front Matter** of the post: ```yaml --- @@ -79,13 +79,13 @@ mermaid: true --- ``` -Then you can use it like other markdown language: surround the graph code with ```` ```mermaid ```` and ```` ``` ````. +Then you can use it like other markdown languages: surround the graph code with ```` ```mermaid ```` and ```` ``` ````. ## Images ### Preview image -If you want to add an image to the top of the post contents, specify the attribute `src`, `width`, `height` and `alt` for the image: +If you want to add an image to the top of the post contents, specify the attribute `src`, `width`, `height`, and `alt` for the image: ```yaml --- @@ -121,7 +121,7 @@ In order to prevent the page content layout from shifting when the image is load ### Image position -By default, the image is centered, but you can specify the position by using one of class `normal` , `left` and `right`. For example: +By default, the image is centered, but you can specify the position by using one of the classes `normal`, `left`, and `right`. For example: - **Normal position** @@ -159,14 +159,14 @@ The screenshots of the program window can be considered to show the shadow effec ### CDN URL -If you host the images on the CDN, you can save the time of repeatedly writing the CDN url by assigning the variable `img_cdn` of `_config.yml` file: +If you host the images on the CDN, you can save the time of repeatedly writing the CDN URL by assigning the variable `img_cdn` of `_config.yml` file: ```yaml img_cdn: https://cdn.com ``` {: file='_config.yml' .nolineno} -Once `img_cdn` is assigned, the CDN url will be added to the path of all images (images of site avatar and posts) starting with `/`. +Once `img_cdn` is assigned, the CDN URL will be added to the path of all images (images of site avatar and posts) starting with `/`. For instance, when using images: @@ -210,11 +210,11 @@ key: value ``` ```` -> **Limination**: The Jekyll style `highlight` tag ais not compatible with this theme. +> **Limitation**: The Jekyll style `highlight` tag is not compatible with this theme. ### Line Number -By default, all languages except `plaintext`, `console` and `terminal` will display line numbers. When you want to hide the line number of the code block, you can append `{: .nolineno}` at the next line: +By default, all languages except `plaintext`, `console`, and `terminal` will display line numbers. When you want to hide the line number of the code block, you can append `{: .nolineno}` at the next line: ````markdown ```shell diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 7704ce6..6362169 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -9,7 +9,7 @@ pin: true ## Prerequisites -Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of `Ruby`, `RubyGems`, `Jekyll` and `Bundler`. +Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of `Ruby`, `RubyGems`, `Jekyll`, and `Bundler`. ## Installation @@ -17,9 +17,8 @@ Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installat There are two ways to create a new repository for this theme: -- **[Using the Chirpy Starter](#option-1-using-the-chirpy-starter)** - Easy to upgrade, isolates irrelevant project files so you can focus on writing. - -- **[Forking on GitHub](#option-2-forking-on-github)** - Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended. +- [**Using the Chirpy Starter**](#option-1-using-the-chirpy-starter) - Easy to upgrade, isolates irrelevant project files so you can focus on writing. +- [**Forking on GitHub**](#option-2-forking-on-github) - Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended. #### Option 1. Using the Chirpy Starter @@ -44,7 +43,7 @@ The above command will: - files under `_posts` - folder `docs` -2. If the option `--no-gh` is provided, the directory `.github` will be deleted. Otherwise, setup the GitHub Action workflow by removing the extension `.hook` of `.github/workflows/pages-deploy.yml.hook`, and then remove the other files and directories in the folder `.github`. +2. If the option `--no-gh` is provided, the directory `.github` will be deleted. Otherwise, set up the GitHub Action workflow by removing the extension `.hook` of `.github/workflows/pages-deploy.yml.hook`, and then remove the other files and directories in the folder `.github`. 3. Removes item `Gemfile.lock` from `.gitignore`. @@ -52,7 +51,7 @@ The above command will: ### Installing Dependencies -Before running for the first time, go the root directory of your site, and install dependencies as follows: +Before running for the first time, go to the root directory of your site, and install dependencies as follows: ```console $ bundle @@ -71,7 +70,7 @@ Update the variables of `_config.yml` as needed. Some of them are typical option ### Customing Stylesheet -If you need to customize stylesheet, copy the theme's `assets/css/style.scss` to the same path on your Jekyll site, and then add the custom style at the end of the style file. +If you need to customize the stylesheet, copy the theme's `assets/css/style.scss` to the same path on your Jekyll site, and then add the custom style at the end of the style file. Starting from [`v4.1.0`][chirpy-4.1.0], if you want to overwrite the SASS variables defined in `_sass/addon/variables.scss`, create a new file `_sass/variables-hook.scss` and assign new values to the target variable in it. @@ -96,7 +95,7 @@ After a while, the local service will be published at __. ### Deployment -Before the deployment begins, checkout the file `_config.yml` and make sure the `url` is configured correctly. Furthermore, if you prefer the [**project site**](https://help.github.com/en/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites) and don't use a custom domain, or you want to visit your website with a base URL on a web server other than **GitHub Pages**, remember to change the `baseurl` to your project name that starting with a slash, e.g, `/project-name`. +Before the deployment begins, check out the file `_config.yml` and make sure the `url` is configured correctly. Furthermore, if you prefer the [**project site**](https://help.github.com/en/github/working-with-github-pages/about-github-pages#types-of-github-pages-sites) and don't use a custom domain, or you want to visit your website with a base URL on a web server other than **GitHub Pages**, remember to change the `baseurl` to your project name that starts with a slash, e.g, `/project-name`. Now you can choose ONE of the following methods to deploy your Jekyll site. @@ -110,7 +109,7 @@ Quickly check the files needed for GitHub Actions build: - Ensure your Jekyll site has file `tools/deploy.sh`. Otherwise, copy it from here to your Jekyll site. -- Furthermore, if you have committed `Gemfile.lock` to the repo, and your runtime system is not Linux, don't forget to update the platform list in the lockfile: +- Furthermore, if you have committed `Gemfile.lock` to the repo, and your runtime system is not Linux, don't forget to update the platform list in the lock file: ```console $ bundle lock --add-platform x86_64-linux @@ -154,7 +153,7 @@ Unless you specified the output path, the generated site files will be placed in It depends on how you use the theme: -- If you are using the theme gem (there will be `gem "jekyll-theme-chirpy"` in the `Gemfile`), editing the `Gemfile` and update the version number of the them gem, for example: +- If you are using the theme gem (there will be `gem "jekyll-theme-chirpy"` in the `Gemfile`), editing the `Gemfile` and update the version number of the theme gem, for example: ```diff - gem "jekyll-theme-chirpy", "~> 3.2", ">= 3.2.1" diff --git a/_posts/2019-08-11-customize-the-favicon.md b/_posts/2019-08-11-customize-the-favicon.md index e6c3c4b..d5d70b3 100644 --- a/_posts/2019-08-11-customize-the-favicon.md +++ b/_posts/2019-08-11-customize-the-favicon.md @@ -6,11 +6,11 @@ categories: [Blogging, Tutorial] tags: [favicon] --- -The [favicons](https://www.favicon-generator.org/about/) of [**Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/) are placed in the directory `assets/img/favicons/`. You may want to replace them with your own. The following sections will guide you how to create and replace the default favicons. +The [favicons](https://www.favicon-generator.org/about/) of [**Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/) are placed in the directory `assets/img/favicons/`. You may want to replace them with your own. The following sections will guide you to create and replace the default favicons. ## Generate the favicon -Prepare a square image (PNG, JPG, or SVG) with a size of 512x512 or more, and then go to the online tool [**Real Favicon Generator**](https://realfavicongenerator.net/) and click button Select your Favicon image to upload your image file. +Prepare a square image (PNG, JPG, or SVG) with a size of 512x512 or more, and then go to the online tool [**Real Favicon Generator**](https://realfavicongenerator.net/) and click the button Select your Favicon image to upload your image file. In the next step, the webpage will show all usage scenarios. You can keep the default options, scroll to the bottom of the page, and click the button Generate your Favicons and HTML code to generate the favicon. @@ -23,7 +23,7 @@ Download the generated package, unzip and delete the following two from the extr Now, copy the remaining image files (`PNG` and `ICO`) to cover the original files in the folder `assets/img/favicons/` of your Jekyll site. If your Jekyll site doesn't have this directory yet, just create one. -The following table will helps you understand the changes to the favicon files: +The following table will help you understand the changes to the favicon files: | File(s) | From Online Tool | From Chirpy | |---------------------|:---------------------------------:|:-----------:| diff --git a/_posts/2021-01-03-enable-google-pv.md b/_posts/2021-01-03-enable-google-pv.md index 240b1da..2de8a50 100644 --- a/_posts/2021-01-03-enable-google-pv.md +++ b/_posts/2021-01-03-enable-google-pv.md @@ -13,20 +13,20 @@ This post is to enable Page Views on the [**Chirpy**][chirpy-homepage] theme bas ### Create GA account and property -First, you need to setup your account on Google analytics. While your create your account, you must create your first **Property** as well. +First, you need to set up your account on Google analytics. While you create your account, you must create your first **Property** as well. 1. Head to and click on **Start Measuring** 2. Enter your desired _Account Name_ and choose the desired checkboxes 3. Enter your desired _Property Name_. This is the name of the tracker project that appears on your Google Analytics dashboard 4. Enter the required information _About your business_ -5. Hit _Create_ and accept any license popup to setup your Google Analytics account and create your property +5. Hit _Create_ and accept any license popup to set up your Google Analytics account and create your property ### Create Data Stream -With your property created, you now need to set up Data Stream to track your blog traffic. After you signup, the prompt should automatically take you to creating your first **Data Stream**. If not, follow these steps: +With your property created, you now need to set up Data Stream to track your blog traffic. After you signup, the prompt should automatically take you to create your first **Data Stream**. If not, follow these steps: 1. Go to **Admin** on the left column -2. Select the desired property from the drop down on the second column +2. Select the desired property from the drop-down on the second column 3. Click on **Data Streams** 4. Add a stream and click on **Web** 5. Enter your blog's URL @@ -47,13 +47,13 @@ google_analytics: ``` {: file="_config.yml"} -When you push these changes to your blog, you should start seeing the traffic on your Google Analytics. Play around with Google Analytics dashboard to get familiar with the options available as it takes like 5 mins to pickup your changes. You should now be able to monitor your traffic in realtime. +When you push these changes to your blog, you should start seeing the traffic on your Google Analytics. Play around with the Google Analytics dashboard to get familiar with the options available as it takes like 5 mins to pick up your changes. You should now be able to monitor your traffic in real time. ![google-analytics-realtime](/posts/20210103/02-google-analytics-realtime.png){: width="616" height="557"} ## Setup Page Views -There is a detailed [tutorial](https://developers.google.com/analytics/solutions/google-analytics-super-proxy) available to set up Google Analytics superProxy. But, if you are interested to just quickly get your Chirpy-based blog display page views, follow along. These steps were tested on a Linux machine. If you are running Windows, you can use Git bash terminal to run Unix-like commands. +There is a detailed [tutorial](https://developers.google.com/analytics/solutions/google-analytics-super-proxy) available to set up Google Analytics superProxy. But, if you are interested to just quickly get your Chirpy-based blog display page views, follow along. These steps were tested on a Linux machine. If you are running Windows, you can use the Git bash terminal to run Unix-like commands. ### Setup Google App Engine @@ -67,7 +67,7 @@ There is a detailed [tutorial](https://developers.google.com/analytics/solutions 5. Select **Python** language and **Standard** environment -6. Enable billing account. Yeah, you have to link your credit card. But, you won't be billed unless you exceed your free quota. For a simple blog, free quota is more than sufficient. +6. Enable billing account. Yeah, you have to link your credit card. But, you won't be billed unless you exceed your free quota. For a simple blog, the free quota is more than sufficient. 7. Go to your App Engine dashboard on your browser and select **API & Services** from the left navigation menu @@ -77,7 +77,7 @@ There is a detailed [tutorial](https://developers.google.com/analytics/solutions 10. On the left, Click on _OAuth Consent Screen_ and accept **Configure Consent Screen**. Select **External** since your blog is probably hosted for the public. Click on **Publish** under _Publishing Status_ -11. Click on **Credentials** on the left and create a new **OAuth Client IDs** credential. Make sure to add a entry under `Authorized redirect URIs` that matches: `https://..r.appspot.com/admin/auth` +11. Click on **Credentials** on the left and create a new **OAuth Client IDs** credential. Make sure to add an entry under `Authorized redirect URIs` that matches: `https://..r.appspot.com/admin/auth` 12. Note down the **Your Client ID** and **Your Client Secret**. You'll need this in the next section. @@ -119,7 +119,7 @@ There is a detailed [tutorial](https://developers.google.com/analytics/solutions - version: 1 ``` -3. In `src/config.py`, add the `OAUTH_CLIENT_ID` and `OAUTH_CLIENT_SECRET` that you gathered from you App Engine Dashboard. +3. In `src/config.py`, add the `OAUTH_CLIENT_ID` and `OAUTH_CLIENT_SECRET` that you gathered from your App Engine Dashboard. 4. Enter any random key for `XSRF_KEY`, your `config.py` should look similar to this @@ -206,7 +206,7 @@ In order to reduce the returned results and reduce the network bandwidth, we add If the `site.baseurl` is specified, change the first filtering rule to `ga:pagePath=~^/BASE_URL/posts/.*/$`, where `BASE_URL` is the value of `site.baseurl`. -After Run Query, copy the generated contents of **API Query URI** at the bottom of the page, and fill in the **Encoded URI for the query** of SuperProxy on GAE. +After Run Query, copy the generated contents of **API Query URI** at the bottom of the page and fill in the **Encoded URI for the query** of SuperProxy on GAE. After the query is saved on GAE, a **Public Endpoint** (public access address) will be generated, and we will get the query result in JSON format when accessing it. Finally, click Enable Endpoint in **Public Request Endpoint** to make the query effective, and click Start Scheduling in **Scheduling** to start the scheduled task. diff --git a/docs/README.zh-CN.md b/docs/README.zh-CN.md index 5d986bc..c1b854e 100644 --- a/docs/README.zh-CN.md +++ b/docs/README.zh-CN.md @@ -17,7 +17,7 @@ 一款简约而强大、采用响应式设计的 Jekyll 主题，适合展示专业写作内容。 - **[线上体验 →](https://chirpy.cotes.info)** + [**线上体验 →**](https://chirpy.cotes.info) [![Devices Mockup](https://cdn.jsdelivr.net/gh/cotes2020/chirpy-images@0a003683c0c3ca549d12c309f9b3e03ea20981e5/commons/devices-mockup.png)](https://chirpy.cotes.info) @@ -53,9 +53,8 @@ 有两种方式可以创建一个使用本主题的仓库： -- **[使用 Chirpy Starter](#使用-chirpy-starter)** - 易于版本升级，隔离无关的主题项目文件，让您的仓库舒适清爽。 - -- **[从 GitHub 上 Fork](#从-github-上-fork)** - 对个性化二次开发友好，但是难于升级。除非您决定魔改此款主题或者参与代码贡献，否则不推荐使用此方式。 +- [**使用 Chirpy Starter**](#使用-chirpy-starter) - 易于版本升级，隔离无关的主题项目文件，让您的仓库舒适清爽。 +- [**从 GitHub 上 Fork**](#从-github-上-fork) - 对个性化二次开发友好，但是难于升级。除非您决定魔改此款主题或者参与代码贡献，否则不推荐使用此方式。 #### 使用 Chirpy Starter