Commit Graph

40 Commits

Author SHA1 Message Date
Parker Moore 6bd07501e8 Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
  move self.type to convertible
  oops, fix minor indentation quirk
  document frontmatter defaults precedence
  adjust frontmatter defaults precedence handling
  change cucumber feature to test for precedence too
  fix frontmatter defaults for custom paths
  more robust cucumber features
  fix slash handling for paths
  move cucumber features to own file
  fix minor docs quirk
  improve path checking, now using Pathname instead of regex
  Add site documentation for the new feature
  add inline code docs
  improve validation code
  fix for Ruby 1.8
  Add basic cucumber features for frontmatter defaults
  Retrieve frontmatter defaults when retrieved internally
  make frontmatter defaults available to liquid
  add a class `FrontmatterDefaults` for handling of frontmatter defaults
  Add a method to retrieve type to post, page and draft

Conflicts:
	lib/jekyll.rb
	lib/jekyll/convertible.rb
	lib/jekyll/core_ext.rb
	lib/jekyll/page.rb
	lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
Parker Moore d579840870 Merge pull request #1824 from lachy-xe/master 2014-04-02 14:08:21 -04:00
XhmikosR dcb8192c29 Use double quotes consistently. 2014-03-24 00:31:07 +02:00
Ben Hildred a9adb22fed better document safe mode 2014-03-21 08:42:19 -06:00
Parker Moore 6973a33519 Merge pull request #2102 from ZDroid/mkdown 2014-02-27 08:33:50 -05:00
Zlatan Vasović 495ba2510b Update configuration docs for MD extensions
Per `.mkdown` extension addition in my older pull request.
2014-02-27 13:42:55 +01:00
Parker Moore 768a47dcfb Be a bit more vague about when features are available in pre-releases. 2014-02-19 23:18:59 -05:00
Parker Moore b051936ff4 Add "unreleased" note to /docs/configuration about kramdown as the new default 2014-02-19 23:18:59 -05:00
Parker Moore 407b9b577b Update configuration docs to indicate that utf-8 is now the default
Docs for #2031, /cc #2029.
2014-02-19 11:14:09 -05:00
Francis b0b8bebe6c [configuration.md] Correct typo
Typo: 'use'
Proposed Correction: 'uses the'
---
In English, 'use' is the verb form for plural subjects, where as 'uses' is the verb form for a singular subject. For this case, the subject, 'default value', is singular.
2014-02-19 12:22:46 +01:00
Parker Moore 22f2001ff5 Set default markdown converter to Kramdown
- Update default markdown converter in docs for configuration
- Update tests so they are in line with Kramdown output
- Add deprecation message to when config is built
2014-02-08 13:17:46 -05:00
Parker Moore 2966606b1a Add docs about the 'new' restriction on excludes. 2014-01-13 00:17:12 -08:00
Matt Rogers f3e9eb92a9 Update the documentation for the new exclude behavior 2014-01-11 15:05:45 -06:00
George Anderson cb80a849e4 Added paginate default to nil
I found this missing property in the default configuration description.
2013-12-31 14:41:06 -02:00
Matt Rogers 012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Robin Dupret 0831d2b0f8 Add support for the Rouge syntax highlighter
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.

The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
Parker Moore 1ebce26881 Default Maruku fenced_code_blocks to ON.
Extends https://github.com/jekyll/jekyll/pull/1799
2013-12-15 16:08:21 -05:00
Lachlan Holden 62bda6076b Added a link to the list of all tz database time zones 2013-12-14 15:04:31 +10:30
Eric Mill caefd7b85f move input GFM option down to the bottom, not in the defaults 2013-12-08 22:59:15 -05:00
Eric Mill 3fe261f91c Mention the 'input' option to use a GFM parser in the kramdown options documentation. 2013-12-08 20:13:52 -05:00
maul.esel f1869cda98 Merge branch 'master' into frontmatter-defaults 2013-12-05 19:29:57 +01:00
Parker Moore 811b14412f Add docs for new 'gems' option. 2013-10-23 10:48:23 -04:00
maul.esel 96a37ac1ab document frontmatter defaults precedence 2013-10-15 14:25:47 +02:00
maul.esel 20ea0c8d56 Merge branch 'master' into frontmatter-defaults 2013-10-14 19:44:06 +02:00
Shigeya Suzuki a93b1a26eb Documentation update for the encoding configuration 2013-09-19 12:22:50 +09:00
MURAOKA Taro f4c2383d3c write document for config.encoding 2013-09-19 12:21:25 +09:00
maul.esel 1cb67932f6 fix minor docs quirk 2013-09-16 15:46:15 +02:00
maul.esel 8060cb60a2 Add site documentation for the new feature 2013-09-11 18:39:59 +02:00
Michael Parker cccfe1be78 Clarify that --config flag can take multiple files 2013-08-29 16:27:47 -07:00
Matt Rogers 4fa4ad2232 Merge pull request #1443 from ddavison/detachment
Detachment
2013-08-24 20:16:42 -07:00
ddavison aedac6060b adding new -B flag for -background- 2013-08-23 01:19:41 -04:00
Anatol Broder aadf992616 Add code tags 2013-08-22 08:32:56 +02:00
ddavison 8efcca9ddc adding documentation on using detach 2013-08-21 21:10:42 +00:00
Nick Fagerlund 6f22c83249 Docs: Explain what goes into the redcarpet: extensions: array
- Document the two secret-sauce extensions that Jekyll adds, which don't seem to
  be mentioned elsewhere.
- Link to the Redcarpet documentation for other extensions.
- Mention the three or so most common extensions.
- Mention that Redcarpet 2.2.2 lacks several extensions that were added later.
2013-08-13 13:50:56 -07:00
Anatol Broder d7b5c40901 Correct internal links 2013-08-11 15:09:23 +02:00
Parker Moore 3af0e2ea4c bugs in the site 2013-08-06 18:08:58 +02:00
zachgersh b0fbfdb87d Added a configuration warning to our docs for the two kramdown options we don't support. 2013-07-14 00:32:48 -05:00
Parker Moore 61faef46cc Add documentation about relative_permalinks. #1081 2013-05-12 14:07:30 +02:00
Parker Moore 628f8280d0 Merge benbalter:docs-pages #985 2013-05-10 22:11:36 +02:00
Benjamin J. Balter e1f04968e8 Use pages for documentation, not posts, fixes #980. 2013-04-18 10:10:59 -04:00