Skip to content

Commit

Permalink
Merge commit 'ec920363cdeb687c8bcac9c242767d366fb058cb'
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Apr 8, 2022
2 parents ffe3eb9 + ec92036 commit 5b5dcb8
Show file tree
Hide file tree
Showing 20 changed files with 196 additions and 115 deletions.
66 changes: 63 additions & 3 deletions docs/.cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"aabba",
"aabbaa",
"aabbaabb",
"aabbaabbab",
"abbaa",
"abourget",
"absurl",
"adoc",
Expand All @@ -18,7 +20,11 @@
"attrlink",
"azblob",
"baseof",
"bbaa",
"bcde",
"bcdef",
"beevelop",
"Bergevin",
"bibtex",
"Bjørn",
"blackfriday",
Expand All @@ -31,6 +37,7 @@
"canonify",
"Catmull",
"Catwoman",
"changefreq",
"Cheatsheet",
"choco",
"chromastyles",
Expand All @@ -42,12 +49,15 @@
"Coen",
"Commento",
"Cond",
"contentdir",
"Contentful",
"Copr",
"copyrighthtml",
"corejs",
"countrunes",
"countwords",
"crossreferences",
"daftaupe",
"datatable",
"DATOCMS",
"debugconfig",
Expand All @@ -60,6 +70,8 @@
"dokuwiki",
"dpkg",
"DRING",
"Eiqc",
"Eliott",
"Emojify",
"Enwrite",
"eopkg",
Expand All @@ -68,6 +80,7 @@
"erroridf",
"Evernote",
"exitwp",
"expirydate",
"Feminella",
"firstpost",
"Formspree",
Expand Down Expand Up @@ -95,7 +108,9 @@
"Grayscale",
"Gruber",
"gtag",
"gvfs",
"hidecaption",
"hmac",
"Hokus",
"hola",
"hügó",
Expand All @@ -121,6 +136,7 @@
"Isset",
"Isso",
"Jaco",
"JIRN",
"johnpatitucci",
"Joomla",
"JRBR",
Expand All @@ -142,10 +158,13 @@
"mathjax",
"mdhender",
"mdshortcode",
"MENUENTRY",
"mercredi",
"Milli",
"Mittwoch",
"mkdir",
"mmark",
"modh",
"monokai",
"Morling",
"mspowerpoint",
Expand All @@ -155,17 +174,20 @@
"mydeployment",
"myindex",
"mylayout",
"mylogin",
"mypage",
"mypartials",
"mypost",
"mysite",
"myspa",
"mystyle",
"mytextpartial",
"mytheme",
"NDJSON",
"needsexample",
"Netravali",
"newparam",
"Nichlas",
"Nikhil",
"Njjy",
"nlist",
Expand All @@ -176,6 +198,7 @@
"NOSQL",
"notoc",
"novembre",
"numfmt",
"NUMWORKERMULTIPLIER",
"Obhu",
"octohug",
Expand All @@ -191,35 +214,47 @@
"PCRE",
"peaceiris",
"Pedersen",
"Pekka",
"permalinkable",
"plainify",
"POSIX",
"postprocess",
"Poupin",
"prerender",
"println",
"publishdate",
"Pygments",
"qref",
"querify",
"QVOMC",
"Racic",
"Rclone",
"rdwatters",
"readfile",
"rebinded",
"recommendedby",
"REDIR",
"reftext",
"relatedfuncs",
"relref",
"relurl",
"remarkjs",
"rgba",
"Riku",
"rlimit",
"roboto",
"rssxml",
"rwxrwxrwx",
"RYUGV",
"safehtml",
"safejs",
"Samsa",
"schemaorg",
"Shekhar",
"Shortcode",
"Shortcodes",
"signup",
"Silvola",
"Sindre",
"sitemapindex",
"sitemapxml",
Expand All @@ -231,24 +266,33 @@
"struct",
"structs",
"subdir",
"svgs",
"symdiff",
"Talkyard",
"taxo",
"taxonomyname",
"tbody",
"tdewolff",
"testshortcodes",
"thead",
"Thinkful",
"Tknx",
"TLDR",
"TMPDIR",
"TOCSS",
"todos",
"tojson",
"Tomango",
"topologix",
"Torikian",
"totoml",
"toyaml",
"twitteruser",
"Unmarshal",
"Unmarshal",
"urlize",
"urlset",
"utimestamp",
"vendored",
"vimrc",
"wanghc",
"Wappalyzer",
Expand All @@ -258,19 +302,35 @@
"wibble",
"wordcount",
"workson",
"wpxr",
"Xbaabbab",
"xvzf",
"yoyoyo",
"Zgotmpl",
"zzbbaabb"
"zzbbaabb",
"مدونتي"
],
"language": "en,en-GB,en-US,de,fr",
"allowCompoundWords": true,
"files": [
"**/*.md"
],
"ignoreRegExpList": [
"<!-- prettier-ignore -->\\n(`{3,})\\w*\\n[\\s\\S]+?\\1",
"\\[(\\*{2})?@\\w+?\\1\\]",
"\\[`\\w+`\\]",
"ve{2,}r{2,}y",
"ve+r+y+long\\w*",
"\\/.*?\\/",
"\\_\\w+",
"\\#\\w+"
],
"ignorePaths": [
".cspell.json",
"**/node_modules/**",
"*.min.*"
"*.min.*",
"**/news/*",
"**/showcase/*"
],
"useGitignore": true
}
2 changes: 1 addition & 1 deletion docs/content/en/content-management/formats.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The current list of content formats in Hugo:
|MMark|mmark|Mmark is deprecated and will be removed in a future release.|
|Emacs Org-Mode|org|See [go-org](https://github.com/niklasfasching/go-org).|
|AsciiDoc|asciidocext, adoc, ad|Needs [Asciidoctor][ascii] installed.|
|RST|rst|Needs [RST](https://docutils.sourceforge.net/rst.html) installed.|
|RST|rst|Needs [RST](https://docutils.sourceforge.io/rst.html) installed.|
|Pandoc|pandoc, pdc|Needs [Pandoc](https://www.pandoc.org/) installed.|
|HTML|html, htm|To be treated as a content file, with layout, shortcodes etc., it must have front matter. If not, it will be copied as-is.|

Expand Down
1 change: 0 additions & 1 deletion docs/content/en/functions/cond.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ hugoversion: 0.27
relatedfuncs: [default]
toc: false
draft: false
needsexamples: false
---

`cond` returns *VAR1* if *CONTROL* is true, or *VAR2* if it is not.
Expand Down
1 change: 0 additions & 1 deletion docs/content/en/functions/default.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ relatedfuncs: []
deprecated: false
draft: false
aliases: []
needsexamples: false
---

`default` checks whether a given value is set and returns a default value if it is not. *Set* in this context means different things depending on the data type:
Expand Down
1 change: 0 additions & 1 deletion docs/content/en/functions/uniq.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ hugoversion:
relatedfuncs: []
deprecated: false
aliases: []
needsexamples: false
---

```
Expand Down
21 changes: 5 additions & 16 deletions docs/content/en/getting-started/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ In addition to using a single site config file, one can use the `configDir` dire

- Each file represents a configuration root object, such as `params.toml` for `[Params]`, `menu(s).toml` for `[Menu]`, `languages.toml` for `[Languages]` etc...
- Each file's content must be top-level, for example:

{{< code-toggle file="config" >}}
[Params]
foo = "bar"
Expand Down Expand Up @@ -220,7 +220,7 @@ Disable automatic live reloading of browser window.

: Do not convert the url/path to lowercase.

### enableEmoji
### enableEmoji

**Default value:** false

Expand Down Expand Up @@ -254,18 +254,6 @@ Enable generation of `robots.txt` file.

See [Front matter Configuration](#configure-front-matter).

### footnoteAnchorPrefix

**Default value:** ""

Prefix for footnote anchors.

### footnoteReturnLinkContents

**Default value:** ""

Text to display for footnote return links.

### googleAnalytics

**Default value:** ""
Expand All @@ -279,6 +267,7 @@ Google Analytics tracking ID.
If true, auto-detect Chinese/Japanese/Korean Languages in the content. This will make `.Summary` and `.WordCount` behave correctly for CJK languages.

### imaging

See [Image Processing Config](/content-management/image-processing/#image-processing-config).

### languageCode
Expand All @@ -288,6 +277,7 @@ See [Image Processing Config](/content-management/image-processing/#image-proces
A language tag as defined by [RFC 5646](https://datatracker.ietf.org/doc/html/rfc5646). The internal [RSS template](https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/embedded/templates/_default/rss.xml) populates its `<language>` element with this value. The value is not used elsewhere.

### languages

See [Configure Languages](/content-management/multilingual/#configure-languages).

### disableLanguages
Expand Down Expand Up @@ -330,7 +320,7 @@ Don't sync modification time of files.
### outputFormats
See [Configure Output Formats](#configure-additional-output-formats).

### paginate
### paginate

**Default value:** 10

Expand Down Expand Up @@ -568,7 +558,6 @@ The following is a typical example of a configuration file. The values nested un
{{< code-toggle file="config">}}
baseURL: "https://yoursite.example.com/"
title: "My Hugo Site"
footnoteReturnLinkContents: "↩"
permalinks:
posts: /:year/:month/:title/
params:
Expand Down
Loading

0 comments on commit 5b5dcb8

Please sign in to comment.