Skip to content

Commit 24f66d5

Browse files
committed
User guide: rename config file base name to 'hugo' (google#1405)
1 parent 75c8c42 commit 24f66d5

File tree

18 files changed

+312
-207
lines changed

18 files changed

+312
-207
lines changed

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ repo.
4646
3. Update module and package versions:
4747
- Update the version of `docsy/dependencies` in [go.mod](go.mod) to v0.X.Y.
4848
- Update the NPM package version in [package.json](package.json) to 0.X.Y.
49-
4. Update the Docsy `version` in [userguide/config.toml][] to 0.X.Y.
49+
4. Update the Docsy `version` in [userguide/hugo.toml][] to 0.X.Y.
5050
5. Commit your changes, usually as a PR entitled "Release v0.X.Y preparation".
5151
Once the PR is approved and merged, proceed with the remaining steps.
5252
6. Ensure that you're:
@@ -96,4 +96,4 @@ repo.
9696
9797
[contribution guidelines]: https://www.docsy.dev/docs/contribution-guidelines/
9898
[Draft a new release]: https://github.com/google/docsy/releases/new
99-
[userguide/config.toml]: userguide/config.toml
99+
[userguide/hugo.toml]: userguide/hugo.toml

userguide/content/en/docs/Deployment/_index.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,25 @@ There are several options for publishing your web site using [Amazon Web Service
8888

8989
1. Check the proper configuration of your AWS CLI by issuing the command `aws s3 ls`, this should output a list of your S3 bucket(s).
9090

91-
1. Inside your `config.toml`/`config.yaml`/`config.json`, add a `[deployment]` section like this one:
91+
1. Inside your `hugo.toml`/`hugo.yaml`/`hugo.json`, add a `[deployment]` section like this one:
9292

9393
{{< tabpane persistLang=false >}}
9494
{{< tab header="Configuration file:" disabled=true />}}
95-
{{< tab header="config.toml" lang="toml" >}}
95+
{{< tab header="hugo.toml" lang="toml" >}}
9696
[deployment]
9797
[[deployment.targets]]
9898
name = "aws"
9999
URL = "s3://www.your-domain.tld"
100100
cloudFrontDistributionID = "E9RZ8T1EXAMPLEID"
101101
{{< /tab >}}
102-
{{< tab header="config.yaml" lang="yaml" >}}
102+
{{< tab header="hugo.yaml" lang="yaml" >}}
103103
deployment:
104104
targets:
105105
- name: aws
106106
URL: 's3://www.your-domain.tld'
107107
cloudFrontDistributionID: E9RZ8T1EXAMPLEID
108108
{{< /tab >}}
109-
{{< tab header="config.json" lang="json" >}}
109+
{{< tab header="hugo.json" lang="json" >}}
110110
{
111111
"deployment": {
112112
"targets": [

userguide/content/en/docs/Language/_index.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To add content in multiple languages, you first need to define the available lan
1414

1515
{{< tabpane persistLang=false >}}
1616
{{< tab header="Configuration file:" disabled=true />}}
17-
{{< tab header="config.toml" lang="toml" >}}
17+
{{< tab header="hugo.toml" lang="toml" >}}
1818
contentDir = "content/en"
1919
defaultContentLanguage = "en"
2020
defaultContentLanguageInSubdir = false
@@ -34,7 +34,7 @@ contentDir = "content/no"
3434
time_format_default = "02.01.2006"
3535
time_format_blog = "02.01.2006"
3636
{{< /tab >}}
37-
{{< tab header="config.yaml" lang="yaml" >}}
37+
{{< tab header="hugo.yaml" lang="yaml" >}}
3838
contentDir: content/en
3939
defaultContentLanguage: en
4040
defaultContentLanguageInSubdir: false
@@ -53,7 +53,7 @@ languages:
5353
time_format_default: 02.01.2006
5454
time_format_blog: 02.01.2006
5555
{{< /tab >}}
56-
{{< tab header="config.json" lang="json" >}}
56+
{{< tab header="hugo.json" lang="json" >}}
5757
{
5858
"contentDir": "content/en",
5959
"defaultContentLanguage": "en",
@@ -83,7 +83,7 @@ Any setting not defined in a `[languages]` block will fall back to the global va
8383
Once you've updated your site config, you create a content root directory for each language version in your source repo, such as `content/en` for English text, and add your [content](/docs/adding-content/content/) as usual. See the [Hugo Docs](https://gohugo.io/content-management/multilingual) on multi-language support for more information.
8484

8585
{{% alert title="Attention (only when using docsy as hugo module)" color="warning" %}}
86-
If you have a multi language installation, please make sure that the section `[languages]` inside your `config.toml` is declared before the section `[module]` with the module imports. Otherwise you will run into trouble!
86+
If you have a multi language installation, please make sure that the section `[languages]` inside your [configuration file](https://gohugo.io/getting-started/configuration/#configuration-file) is declared **before** the section `[module]` with the module imports. Otherwise you will run into trouble!
8787
{{% /alert %}}
8888

8989
{{% alert title="Tip" %}}
@@ -94,7 +94,7 @@ For adding multiple language versions of other site elements such as button text
9494

9595
## Selecting a language
9696

97-
If you configure more than one language in `config.toml`, the Docsy theme adds a language selector drop down to the top-level menu. Selecting a language takes the user to the translated version of the current page, or the home page for the given language.
97+
If you configure more than one language in your [configuration file](https://gohugo.io/getting-started/configuration/#configuration-file), the Docsy theme adds a language selector drop down to the top-level menu. Selecting a language takes the user to the translated version of the current page, or the home page for the given language.
9898

9999
## Internationalization bundles
100100

userguide/content/en/docs/Updating/Convert-site-to-module.md

+5
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ module:
169169
You can find details of what these configuration settings do in the [Hugo modules documentation](https://gohugo.io/hugo-modules/configuration/#module-config-top-level).
170170
Depending on your environment you may need to tweak them slightly, for example by adding a proxy to use when downloading remote modules.
171171

172+
{{% alert title="Tip" %}}
173+
In Hugo 0.110.0 the default config base filename was changed to `hugo.toml`.
174+
If you are using hugo 0.110 or above, consider renaming your `config.toml` to `hugo.toml`!
175+
{{% /alert %}}
176+
172177
{{% alert title="Attention" color="warning" %}}
173178
If you have a multi language installation, please make sure that the section `[languages]` inside your `config.toml` is declared before the section `[module]` with the module imports. Otherwise you will run into trouble!
174179
{{% /alert %}}

userguide/content/en/docs/adding-content/content.md

+24-24
Original file line numberDiff line numberDiff line change
@@ -235,23 +235,23 @@ As of version 0.100, [Goldmark](https://github.com/yuin/goldmark/) is the only M
235235

236236
<h4 class="alert-heading">Tip</h4>
237237

238-
If you've been using versions of Hugo before 0.60 that use [`BlackFriday`](https://github.com/russross/blackfriday) as its Markdown parser, you may need to make some small changes to your site to work with the current `Goldmark` Markdown parser. In particular, if you cloned an earlier version of our example site, add the following to your `config.toml`/`config.yaml`/`config.json` to allow Goldmark to render raw HTML as well as Markdown:
238+
If you've been using versions of Hugo before 0.60 that use [`BlackFriday`](https://github.com/russross/blackfriday) as its Markdown parser, you may need to make some small changes to your site to work with the current `Goldmark` Markdown parser. In particular, if you cloned an earlier version of our example site, add the following to your `hugo.toml`/`hugo.yaml`/`hugo.json` to allow Goldmark to render raw HTML as well as Markdown:
239239

240240
{{< tabpane persistLang=false >}}
241241
{{< tab header="Configuration file:" disabled=true />}}
242-
{{< tab header="config.toml" lang="toml" >}}
242+
{{< tab header="hugo.toml" lang="toml" >}}
243243
[markup]
244244
[markup.goldmark]
245245
[markup.goldmark.renderer]
246246
unsafe = true
247247
{{< /tab >}}
248-
{{< tab header="config.yaml" lang="yaml" >}}
248+
{{< tab header="hugo.yaml" lang="yaml" >}}
249249
markup:
250250
goldmark:
251251
renderer:
252252
unsafe: true
253253
{{< /tab >}}
254-
{{< tab header="config.json" lang="json" >}}
254+
{{< tab header="hugo.json" lang="json" >}}
255255
{
256256
"markup": {
257257
"goldmark": {
@@ -478,11 +478,11 @@ If you've just used the theme, you can still use all Docsy's provided [page bloc
478478

479479
## Adding a community page
480480

481-
The `community` landing page template has boilerplate content that's automatically filled in with the project name and community links specified in `config.toml`/`config.yaml`/`config.json`, providing your users with quick links to resources that help them get involved in your project. The same links are also added by default to your site footer.
481+
The `community` landing page template has boilerplate content that's automatically filled in with the project name and community links specified in `hugo.toml`/`hugo.yaml`/`hugo.json`, providing your users with quick links to resources that help them get involved in your project. The same links are also added by default to your site footer.
482482

483483
{{< tabpane persistLang=false >}}
484484
{{< tab header="Configuration file:" disabled=true />}}
485-
{{< tab header="config.toml" lang="toml" >}}
485+
{{< tab header="hugo.toml" lang="toml" >}}
486486
[params.links]
487487
# End user relevant links. These will show up on left side of footer and in the community page if you have one.
488488
[[params.links.user]]
@@ -517,7 +517,7 @@ The `community` landing page template has boilerplate content that's automatical
517517
icon = "fa fa-envelope"
518518
desc = "Discuss development issues around the project"
519519
{{< /tab >}}
520-
{{< tab header="config.yaml" lang="yaml" >}}
520+
{{< tab header="hugo.yaml" lang="yaml" >}}
521521
params:
522522
links:
523523
user:
@@ -547,7 +547,7 @@ params:
547547
icon: fa fa-envelope
548548
desc: Discuss development issues around the project
549549
{{< /tab >}}
550-
{{< tab header="config.json" lang="json" >}}
550+
{{< tab header="hugo.json" lang="json" >}}
551551
{
552552
"params": {
553553
"links": {
@@ -609,18 +609,18 @@ You can also use this directory for other files used by your project, including
609609

610610
## RSS feeds
611611

612-
Hugo will, by default, create an RSS feed for the home page and any section. For the main RSS feed you can control which sections to include by setting a site param in your `config.toml`/`config.yaml`/`config.json`. This is the default configuration:
612+
Hugo will, by default, create an RSS feed for the home page and any section. For the main RSS feed you can control which sections to include by setting a site param in your `hugo.toml`/`hugo.yaml`/`hugo.json`. This is the default configuration:
613613

614614
{{< tabpane persistLang=false >}}
615615
{{< tab header="Configuration file:" disabled=true />}}
616-
{{< tab header="config.toml" lang="toml" >}}
616+
{{< tab header="hugo.toml" lang="toml" >}}
617617
rss_sections = ["blog"]
618618
{{< /tab >}}
619-
{{< tab header="config.yaml" lang="yaml" >}}
619+
{{< tab header="hugo.yaml" lang="yaml" >}}
620620
rss_sections:
621621
- blog
622622
{{< /tab >}}
623-
{{< tab header="config.json" lang="json" >}}
623+
{{< tab header="hugo.json" lang="json" >}}
624624
{
625625
"rss_sections": [
626626
"blog"
@@ -629,18 +629,18 @@ rss_sections:
629629
{{< /tab >}}
630630
{{< /tabpane >}}
631631

632-
To disable all RSS feeds, add the following to your `config.toml`/`config.yaml`/`config.json`:
632+
To disable all RSS feeds, add the following to your `hugo.toml`/`hugo.yaml`/`hugo.json`:
633633

634634
{{< tabpane persistLang=false >}}
635635
{{< tab header="Configuration file:" disabled=true />}}
636-
{{< tab header="config.toml" lang="toml" >}}
636+
{{< tab header="hugo.toml" lang="toml" >}}
637637
disableKinds = ["RSS"]
638638
{{< /tab >}}
639-
{{< tab header="config.yaml" lang="yaml" >}}
639+
{{< tab header="hugo.yaml" lang="yaml" >}}
640640
disableKinds:
641641
- RSS
642642
{{< /tab >}}
643-
{{< tab header="config.json" lang="json" >}}
643+
{{< tab header="hugo.json" lang="json" >}}
644644
{
645645
"disableKinds": [
646646
"RSS"
@@ -654,22 +654,22 @@ disableKinds:
654654

655655
<h4 class="alert-heading">Note</h4>
656656

657-
If you have enabled our [print feature](/docs/adding-content/print/) or otherwise specified section-level output formats in `config.toml`/`config.yaml`/`config.json`, make sure that `"RSS"` is listed as an output format, otherwise you won't get section-level RSS feeds (and your blog section won't get a nice orange RSS button). Your `config.toml`/`config.yaml`/`config.json` specification overrides the Hugo default [output formats](https://gohugo.io/templates/output-formats/) for sections, which are HTML and RSS.
657+
If you have enabled our [print feature](/docs/adding-content/print/) or otherwise specified section-level output formats in `hugo.toml`/`hugo.yaml`/`hugo.json`, make sure that `"RSS"` is listed as an output format, otherwise you won't get section-level RSS feeds (and your blog section won't get a nice orange RSS button). Your `hugo.toml`/`hugo.yaml`/`hugo.json` specification overrides the Hugo default [output formats](https://gohugo.io/templates/output-formats/) for sections, which are HTML and RSS.
658658

659659
{{< tabpane persistLang=false >}}
660660
{{< tab header="Configuration file:" disabled=true />}}
661-
{{< tab header="config.toml" lang="toml" >}}
661+
{{< tab header="hugo.toml" lang="toml" >}}
662662
[outputs]
663663
section = [ "HTML", "RSS", "print" ]
664664
{{< /tab >}}
665-
{{< tab header="config.yaml" lang="yaml" >}}
665+
{{< tab header="hugo.yaml" lang="yaml" >}}
666666
outputs:
667667
section:
668668
- HTML
669669
- RSS
670670
- print
671671
{{< /tab >}}
672-
{{< tab header="config.json" lang="json" >}}
672+
{{< tab header="hugo.json" lang="json" >}}
673673
{
674674
"outputs": {
675675
"section": [
@@ -687,23 +687,23 @@ outputs:
687687

688688
Hugo creates a `sitemap.xml` file for your generated site by default: for example, [here's the sitemap](/sitemap.xml) for this site.
689689

690-
You can configure the frequency with which your sitemap is updated, your sitemap filename, and the default page priority in your `config.toml`/`config.yaml`/`config.json`:
690+
You can configure the frequency with which your sitemap is updated, your sitemap filename, and the default page priority in your `hugo.toml`/`hugo.yaml`/`hugo.json`:
691691

692692
{{< tabpane persistLang=false >}}
693693
{{< tab header="Configuration file:" disabled=true />}}
694-
{{< tab header="config.toml" lang="toml" >}}
694+
{{< tab header="hugo.toml" lang="toml" >}}
695695
[sitemap]
696696
changefreq = "monthly"
697697
filename = "sitemap.xml"
698698
priority = 0.5
699699
{{< /tab >}}
700-
{{< tab header="config.yaml" lang="yaml" >}}
700+
{{< tab header="hugo.yaml" lang="yaml" >}}
701701
sitemap:
702702
changefreq: monthly
703703
filename: sitemap.xml
704704
priority: 0.5
705705
{{< /tab >}}
706-
{{< tab header="config.json" lang="json" >}}
706+
{{< tab header="hugo.json" lang="json" >}}
707707
{
708708
"sitemap": {
709709
"changefreq": "monthly",

0 commit comments

Comments
 (0)