Merge commit 'acb9109df778fa4a51c0d8b29b3212b12988908f'

7 files changed, 69 insertions, 188 deletions

diff --git a/content/en/functions/RenderString.md b/content/en/functions/RenderString.md
index 19ef11e59..b083e1c34 100644
--- a/content/en/functions/RenderString.md
+++ b/content/en/functions/RenderString.md
@@ -20,7 +20,7 @@ signature: [".RenderString MARKUP"]
 The method takes an optional map argument with these options:
 
 display ("inline")
-: `inline` or `block`. If `inline` (default), surrounding ´<p></p>` on short snippets will be trimmed.
+: `inline` or `block`. If `inline` (default), surrounding `<p></p>` on short snippets will be trimmed.
 
 markup (defaults to the Page's markup)
 : See identifiers in [List of content formats](/content-management/formats/#list-of-content-formats).
diff --git a/content/en/functions/site.md b/content/en/functions/site.md
new file mode 100644
index 000000000..a6fab6dca
--- /dev/null
+++ b/content/en/functions/site.md
@@ -0,0 +1,26 @@
+---
+title: site
+linktitle: site
+description: The `site` function provides global access the same data as `.Site` page method
+godocref:
+date: 2021-02-11
+publishdate: 2021-02-11
+lastmod: 2021-02-11
+keywords: []
+categories: [functions]
+menu:
+  docs:
+    parent: "functions"
+toc:
+signature: ["site"]
+workson: []
+hugoversion:
+relatedfuncs: ["hugo"]
+deprecated: false
+draft: false
+aliases: []
+---
+
+`site` is a global function which returns the same data as the `.Site` page method. See: [Site Variables]({{< relref "/variables/site" >}}).
+
+
diff --git a/content/en/hosting-and-deployment/hosting-on-github.md b/content/en/hosting-and-deployment/hosting-on-github.md
index 55cfcccd6..9cabdd938 100644
--- a/content/en/hosting-and-deployment/hosting-on-github.md
+++ b/content/en/hosting-and-deployment/hosting-on-github.md
@@ -1,10 +1,9 @@
 ---
 title: Host on GitHub
 linktitle: Host on GitHub
-description: Deploy Hugo as a GitHub Pages project or personal/organizational site and automate the whole process with a simple shell script.
+description: Deploy Hugo as a GitHub Pages project or personal/organizational site and automate the whole process with Github Action Workflow
 date: 2014-03-21
 publishdate: 2014-03-21
-lastmod: 2018-09-22
 categories: [hosting and deployment]
 keywords: [github,git,deployment,hosting]
 authors: [Spencer Lyon, Gunnar Morling]
@@ -14,12 +13,11 @@ menu:
     weight: 30
 weight: 30
 sections_weight: 30
-draft: false
 toc: true
 aliases: [/tutorials/github-pages-blog/]
 ---
 
-GitHub provides free and fast static hosting over SSL for personal, organization, or project pages directly from a GitHub repository via its [GitHub Pages service][].
+GitHub provides free and fast static hosting over SSL for personal, organization, or project pages directly from a GitHub repository via its [GitHub Pages service][] and automate development workflows and build with [GitHub Actions].
 
 ## Assumptions
 
@@ -29,17 +27,13 @@ GitHub provides free and fast static hosting over SSL for personal, organization
 
 ## Types of GitHub Pages
 
-There are 2 types of GitHub Pages:
+There are two types of GitHub Pages:
 
 - User/Organization Pages (`https://<USERNAME|ORGANIZATION>.github.io/`)
 - Project Pages (`https://<USERNAME|ORGANIZATION>.github.io/<PROJECT>/`)
 
 Please refer to the [GitHub Pages documentation][ghorgs] to decide which type of site you would like to create as it will determine which of the below methods to use.
 
-To create a User/Organization Pages site, follow the single method in the *GitHub User and Organization Pages* section below.
-
-To create a Project Pages site, choose a method from the *Project Pages* section below.
-
 ## GitHub User or Organization Pages
 
 As mentioned in the [GitHub Pages documentation][ghorgs], you can host a user/organization page in addition to project pages. Here are the key differences in GitHub Pages websites for Users and Organizations:
