diff options
Diffstat (limited to 'docs/content/en')
| -rw-r--r-- | docs/content/en/content-management/cross-references.md | 1 | ||||
| -rw-r--r-- | docs/content/en/content-management/formats.md | 3 | ||||
| -rw-r--r-- | docs/content/en/content-management/front-matter.md | 2 | ||||
| -rw-r--r-- | docs/content/en/content-management/multilingual.md | 25 | ||||
| -rw-r--r-- | docs/content/en/functions/anchorize.md | 2 | ||||
| -rw-r--r-- | docs/content/en/getting-started/configuration-markup.md | 12 | ||||
| -rw-r--r-- | docs/content/en/getting-started/configuration.md | 3 | ||||
| -rwxr-xr-x | docs/content/en/hugo-pipes/introduction.md | 11 | ||||
| -rwxr-xr-x | docs/content/en/hugo-pipes/scss-sass.md | 2 | ||||
| -rw-r--r-- | docs/content/en/showcase/tomango/index.md | 2 | ||||
| -rw-r--r-- | docs/content/en/templates/data-templates.md | 2 | ||||
| -rw-r--r-- | docs/content/en/templates/files.md | 2 | ||||
| -rw-r--r-- | docs/content/en/troubleshooting/faq.md | 4 |
13 files changed, 21 insertions, 50 deletions
diff --git a/docs/content/en/content-management/cross-references.md b/docs/content/en/content-management/cross-references.md index 9580fd7e5..b5dd8a4c3 100644 --- a/docs/content/en/content-management/cross-references.md +++ b/docs/content/en/content-management/cross-references.md @@ -126,4 +126,3 @@ refLinksNotFoundURL [lists]: /templates/lists/ [output formats]: /templates/output-formats/ [shortcode]: /content-management/shortcodes/ -[bfext]: /content-management/formats/#blackfriday-extensions diff --git a/docs/content/en/content-management/formats.md b/docs/content/en/content-management/formats.md index 7d2d7b0a0..303bb4596 100644 --- a/docs/content/en/content-management/formats.md +++ b/docs/content/en/content-management/formats.md @@ -29,7 +29,6 @@ The current list of content formats in Hugo: | Name | Markup identifiers | Comment | | ------------- | ------------- |-------------| | Goldmark | md, markdown, goldmark |Note that you can set the default handler of `md` and `markdown` to something else, see [Configure Markup](/getting-started/configuration-markup/).{{< new-in "0.60.0" >}} | -| Blackfriday | blackfriday |Blackfriday will eventually be deprecated.| |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.io/rst.html) installed.| @@ -128,8 +127,6 @@ Markdown syntax is simple enough to learn in a single sitting. The following are [`emojify` function]: /functions/emojify/ [ascii]: https://asciidoctor.org/ -[bfconfig]: /getting-started/configuration/#configuring-blackfriday-rendering -[blackfriday]: https://github.com/russross/blackfriday [config]: /getting-started/configuration/ [developer tools]: /tools/ [emojis]: https://www.webpagefx.com/tools/emoji-cheat-sheet/ diff --git a/docs/content/en/content-management/front-matter.md b/docs/content/en/content-management/front-matter.md index c915a5f96..0d8c2e3a6 100644 --- a/docs/content/en/content-management/front-matter.md +++ b/docs/content/en/content-management/front-matter.md @@ -217,7 +217,7 @@ You can assign content-specific `weight` in the front matter of your content. Th ## Override Global Markdown Configuration -It's possible to set some options for Markdown rendering in a content's front matter as an override to the [BlackFriday rendering options set in your project configuration][config]. +It's possible to set some options for Markdown rendering in a content's front matter as an override to the [Rendering options set in your project configuration][config]. ## Front Matter Format Specs diff --git a/docs/content/en/content-management/multilingual.md b/docs/content/en/content-management/multilingual.md index 2eeb1aa1b..d1e7965b2 100644 --- a/docs/content/en/content-management/multilingual.md +++ b/docs/content/en/content-management/multilingual.md @@ -140,31 +140,6 @@ Press Ctrl+C to stop Live reload and `--navigateToChanged` between the servers work as expected. -### Taxonomies and Blackfriday - -Taxonomies and [Blackfriday configuration][config] can also be set per language: - -{{< code-toggle file="config" >}} -[Taxonomies] -tag = "tags" - -[blackfriday] -angledQuotes = true -hrefTargetBlank = true - -[languages] -[languages.en] -weight = 1 -title = "English" -[languages.en.blackfriday] -angledQuotes = false - -[languages.fr] -weight = 2 -title = "Français" -[languages.fr.Taxonomies] -plaque = "plaques" -{{</ code-toggle >}} ## Translate Your Content diff --git a/docs/content/en/functions/anchorize.md b/docs/content/en/functions/anchorize.md index b5bd22e07..5530e193b 100644 --- a/docs/content/en/functions/anchorize.md +++ b/docs/content/en/functions/anchorize.md @@ -13,7 +13,7 @@ workson: [] relatedfuncs: [humanize] --- -If [Goldmark](https://gohugo.io/getting-started/configuration-markup#goldmark) is set as `defaultMarkdownHandler`, the sanitizing logic adheres to the setting [`markup.goldmark.parser.autoHeadingIDType`](https://gohugo.io/getting-started/configuration-markup#goldmark). If [Blackfriday](https://gohugo.io/getting-started/configuration-markup#blackfriday) is set as `defaultMarkdownHandler`, this template function uses the [`SanitizedAnchorName` logic from Blackfriday](https://github.com/russross/blackfriday#sanitized-anchor-names) (the same applies when `markup.goldmark.parser.autoHeadingIDType` is set to `blackfriday`). +If [Goldmark](https://gohugo.io/getting-started/configuration-markup#goldmark) is set as `defaultMarkdownHandler`, the sanitizing logic adheres to the setting [`markup.goldmark.parser.autoHeadingIDType`](https://gohugo.io/getting-started/configuration-markup#goldmark). Since the `defaultMarkdownHandler` and this template function use the same sanitizing logic, you can use the latter to determine the ID of a header for linking with anchor tags. diff --git a/docs/content/en/getting-started/configuration-markup.md b/docs/content/en/getting-started/configuration-markup.md index b323ba464..2a38c0ce4 100644 --- a/docs/content/en/getting-started/configuration-markup.md +++ b/docs/content/en/getting-started/configuration-markup.md @@ -24,7 +24,7 @@ Below are all markup related configuration in Hugo with their default settings: ### Goldmark -[Goldmark](https://github.com/yuin/goldmark/) is from Hugo 0.60 the default library used for Markdown. It's fast, it's [CommonMark](https://spec.commonmark.org/0.29/) compliant and it's very flexible. Note that the feature set of Goldmark vs Blackfriday isn't the same; you gain a lot but also lose some, but we will work to bridge any gap in the upcoming Hugo versions. +[Goldmark](https://github.com/yuin/goldmark/) is from Hugo 0.60 the default library used for Markdown. It's fast, it's [CommonMark](https://spec.commonmark.org/0.29/) compliant and it's very flexible. This is the default configuration: @@ -77,16 +77,8 @@ Note that attributes in [code fences](/content-management/syntax-highlighting/#h ```` autoHeadingIDType ("github") {{< new-in "0.62.2" >}} -: The strategy used for creating auto IDs (anchor names). Available types are `github`, `github-ascii` and `blackfriday`. `github` produces GitHub-compatible IDs, `github-ascii` will drop any non-Ascii characters after accent normalization, and `blackfriday` will make the IDs work as with [Blackfriday](#blackfriday), the default Markdown engine before Hugo 0.60. Note that if Goldmark is your default Markdown engine, this is also the strategy used in the [anchorize](/functions/anchorize/) template func. +: The strategy used for creating auto IDs (anchor names). Available types are `github`, `github-ascii` and `blackfriday`. `github` produces GitHub-compatible IDs, `github-ascii` will drop any non-Ascii characters after accent normalization, and `blackfriday` will make the IDs compatible with [Blackfriday](#blackfriday), the default Markdown engine before Hugo 0.60. Note that if Goldmark is your default Markdown engine, this is also the strategy used in the [anchorize](/functions/anchorize/) template func. -### Blackfriday - - -[Blackfriday](https://github.com/russross/blackfriday) was Hugo's default Markdown rendering engine, now replaced with Goldmark. But you can still use it: Just set `defaultMarkdownHandler` to `blackfriday` in your top level `markup` config. - -This is the default config: - -{{< code-toggle config="markup.blackFriday" />}} ### Highlight diff --git a/docs/content/en/getting-started/configuration.md b/docs/content/en/getting-started/configuration.md index cd57b371d..9393e4534 100644 --- a/docs/content/en/getting-started/configuration.md +++ b/docs/content/en/getting-started/configuration.md @@ -121,9 +121,6 @@ The directory where Hugo finds asset files used in [Hugo Pipes](/hugo-pipes/). { ### baseURL Hostname (and path) to the root, e.g. https://bep.is/ -### blackfriday -See [Configure Blackfriday](/getting-started/configuration-markup#blackfriday) - ### build See [Configure Build](#configure-build) diff --git a/docs/content/en/hugo-pipes/introduction.md b/docs/content/en/hugo-pipes/introduction.md index bbafe55b2..a3c956885 100755 --- a/docs/content/en/hugo-pipes/introduction.md +++ b/docs/content/en/hugo-pipes/introduction.md @@ -53,6 +53,17 @@ With `resources.GetRemote`, the first argument is a remote URL: `resources.Get` and `resources.GetRemote` return `nil` if the resource is not found. +## Copy a Resource + +{{< new-in "0.100.0" >}} + +`resources.Copy` allows you to copy almost any Hugo `Resource` (the one exception is the `Page`), possibly most useful for renaming things: + +```go-html-template +{{ $resized := $image.Resize "400x400" | resources.Copy "images/mynewname.jpg" }} +<img src="{{ $resized.RelPermalink }}"> +``` + ### Caching By default, Hugo calculates a cache key based on the `URL` and the `options` (e.g. headers) given. diff --git a/docs/content/en/hugo-pipes/scss-sass.md b/docs/content/en/hugo-pipes/scss-sass.md index 12cebc014..c4a0a5520 100755 --- a/docs/content/en/hugo-pipes/scss-sass.md +++ b/docs/content/en/hugo-pipes/scss-sass.md @@ -45,7 +45,7 @@ includePaths [string slice] : Additional SCSS/SASS include paths. Paths must be relative to the project directory. ```go-html-template -{{ $options := (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" true "includePaths" (slice "node_modules/myscss")) }} +{{ $options := (dict "targetPath" "style.css" "outputStyle" "compressed" "enableSourceMap" (not hugo.IsProduction) "includePaths" (slice "node_modules/myscss")) }} {{ $style := resources.Get "sass/main.scss" | resources.ToCSS $options }} ``` diff --git a/docs/content/en/showcase/tomango/index.md b/docs/content/en/showcase/tomango/index.md index 5252c02a8..6dc1a5c1f 100644 --- a/docs/content/en/showcase/tomango/index.md +++ b/docs/content/en/showcase/tomango/index.md @@ -10,7 +10,7 @@ siteURL: https://www.tomango.co.uk siteSource: https://github.com/trys/tomango-2018 -byline: "[Trys Mudford](http://www.trysmudford.com), Lead Developer, Tomango" +byline: "[Trys Mudford](https://www.trysmudford.com), Lead Developer, Tomango" --- diff --git a/docs/content/en/templates/data-templates.md b/docs/content/en/templates/data-templates.md index b5a293029..bd1ed6d76 100644 --- a/docs/content/en/templates/data-templates.md +++ b/docs/content/en/templates/data-templates.md @@ -112,7 +112,7 @@ You can use the following code to render the `Short Description` in your layout: <div>Short Description of {{.Site.Data.User0123.Name}}: <p>{{ index .Site.Data.User0123 "Short Description" | markdownify }}</p></div> ``` -Note the use of the [`markdownify` template function][markdownify]. This will send the description through the Blackfriday Markdown rendering engine. +Note the use of the [`markdownify` template function][markdownify]. This will send the description through the Markdown rendering engine. ## Get Remote Data diff --git a/docs/content/en/templates/files.md b/docs/content/en/templates/files.md index a448d7908..c2de11292 100644 --- a/docs/content/en/templates/files.md +++ b/docs/content/en/templates/files.md @@ -43,7 +43,7 @@ To use the `readFile` function in your templates, make sure the path is relative ### `readFile` Example: Add a Project File to Content -As `readFile` is a function, it is only available to you in your templates and not your content. However, we can create a simple [shortcode template][sct] that calls `readFile`, passes the first argument through the function, and then allows an optional second argument to send the file through the Blackfriday markdown processor. The pattern for adding this shortcode to your content will be as follows: +As `readFile` is a function, it is only available to you in your templates and not your content. However, we can create a simple [shortcode template][sct] that calls `readFile`, passes the first argument through the function, and then allows an optional second argument to send the file through the markdown processor. The pattern for adding this shortcode to your content will be as follows: ``` {{</* readfile file="/path/to/local/file.txt" markdown="true" */>}} diff --git a/docs/content/en/troubleshooting/faq.md b/docs/content/en/troubleshooting/faq.md index 548073b3f..67d9a3998 100644 --- a/docs/content/en/troubleshooting/faq.md +++ b/docs/content/en/troubleshooting/faq.md @@ -45,9 +45,9 @@ Also see this Twitter thread: Yes you can! Read [this](/hosting-and-deployment/hosting-on-netlify/#configure-hugo-version-in-netlify). -## I get "TOCSS ... this feature is not available in your current Hugo version" +## I get "... this feature is not available in your current Hugo version" -If you process `SCSS` or `SASS` to `CSS` in your Hugo project, you need the Hugo `extended` version, or else you may see this error message: +If you process `SCSS` or `SASS` to `CSS` in your Hugo project with `libsass` as the transpiler or if you convert images to the `webp` format, you need the Hugo `extended` version, or else you may see an error message similar to the below: ```bash error: failed to transform resource: TOCSS: failed to transform "scss/main.scss" (text/x-scss): this feature is not available in your current Hugo version |