Skip to content

Commit

Permalink
Merge commit '6aa5c9117fd34644459ea9bcfb1b3f5010658d5d'
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Jul 7, 2020
2 parents 12a65e7 + 6aa5c91 commit f1916f1
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 26 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/content/en/content-management/front-matter.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ videos
: an array of paths to videos related to the page; used by the `opengraph` [internal template](/templates/internal) to populate `og:video`.

weight
: used for [ordering your content in lists][ordering]. Lower weight gets higher precedence. So content with lower weight will come first.
: used for [ordering your content in lists][ordering]. Lower weight gets higher precedence. So content with lower weight will come first. If set, weights should be non-zero, as 0 is interpreted as an *unset* weight.

\<taxonomies\>
: field name of the *plural* form of the index. See `tags` and `categories` in the above front matter examples. _Note that the plural form of user-defined taxonomies cannot be the same as any of the predefined front matter variables._
Expand Down
12 changes: 6 additions & 6 deletions docs/content/en/content-management/taxonomies.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ disableKinds = ["taxonomy","term"]

{{< new-in "0.73.0" >}} We have fixed the before confusing page kinds used for taxonomies (see the listing below) to be in line with the terms used when we talk about taxonomies. We have been careful to avoid site breakage, and you should get an ERROR in the console if you need to adjust your `disableKinds` section.

{{< page-kinds >}}
{{% page-kinds %}}

### Default Destinations