@@ -49,194 +43,50 @@ As mentioned in the [GitHub Pages documentation][ghorgs], you can host a user/or
 
 This is a much simpler setup as your Hugo files and generated content are published into two different repositories.
 
-### Step-by-step Instructions
-
-1. Create a `<YOUR-PROJECT>` (e.g. `blog`) repository on GitHub. This repository will contain Hugo's content and other source files.
-2. Create a `<USERNAME>.github.io` GitHub repository. This is the repository that will contain the fully rendered version of your Hugo website.
-3. `git clone <YOUR-PROJECT-URL> && cd <YOUR-PROJECT>`
-4. Paste your existing Hugo project into the new local `<YOUR-PROJECT>` repository. Make sure your website works locally (`hugo server` or `hugo server -t <YOURTHEME>`) and open your browser to <http://localhost:1313>.
-5. Once you are happy with the results:
-    * Press <kbd>Ctrl</kbd>+<kbd>C</kbd> to kill the server
-    * Before proceeding run `rm -rf public` to completely remove the `public` directory
-6. `git submodule add -b main https://github.com/<USERNAME>/<USERNAME>.github.io.git public`. This creates a git [submodule][]. Now when you run the `hugo` command to build your site to `public`, the created `public` directory will have a different remote origin (i.e. hosted GitHub repository).
-7. Make sure the `baseURL` in your config file is updated with: `<USERNAME>.github.io`
-
-### Put it Into a Script
-
-You're almost done. In order to automate next steps create a `deploy.sh` script. You can also make it executable with `chmod +x deploy.sh`.
-
-The following are the contents of the `deploy.sh` script:
-
-```
-#!/bin/sh
-
-# If a command fails then the deploy stops
-set -e
-
-printf "\033[0;32mDeploying updates to GitHub...\033[0m\n"
-
-# Build the project.
-hugo # if using a theme, replace with `hugo -t <YOURTHEME>`
-
-# Go To Public folder
-cd public
-
-# Add changes to git.
-git add .
-
-# Commit changes.
-msg="rebuilding site $(date)"
-if [ -n "$*" ]; then
-	msg="$*"
-fi
-git commit -m "$msg"
-
-# Push source and build repos.
-git push origin main
-```
-
-
-You can then run `./deploy.sh "Your optional commit message"` to send changes to `<USERNAME>.github.io`. Note that you likely will want to commit changes to your `<YOUR-PROJECT>` repository as well.
-
-That's it! Your personal page should be up and running at `https://<USERNAME>.github.io` within a couple minutes.
-
-## GitHub Project Pages
-
-{{% note %}}
-Make sure your `baseURL` key-value in your [site configuration](/getting-started/configuration/) reflects the full URL of your GitHub pages repository if you're using the default GH Pages URL (e.g., `<USERNAME>.github.io/<PROJECT>/`) and not a custom domain.
-{{% /note %}}
-
-### Deployment of Project Pages from `/docs` folder on `main` branch
-
-[As described in the GitHub Pages documentation][ghpfromdocs], you can deploy from a folder called `docs/` on your main branch. To effectively use this feature with Hugo, you need to change the Hugo publish directory in your [site's][config] `config.toml` and `config.yaml`, respectively:
-
-```
-publishDir = "docs"
-```
-```
-publishDir: docs
-```
-
-After running `hugo`, push your main branch to the remote repository and choose the `docs/` folder as the website source of your repo. Do the following from within your GitHub project:
-
-1. Go to **Settings** &rarr; **GitHub Pages**
-2. From **Source**,  select "main branch /docs folder". If the option isn't enabled, you likely do not have a `docs/` folder in the root of your project.
-
-{{% note %}}
-The `docs/` option is the simplest approach but requires you set a publish directory in your site configuration. You cannot currently configure GitHub pages to publish from another directory on main, and not everyone prefers the output site live concomitantly with source files in version control.
-{{% /note %}}
-
-### Deployment of Project Pages From Your `gh-pages` branch
-
-You can also tell GitHub pages to treat your `main` branch as the published site or point to a separate `gh-pages` branch. The latter approach is a bit more complex but has some advantages:
+## Build Hugo With GitHub Action
 
-* It keeps your source and generated website in different branches and therefore maintains version control history for both.
-* Unlike the preceding `docs/` option, it uses the default `public` folder.
+GitHub execute your software development workflows. Everytime you push your code on the Github repository, Github Action will build the site automatically.
 
-#### Preparations for `gh-pages` Branch
+Create a file in `.github/workflows/gh-pages.yml` containing the following content (based on https://github.com/marketplace/actions/hugo-setup ):
 
-These steps only need to be done once. Replace `upstream` with the name of your remote; e.g., `origin`:
+```yml
+name: github pages
 
-##### Add the `public` Folder
+on:
+  push:
+    branches:
+      - main  # Set a branch to deploy
 
-First, add the `public` folder to your `.gitignore` file at the project root so that the directory is ignored on the main branch:
+jobs:
+  deploy:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true  # Fetch Hugo themes (true OR recursive)
+          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
 
-```
-echo "public" >> .gitignore
-```
-
-##### Initialize Your `gh-pages` Branch
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: 'latest'
+          # extended: true
 
-You can now initialize your `gh-pages` branch as an empty [orphan branch][]:
+      - name: Build
+        run: hugo --minify
 
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./public
 ```
-git checkout --orphan gh-pages
-git reset --hard
-git commit --allow-empty -m "Initializing gh-pages branch"
-git push upstream gh-pages
-git checkout main
-```
-
-#### Build and Deployment
-
-Now check out the `gh-pages` branch into your `public` folder using git's [worktree feature][]. Essentially, the worktree allows you to have multiple branches of the same local repository to be checked out in different directories:
-
-```
-rm -rf public
-git worktree add -B gh-pages public upstream/gh-pages
-```
-
-Regenerate the site using the `hugo` command and commit the generated files on the `gh-pages` branch:
-
-{{< code file="commit-gh-pages-files.sh">}}
-hugo
-cd public && git add --all && git commit -m "Publishing to gh-pages" && cd ..
-{{< /code >}}
-
-If the changes in your local `gh-pages` branch look alright, push them to the remote repo:
-
-```
-git push upstream gh-pages
-```
-
-##### Set `gh-pages` as Your Publish Branch
-
-In order to use your `gh-pages` branch as your publishing branch, you'll need to configure the repository within the GitHub UI. This will likely happen automatically once GitHub realizes you've created this branch. You can also set the branch manually from within your GitHub project:
-
-1. Go to **Settings** &rarr; **GitHub Pages**
-2. From **Source**,  select "gh-pages branch" and then **Save**. If the option isn't enabled, you likely have not created the branch yet OR you have not pushed the branch from your local machine to the hosted repository on GitHub.
-
-After a short while, you'll see the updated contents on your GitHub Pages site.
-
-#### Put it Into a Script
-
-To automate these steps, you can create a script with the following contents:
-
-{{< code file="publish_to_ghpages.sh" >}}
-#!/bin/sh
-
-if [ "`git status -s`" ]
-then
-    echo "The working directory is dirty. Please commit any pending changes."
-    exit 1;
-fi
-
-echo "Deleting old publication"
-rm -rf public
-mkdir public
-git worktree prune
-rm -rf .git/worktrees/public/
-
-echo "Checking out gh-pages branch into public"
-git worktree add -B gh-pages public upstream/gh-pages
-
-echo "Removing existing files"
-rm -rf public/*
-
-echo "Generating site"
-hugo
-
-echo "Updating gh-pages branch"
-cd public && git add --all && git commit -m "Publishing to gh-pages (publish.sh)"
-
-#echo "Pushing to github"
-#git push --all
-{{< /code >}}
-
-This will abort if there are pending changes in the working directory and also makes sure that all previously existing output files are removed. Adjust the script to taste, e.g. to include the final push to the remote repository if you don't need to take a look at the gh-pages branch before pushing.
-
-### Deployment of Project Pages from Your `main` Branch
-
-To use `main` as your publishing branch, you'll need your rendered website to live at the root of the GitHub repository. Steps should be similar to that of the `gh-pages` branch, with the exception that you will create your GitHub repository with the `public` directory as the root. Note that this does not provide the same benefits of the `gh-pages` branch in keeping your source and output in separate, but version controlled, branches within the same repo.
-
-You will also need to set `main` as your publishable branch from within the GitHub UI:
 
-1. Go to **Settings** &rarr; **GitHub Pages**
-2. From **Source**,  select "main branch" and then **Save**.
+For more advance settings https://github.com/marketplace/actions/hugo-setup 
 
 ## Use a Custom Domain
 
-If you'd like to use a custom domain for your GitHub Pages site, create a file `static/CNAME`. Your custom domain name should be the only contents inside `CNAME`. Since it's inside `static`, the published site will contain the CNAME file at the root of the published site, which is a requirements of GitHub Pages.
+If you'd like to use a custom domain for your GitHub Pages site, create a file `static/CNAME`. Your custom domain name should be the only contents inside `CNAME`. Since it's inside `static`, the published site will contain the CNAME file at the root of the published site, which is a requirement of GitHub Pages.
 
 Refer to the [official documentation for custom domains][domains] for further information.
 
@@ -251,3 +101,4 @@ Refer to the [official documentation for custom domains][domains] for further in
 [Quick Start]: /getting-started/quick-start/
 [submodule]: https://github.com/blog/2104-working-with-submodules
 [worktree feature]: https://git-scm.com/docs/git-worktree
+[GitHub Actions]: https://docs.github.com/en/actions
diff --git a/content/en/hugo-modules/configuration.md b/content/en/hugo-modules/configuration.md
index f82902ebb..4bb19dde4 100644
--- a/content/en/hugo-modules/configuration.md
+++ b/content/en/hugo-modules/configuration.md
@@ -83,6 +83,7 @@ extended
 [[module.imports]]
   path = "github.com/gohugoio/hugoTestModules1_linux/modh1_2_1v"
   ignoreConfig = false
+  ignoreImports = false
   disable = false
 [[module.imports]]
   path = "my-shortcodes"
@@ -94,6 +95,9 @@ path
 ignoreConfig
 : If enabled, any module configuration file, e.g. `config.toml`, will not be loaded. Note that this will also stop the loading of any transitive module dependencies.
 
+ignoreImports {{< new-in "0.80.0" >}}
+: If enabled, module imports will not be followed.
+
 disable
 : Set to `true` to disable the module while keeping any version info in the `go.*` files.
 
diff --git a/content/en/hugo-pipes/js.md b/content/en/hugo-pipes/js.md
index b57497d86..a9befa220 100644
--- a/content/en/hugo-pipes/js.md
+++ b/content/en/hugo-pipes/js.md
@@ -114,7 +114,7 @@ And it will resolve to the top-most `index.{js,ts,tsx,jsx}` inside `assets/my/mo
 import { hello3 } from 'my/module/hello3';
 ```
 
-Wil resolve to `hello3.{js,ts,tsx,jsx}` inside `assets/my/module`.
+Will resolve to `hello3.{js,ts,tsx,jsx}` inside `assets/my/module`.
 
 Any imports starting with `.` is resolved relative to the current file:
 
diff --git a/content/en/templates/sitemap-template.md b/content/en/templates/sitemap-template.md
index acc90a1c8..dee28fc3b 100644
--- a/content/en/templates/sitemap-template.md
+++ b/content/en/templates/sitemap-template.md
@@ -43,7 +43,7 @@ For multilingual sites, we also create a Sitemap index. You can provide a custom
 
 ## Hugo’s sitemap.xml
 
-This template respects the version 1.0 of the [Sitemap Protocol](https://www.sitemaps.org/protocol.html).
+This template respects the version 0.9 of the [Sitemap Protocol](https://www.sitemaps.org/protocol.html).
 
 ```xml
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" | safeHTML }}
diff --git a/content/en/variables/site.md b/content/en/variables/site.md
index 6b3f1d843..d3df29609 100644
--- a/content/en/variables/site.md
+++ b/content/en/variables/site.md
@@ -96,7 +96,7 @@ All the methods below, e.g. `.Site.RegularPages` can also be reached via the glo
 : top-level directories of the site.
 
 .Site.Taxonomies
-: the [taxonomies](/taxonomies/usage/) for the entire site.  Replaces the now-obsolete `.Site.Indexes` since v0.11. Also see section [Taxonomies elsewhere](#taxonomies-elsewhere).
+: the [taxonomies](/taxonomies/usage/) for the entire site.  Also see section [Taxonomies elsewhere](#taxonomies-elsewhere).
 
 .Site.Title
 : a string representing the title of the site.