diff options
| author | Nicolas Kuttler <git@kuttler.eu> | 2015-02-13 07:58:58 +0100 |
|---|---|---|
| committer | Nicolas Kuttler <git@kuttler.eu> | 2015-02-13 07:58:58 +0100 |
| commit | dce0822c8f1bbadb47a4db5cabfbe24f5a6c2b14 (patch) | |
| tree | 15f767d4936ef902babb7c7a1c587eb5e7afdca5 | |
| parent | fa8c5be1af98d69fd888416efd1c78e102cdad58 (diff) | |
| parent | 835b254d50d7e598f39c11e67c9b661f7b8ab56d (diff) | |
| download | irssi.github.io-dce0822c8f1bbadb47a4db5cabfbe24f5a6c2b14.zip | |
Merge branch 'urls' into gh-pages
| -rw-r--r-- | _config.yml | 3 | ||||
| -rw-r--r-- | _includes/header.html | 4 | ||||
| -rw-r--r-- | about/index.markdown | 1 | ||||
| -rw-r--r-- | articles/index.markdown | 1 | ||||
| -rw-r--r-- | support/index.markdown | 1 | ||||
| -rw-r--r-- | support/irc/index.markdown | 1 | ||||
| -rw-r--r-- | support/mailinglists/index.markdown | 1 |
7 files changed, 9 insertions, 3 deletions
diff --git a/_config.yml b/_config.yml index 501d809..39e6a7b 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,4 @@ -permalink: "/:year/:month/:day/:title" +permalink: "/:year/:month/:day/:title/" exclude: ["README.markdown"] lsi: false safe: true @@ -18,3 +18,4 @@ paginate_path: "news/:num/" collections: articles: output: true + permalink: "/articles/:title/" diff --git a/_includes/header.html b/_includes/header.html index 61ed5e2..dfe0a4d 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -7,14 +7,14 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="{{ site.baseurl }}"> + <a class="navbar-brand" href="{{ site.baseurl }}/"> <img alt="Irssi Logo" class="navbar-irssi-logo" src="{{ site.baseurl }}/assets/logo.png"> {% comment %}{{ site.title }}{% endcomment %} </a> </div> <div id="navbar" class="collapse navbar-collapse"> <ul class="nav navbar-nav"> - <li{% if page.url == "/index.html" %} class="active"{% endif %}><a href="{{ site.baseurl }}">News</a></li> + <li{% if page.url == "/index.html" %} class="active"{% endif %}><a href="{{ site.baseurl }}/">News</a></li> {% comment %} Exclude the news feed and the paginated news pages. {% endcomment %} diff --git a/about/index.markdown b/about/index.markdown index e04b107..aaff8ae 100644 --- a/about/index.markdown +++ b/about/index.markdown @@ -1,6 +1,7 @@ --- layout: page title: About Irssi +permalink: about/ --- Introduction diff --git a/articles/index.markdown b/articles/index.markdown index 252470f..29f81c3 100644 --- a/articles/index.markdown +++ b/articles/index.markdown @@ -1,6 +1,7 @@ --- layout: default title: Articles +permalink: articles/ --- Articles diff --git a/support/index.markdown b/support/index.markdown index 416f51d..9bae485 100644 --- a/support/index.markdown +++ b/support/index.markdown @@ -1,6 +1,7 @@ --- layout: page title: Support +permalink: support/ --- - [Mailing lists](mailinglists) diff --git a/support/irc/index.markdown b/support/irc/index.markdown index fa6cf93..8769d2d 100644 --- a/support/irc/index.markdown +++ b/support/irc/index.markdown @@ -1,6 +1,7 @@ --- layout: page title: IRC +permalink: support/irc/ --- Official international channels diff --git a/support/mailinglists/index.markdown b/support/mailinglists/index.markdown index 6abbc96..d8fdc89 100644 --- a/support/mailinglists/index.markdown +++ b/support/mailinglists/index.markdown @@ -1,6 +1,7 @@ --- layout: page title: Mailing lists +permalink: support/mailinglists/ --- irssi-users |