Expand Down Expand Up @@ -194,13 +194,13 @@ Currently taxonomies only support the [default `weight => date` ordering of list

## Add custom metadata a Taxonomy or Term

If you need to add custom metadata to your taxonomy terms, you will need to create a page for that term at `/content/<TAXONOMY>/<TERM>/_index.md` and add your metadata in it's front matter. Continuing with our 'Actors' example, let's say you want to add a wikipedia page link to each actor. Your terms pages would be something like this:
If you need to add custom metadata to your taxonomy terms, you will need to create a page for that term at `/content/<TAXONOMY>/<TERM>/_index.md` and add your metadata in it's front matter. Continuing with our 'Actors' example, let's say you want to add a Wikipedia page link to each actor. Your terms pages would be something like this:

{{< code file="/content/actors/bruce-willis/_index.md" >}}
---
title: "Bruce Willis"
wikipedia: "https://en.wikipedia.org/wiki/Bruce_Willis"
---
---
title: "Bruce Willis"
wikipedia: "https://en.wikipedia.org/wiki/Bruce_Willis"
---
{{< /code >}}


Expand Down
4 changes: 2 additions & 2 deletions docs/content/en/getting-started/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ Default configuration:

Since Hugo 0.52 you can configure more than just the `cacheDir`. This is the default configuration:

```toml
{{< code-toggle >}}
[caches]
[caches.getjson]
dir = ":cacheDir/:project"
Expand All @@ -531,7 +531,7 @@ maxAge = -1
[caches.modules]
dir = ":cacheDir/modules"
maxAge = -1
```
{{< /code-toggle >}}

You can override any of these cache settings in your own `config.toml`.

Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/getting-started/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Ideally, you should install it somewhere in your `PATH` for easy use. `/usr/loca

### Docker

We currently do not official Hugo images for Docker, but we do recommend these up to date distributions: https://hub.docker.com/r/klakegg/hugo/
We currently do not offer official Hugo images for Docker, but we do recommend these up to date distributions: https://hub.docker.com/r/klakegg/hugo/

### Homebrew (macOS)

Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/getting-started/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The above will create a new Hugo site in a folder named `quickstart`.

See [themes.gohugo.io](https://themes.gohugo.io/) for a list of themes to consider. This quickstart uses the beautiful [Ananke theme](https://themes.gohugo.io/gohugo-theme-ananke/).

First, download the theme from GitHub and add it to your site's `theme` directory:
First, download the theme from GitHub and add it to your site's `themes` directory:

```bash
cd quickstart
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ This is a much simpler setup as your Hugo files and generated content are publis
* 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 master 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

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 3 additions & 8 deletions docs/content/en/news/0.73.0-relnotes/index.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

---
date: 2020-06-23
title: "0.73.0"
description: "0.73.0"
title: "Summer Breeze"
description: "Taxonomy terms cleanup, render hooks per section/type, HMAC function, and more."
categories: ["Releases"]
---

Again, a release on the small side. Some new features -- one example is that we now support hook templates per section/type, see [#7349](https://github.com/gohugoio/hugo/issues/7349) -- and some important bug fixes.
Again, a release on the small side. Some new features -- one example is that we now support hook templates per section/type, see [#7349](https://github.com/gohugoio/hugo/issues/7349) -- and some important bug fixes.

But the most important part of this release is that we have now finally cleaned up the terms used for the taxonomy page kinds. This has made the taxonomy feature in Hugo harder to understand than it needed to be. The old/new values for these are `taxonomy` => `term` and `taxonomyTerm` => `taxonomy`. We have taken great care to avoid site breakage. See [#6911](https://github.com/gohugoio/hugo/issues/6911) for more information.

Expand All @@ -17,11 +17,6 @@ Many have also been busy writing and fixing the documentation in [hugoDocs](http
which has received **30 contributions by 14 contributors**. A special thanks to christianoliff, bjorn.erik.pedersen, patrick, and hello for their work on the documentation site.


Hugo now has:


* 326+ [themes](http://themes.gohugo.io/)

## Notes

* Rename taxonomy kinds from taxonomy to term, taxonomyTerm to taxonomy [#6911](https://github.com/gohugoio/hugo/issues/6911)
Expand Down
2 changes: 1 addition & 1 deletion docs/layouts/shortcodes/gomodules-info.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ $text := `
Most of the commands for **Hugo Modules** requires a newer version of Go installed (see https://golang.org/dl/) and the relevant VCS client (e.g. Git, see https://git-scm.com/downloads). If you have an "older" site running on Netlify, you may have to set GO_VERSION to 1.12 in your Environment settings.
Most of the commands for **Hugo Modules** requires a newer version of Go installed (see https://golang.org/dl/) and the relevant VCS client (e.g. Git, see https://git-scm.com/downloads/ ). If you have an "older" site running on Netlify, you may have to set GO_VERSION to 1.12 in your Environment settings.

For more information about Go Modules, see:

Expand Down
2 changes: 1 addition & 1 deletion docs/layouts/shortcodes/page-kinds.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
| `page` | The landing page for a given page | `my-post` page (`/posts/my-post/index.html`) |
| `section` | The landing page of a given section | `posts` section (`/posts/index.html`) |
| `taxonomy` | The landing page for a taxonomy | `tags` taxonomy (`/tags/index.html`) |
| `term ` | The landing page for one taxonomy's term | term `awesome` in `tags` taxonomy (`/tags/awesome/index.html`) |
| `term` | The landing page for one taxonomy's term | term `awesome` in `tags` taxonomy (`/tags/awesome/index.html`) |
8 changes: 4 additions & 4 deletions docs/netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@ publish = "public"
command = "hugo --gc --minify"

[context.production.environment]
HUGO_VERSION = "0.72.0"
HUGO_VERSION = "0.73.0"
HUGO_ENV = "production"
HUGO_ENABLEGITINFO = "true"

[context.split1]
command = "hugo --gc --minify --enableGitInfo"

[context.split1.environment]
HUGO_VERSION = "0.72.0"
HUGO_VERSION = "0.73.0"
HUGO_ENV = "production"

[context.deploy-preview]
command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"

[context.deploy-preview.environment]
HUGO_VERSION = "0.72.0"
HUGO_VERSION = "0.73.0"

[context.branch-deploy]
command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"

[context.branch-deploy.environment]
HUGO_VERSION = "0.72.0"
HUGO_VERSION = "0.73.0"

[context.next.environment]
HUGO_ENABLEGITINFO = "true"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f1916f1

Please sign in to comment.