diff --git a/content/about-hugo/hugo-features.md b/content/about-hugo/hugo-features.md index 850b9fb47..f77116b42 100644 --- a/content/about-hugo/hugo-features.md +++ b/content/about-hugo/hugo-features.md @@ -14,12 +14,11 @@ notes: ## General -* Extremely fast build times (<1 ms per page) -* Completely cross platform: Runs on  Mac OS X,  Linux,  Windows, and more! -* Easy [installation](/overview/installing/) -* Render changes [on the fly](/overview/usage/) with [LiveReload](/extras/livereload/) as you develop +* Extremely fast build times (<.7 ms per page) +* Completely cross platform, with easy installation on [Mac OSX][], [Linux][], [Windows][], and more +* Renders changes [on the fly](/overview/usage/) with [LiveReload][] as you develop * [Powerful Theming][] -* Host your site anywhere +* [Host your site anywhere][] ## Organization @@ -27,33 +26,57 @@ notes: * Customizable [URLs](/extras/urls/) * Support for configurable [taxonomies](/taxonomies/overview/) which includes categories and tags. Create your own custom organization of content * Ability to [sort content](/content/ordering/) as you desire - * Automatic [table of contents](/extras/toc/) generation + * Automatic [table of contents][] generation * Dynamic menu creation - * [Pretty URLs](/extras/urls/) support - * [Permalink](/extras/permalinks/) pattern support - * [Aliases](/extras/aliases/) (redirects) + * [Pretty URLs][] support + * [Permalink][] pattern support + * Redirects via [aliases][] ## Content - * Native [Markdown](/content/example/) support - * Support for other languages through _external helpers_, see [supported formats](/content/supported-formats) - * Support for TOML, YAML and JSON metadata in [frontmatter](/content/front-matter/) - * Customizable [homepage](/layout/homepage/) - * Multiple [content types](/content/types/) - * Automatic and user defined [summaries](/content/summaries/) - * [Shortcodes](/extras/shortcodes/) to enable rich content inside of Markdown - * ["Minutes to Read"](/layout/variables/) functionality - * ["Wordcount"](/layout/variables/) functionality + * Native Markdown support, as well as other languages through *external helpers* (see [supported formats][]) + * Support for TOML, YAML and JSON metadata in [front matter][] + * Customizable [homepage][] + * Multiple [content types][] + * Automatic and user defined [content summaries][] + * [Shortcodes][] to enable rich content inside of Markdown + * ["Minutes to Read"][]functionality + * ["Wordcount"][] functionality ## Additional Features - * Integrated [Disqus](https://disqus.com/) comment support - * Integrated [Google Analytics](https://google-analytics.com/) support - * Automatic [RSS](/layout/rss/) creation - * Support for [Go](http://golang.org/pkg/html/template/), [Amber](https://github.com/eknkc/amber) and [Ace](https://github.com/yosssi/ace) HTML templates - * Syntax [highlighting](/extras/highlighting/) powered by [Pygments](http://pygments.org/) + * Integrated [Disqus][] comment support + * Integrated [Google Analytics][] support + * Automatic [RSS][] creation + * Support for [Golang][], [Amber] and [Ace][] HTML templates + * [Syntax highlighting][] powered by [Pygments][] See what's coming next in the [Hugo roadmap][]. +["Minutes to Read"]: /variables-and-params/ +["Wordcount"]: /variables-and-params/ +[Ace]: https://github.com/yosssi/ace +[aliases]: /content-management/url-management/#aliases +[Amber]: https://github.com/eknkc/amber +[content summaries]: /content-management/content-summaries/ +[content types]: /content-management/content-types/ +[Disqus]: https://disqus.com/ +[front matter]: /content-management/front-matter/ +[Golang]: http://golang.org/pkg/html/template/ +[Google Analytics]: https://google-analytics.com/ +[homepage]: /templates/homepage-template/ +[Host your site anywhere]: /hosting-and-deployment/ +[Hugo roadmap]: /about-hugo/roadmap +[Linux]: /getting-started/install-on-mac/ +[LiveReload]: /getting-started/using-hugo/ +[Mac OSX]: /getting-started/install-of-pc/ +[Permalinks]: /content-management/url-management/#permalinks +[Pretty URLs]: /content-management/url-management/ [Powerful Theming]: /themes/ -[Hugo roadmap]: /about-hugo/roadmap \ No newline at end of file +[Pygments]: http://pygments.org/ +[RSS]: /templates/rss-templates/ +[Shortcodes]: /templates/shortcodes/ +[supported formats]: /content-management/markdown-and-supported-formats/ +[Syntax highlighting]: /developer-tools/syntax-highlighting/ +[table of contents]: /content-management/table-of-contents/ +[Windows]: /getting-started/install-on-linux/ \ No newline at end of file diff --git a/content/content-management/archetypes.md b/content/content-management/archetypes.md index 43a0106bc..f27689a87 100644 --- a/content/content-management/archetypes.md +++ b/content/content-management/archetypes.md @@ -14,7 +14,7 @@ aliases: [] notes: --- -**Archetypes** are content (i.e., `.md`) files in the [`archetypes` directory][] of your project that contain pre-configured [front matter][] for your site's [content types][]. Archetypes facilitate consistent metadata in your website's content and allow content authors to quickly generate instances of a content type via the `hugo new` command. +**Archetypes** are content `.md` files in the [archetypes directory][] of your project that contain pre-configured [front matter][] for your site's [content types][]. Archetypes facilitate consistent metadata in your website's content and allow content authors to quickly generate instances of a content type via the `hugo new` command. Hugo's generator assumes your working directory is the content folder at the root of your project. Hugo is able to infer the appropriate archetype by assuming the content type from the content section passed to the CLI command: @@ -163,7 +163,7 @@ title = post from custom ``` {{% /output %}} -[`archetypes` directory]: /project-organization/directory-structure/ +[archetypes directory]: /project-organization/directory-structure/ [`now()`]: http://golang.org/pkg/time/#Now [configuration file]: /project-organization/configuration/ [content sections]: /content-sections/ diff --git a/content/content-management/content-summaries.md b/content/content-management/content-summaries.md index 28f1f4a23..bc46d5525 100644 --- a/content/content-management/content-summaries.md +++ b/content/content-management/content-summaries.md @@ -10,6 +10,6 @@ categories: [] weight: 70 draft: false slug: -aliases: [] +aliases: [/content/summaries/] notes: --- \ No newline at end of file diff --git a/content/content-management/front-matter.md b/content/content-management/front-matter.md index 0b3fca5d6..1a05fd532 100644 --- a/content/content-management/front-matter.md +++ b/content/content-management/front-matter.md @@ -10,7 +10,7 @@ tags: [front matter, yaml, toml, json, metadata, archetypes] weight: 20 draft: false slug: -aliases: [] +aliases: [/content/front-matter/] notes: --- diff --git a/content/content-management/markdown-and-supported-formats.md b/content/content-management/markdown-and-supported-formats.md index 5e1e7dc38..852decc21 100644 --- a/content/content-management/markdown-and-supported-formats.md +++ b/content/content-management/markdown-and-supported-formats.md @@ -1,7 +1,7 @@ --- title: Markdown and Supported Formats linktitle: -description: Hugo uses the BlackFriday markdown converted for content files but also provides support for additional syntaxes (eg, Asciidoc) via external helpers. +description: Hugo uses the BlackFriday markdown parser for content files but also provides support for additional syntaxes (eg, Asciidoc) via external helpers. date: 2017-01-10 publishdate: 2017-01-10 lastmod: 2017-01-10 @@ -9,7 +9,7 @@ tags: [markdown,asciidoc,mmark,content format] weight: 10 draft: false slug: -aliases: [/content/markdown-extras/,/content/supported-formats/] +aliases: [/content/markdown-extras/,/content/supported-formats/,/content/markdown/] notes: --- @@ -23,6 +23,8 @@ Hugo uses [BlackFriday](https://github.com/russross/blackfriday), a markdown pro ## Additional Resources + + * [Markdown Tutorial][] [BlackFriday project]: https://github.com/russross/blackfriday diff --git a/content/content-management/permalinks-and-redirects.md b/content/content-management/permalinks-and-redirects.md deleted file mode 100644 index 10e082781..000000000 --- a/content/content-management/permalinks-and-redirects.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Permalinks and Redirects -linktitle: Permalinks and Redirects -description: -date: 2017-02-01 -publishdate: 2017-02-01 -lastmod: 2017-02-01 -tags: [aliases,redirects,permalinks, url management,urls] -categories: [content management] -weight: 90 -draft: false -slug: -aliases: [] -notes: ---- \ No newline at end of file diff --git a/content/content-management/table-of-contents.md b/content/content-management/table-of-contents.md index 5ce47c306..04b33d53c 100644 --- a/content/content-management/table-of-contents.md +++ b/content/content-management/table-of-contents.md @@ -10,6 +10,6 @@ categories: [] weight: 100 draft: false slug: -aliases: [] +aliases: [/extras/toc/] notes: --- \ No newline at end of file diff --git a/content/content-management/url-management.md b/content/content-management/url-management.md new file mode 100644 index 000000000..c86eaa4a1 --- /dev/null +++ b/content/content-management/url-management.md @@ -0,0 +1,25 @@ +--- +title: URL Management +linktitle: URL Management +description: +date: 2017-02-01 +publishdate: 2017-02-01 +lastmod: 2017-02-01 +tags: [aliases,redirects,permalinks, url management,urls] +categories: [content management] +weight: 90 +draft: false +slug: +aliases: [/extras/permalinks/,/extras/aliases/,/content-management/permalinks-and-redirects/,/extras/urls/] +notes: +--- + +## URLs + +## Permalinks + +## Redirects/Aliases + +## Canonicalization + +## Relative URLs \ No newline at end of file diff --git a/content/content-management/syntax-highlighting.md b/content/developer-tools/syntax-highlighting.md similarity index 100% rename from content/content-management/syntax-highlighting.md rename to content/developer-tools/syntax-highlighting.md diff --git a/content/getting-started/using-hugo.md b/content/getting-started/using-hugo.md new file mode 100644 index 000000000..8c861941b --- /dev/null +++ b/content/getting-started/using-hugo.md @@ -0,0 +1,15 @@ +--- +title: Using Hugo +linktitle: Using Hugo +description: +date: 2017-02-01 +publishdate: 2017-02-01 +lastmod: 2017-02-01 +weight: +draft: false +slug: +aliases: [/overview/usage/,/extras/livereload/] +notes: +--- + +## LiveReload \ No newline at end of file diff --git a/content/templates/homepage-template.md b/content/templates/homepage-template.md index 1822b565e..51467836f 100644 --- a/content/templates/homepage-template.md +++ b/content/templates/homepage-template.md @@ -9,6 +9,6 @@ weight: tags: [] draft: false slug: -aliases: +aliases: [/layout/homepage/,/templates/homepage/] notes: --- \ No newline at end of file diff --git a/content/templates/rss-templates.md b/content/templates/rss-templates.md new file mode 100644 index 000000000..8332a98ed --- /dev/null +++ b/content/templates/rss-templates.md @@ -0,0 +1,14 @@ +--- +title: RSS Templates +linktitle: RSS Templates +description: +date: 2017-02-01 +publishdate: 2017-02-01 +lastmod: 2017-02-01 +weight: +tags: [] +draft: false +slug: +aliases: [/templates/rss/] +notes: +--- \ No newline at end of file diff --git a/data/sitenavigation.yml b/data/sitenavigation.yml index 72b0aaa6d..6a7680b51 100644 --- a/data/sitenavigation.yml +++ b/data/sitenavigation.yml @@ -61,13 +61,13 @@ hostinganddeployment: haschildren: true sortsubpagesby: "weight" desc: "Site builds, automated deployments, and popular hosting solutions" -migratingtohugo: - order: 10 - title: "Migrating to Hugo" - url: "migrating-to-hugo" - haschildren: true - sortsubpagesby: "weight" - desc: "Tools for migrating to Hugo from other platforms or generators (eg, Wordpress or Jekyll)" +# migratingtohugo: +# order: 10 +# title: "Migrating to Hugo" +# url: "migrating-to-hugo" +# haschildren: true +# sortsubpagesby: "weight" +# desc: "Tools for migrating to Hugo from other platforms or generators (eg, Wordpress or Jekyll)" tutorials: order: 11 title: "Tutorials" @@ -81,7 +81,7 @@ developertools: url: "developer-tools" haschildren: true sortsubpagesby: "weight" - desc: "Command line reference, flags, syntax highlighting" + desc: "Command line reference, flags, and migration tools" troubleshooting: order: 13 title: "Troubleshooting" diff --git a/themes/hugodocs/layouts/partials/site-navigation.html b/themes/hugodocs/layouts/partials/site-navigation.html index 8f8304725..0adfddff9 100644 --- a/themes/hugodocs/layouts/partials/site-navigation.html +++ b/themes/hugodocs/layouts/partials/site-navigation.html @@ -13,7 +13,7 @@ {{range $item, $params := sort ($.Site.Data.sitenavigation) "order"}} {{$section := $params.url}}
  • {{$params.title}} - {{if $params.haschildren}} + {{if $params.haschildren}}»