Commit Graph

38 Commits

Author SHA1 Message Date
Fabio Niephaus 2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes
Conflicts:
	bin/jekyll
2015-08-09 16:22:33 +01:00
Fabio Niephaus ac56e9dd16 Make _includes directory configurable; closes #2684
and rename `plugins`, `layouts` and `data_source` directories for consistency
2015-08-09 16:20:58 +01:00
chrisfinazzo 5db3b5d709 Use square brackets instead 2015-06-25 17:30:50 -04:00
chrisfinazzo 4dd66e9448 Add missing flag to disable the watcher 2015-06-25 09:54:42 -04:00
Max f6bc58dd30 Docs now reflect correct redcarpet version 2015-05-28 16:56:57 +02:00
Alfred Xing 9ab3c201c8 Remove relative permalinks 2015-04-28 14:03:20 -07:00
Alfred Xing ae039663b9 Remove Maruku and references to it 2015-04-14 10:58:47 -07:00
chrisfinazzo b5a73373ff Wrap lines 2015-03-11 20:17:23 -04:00
Parker Moore 1fa428c6e4 Fix posts per htmlproofer. 2015-02-07 23:31:15 -08:00
chrisfinazzo 8f9d3c9647 Dumb tab-completion is dumb 2015-01-31 23:23:42 -05:00
chrisfinazzo 8da7d1a5bc Grammar, hard-wrap lines at 80 characters 2015-01-31 22:52:46 -05:00
Parker Moore 65d43ef398 Move previous runtime dependencies to development dependencies. 2015-01-31 13:53:17 -08:00
Parker Moore c1da91cf5c Start removing mentions of Textile. 2015-01-17 16:51:28 -08:00
Joseph Anderson a1ea8b9798 Added versioning comment to configuration file
# previously `post` in Jekyll 2.2.
2015-01-16 15:58:21 -08:00
Parker Moore 06b6e86d52 Merge pull request #3292 from flyinprogrammer/eliminate_section_metadata 2015-01-13 13:13:43 -08:00
jaybe@jekyll 7be49c99c1 Update configuration.md
Sync Destination folder cleansing language with Usage docs page (i.e. adding `keep_files` directive).
2015-01-12 16:52:13 -06:00
Alan Scherger c26f040bcf Eliminate the need for prev_section and next_section metadata. 2015-01-11 21:19:14 -08:00
jaybe@jekyll 312717b56d Update configuration.md
Tweak and simplify language re: `keep_files` and `destination` directory.
2015-01-11 18:08:05 -06:00
jaybe@jekyll f228b31c2e Update configuration.md
Clarify ability to retain generated content in `destination` via the `keep_files` configuration directive.
2015-01-11 13:11:29 -06:00
Parker Moore 039c521e8c Update the documentation. 2014-12-26 22:17:07 -05:00
Fonso 922ba5d0ea Fixing the default host on docs 2014-12-23 13:26:08 +01:00
Parker Moore ac7f592839 Merge pull request #3161 from dnozay/patch-3 2014-11-28 21:32:23 -08:00
Damien Nozay ba9a309572 Update configuration.md
`keep_files` is a very useful option when using tools such as `grunt-build-control`, `grunt`, `gulp` or `yeoman`.
2014-11-28 21:09:08 -08:00
Damien Nozay 5a554572e3 Update configuration.md
repeat warning about `destination` that is found in <http://jekyllrb.com/docs/usage/>
(see also pull request #3159)
2014-11-27 15:11:28 -08:00
Matt Rogers df87a51ade Expand the description for the `-q` option. 2014-11-25 08:40:37 -06:00
Ruslan Korolev 2a138e4ca9 jekyll build/serve -q option to docs 2014-11-25 08:21:08 -06:00
Ruslan Korolev 2a83bdccd5 jekyll build/serve -V option to docs 2014-10-04 19:55:22 -07:00
Ruslan Korolev 1a88178fbf jekyll serve --skip-initial-build to docs 2014-09-22 19:16:23 +04:00
Ruslan Korolev 6a06a627f8 jekyll build/serve --force_polling option to docs 2014-09-21 14:52:19 +04:00
Bret Comnes 44506bf376 Removed github-pages warning about singular types now that gh-pages is running 2.3.0 2014-09-13 12:03:25 -07:00
Parker Moore 069805c6f7 Add note about GitHub Pages using Jekyll 2.2.0 and thus singular types for FMD.
Closes #2796.
2014-08-22 15:02:43 -07:00
Parker Moore 60c29561f2 Use plural 'type' in front matter defaults for pages/posts/drafts
Fixes #2657
2014-08-12 11:50:02 -04:00
Pat Hawks b2eae2e676 Use `null` in YAML instead of `nil` 2014-08-10 13:05:23 -07:00
Douglas Anderson d0d8759c10 Removing indentation that was causing some paragraphs to be interpreted as code blocks 2014-08-10 13:51:42 -04:00
Parker Moore 229cedfc50 Reorganize and update default configuration settings. #2456. 2014-08-06 16:01:47 -04:00
kleinfreund 650d78c2cf Fixing anchor references to #front-matter-defaults 2014-08-01 10:54:23 +02:00
kleinfreund 0ed02e9c1e Replacing front-matter/frontmatter with front matter 2014-08-01 10:07:09 +02:00
Parker Moore e57cd0031d Use site.docs instead of site.pages. 2014-07-31 04:34:38 -04:00