From cc633543675758a02bb770843fc057707d66d0b3 Mon Sep 17 00:00:00 2001 From: Samuel Wright Date: Mon, 21 Dec 2015 11:56:13 +0700 Subject: [PATCH 1/2] Adding markdown examples to Pages Fix for #3824 --- site/_docs/pages.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/site/_docs/pages.md b/site/_docs/pages.md index fa76a9fb..3bb4af11 100644 --- a/site/_docs/pages.md +++ b/site/_docs/pages.md @@ -27,12 +27,14 @@ homepage of your Jekyll-generated site. ## Where additional pages live -Where you put HTML files for pages depends on how you want the pages to work. +Where you put HTML or [Markdown](http://daringfireball.net/projects/markdown/) +files for pages depends on how you want the pages to work. There are two main ways of creating pages: -- Place named HTML files for each page in your site's root folder. +- Place named HTML or [Markdown](http://daringfireball.net/projects/markdown/) +files for each page in your site's root folder. - Create a folder in the site's root for each page, and place an index.html -file in each page folder. +or index.md file in each page folder. Both methods work fine (and can be used in conjunction with each other), with the only real difference being the resulting URLs. @@ -53,6 +55,7 @@ and associated URLs might look like: |-- _site/ |-- about.html # => http://example.com/about.html |-- index.html # => http://example.com/ +|-- other.md # => http://example.com/other.html └── contact.html # => http://example.com/contact.html {% endhighlight %} @@ -77,6 +80,8 @@ might look like: | └── index.html # => http://example.com/about/ ├── contact/ | └── index.html # => http://example.com/contact/ +|── other/ +| └── index.md # => http://example.com/other.html └── index.html # => http://example.com/ {% endhighlight %} From b9721024be69150312dfe7bdbced1553009090d5 Mon Sep 17 00:00:00 2001 From: Samuel Wright Date: Tue, 22 Dec 2015 11:33:25 +0700 Subject: [PATCH 2/2] URL fix up --- site/_docs/pages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/_docs/pages.md b/site/_docs/pages.md index 3bb4af11..2299c83c 100644 --- a/site/_docs/pages.md +++ b/site/_docs/pages.md @@ -81,7 +81,7 @@ might look like: ├── contact/ | └── index.html # => http://example.com/contact/ |── other/ -| └── index.md # => http://example.com/other.html +| └── index.md # => http://example.com/other/ └── index.html # => http://example.com/ {% endhighlight %}