jekyll 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e695fdd3b864f67e5922d55041c4a55027f1cd8
-  data.tar.gz: 3ef02a2bd0c86ba96715616ef22d12842e2f8683
+  metadata.gz: 5684903622e5f92d2f68afb075d5748a49b925ca
+  data.tar.gz: de0dc20b4663a52ef365ee00662dde4ada3e56a3
 SHA512:
-  metadata.gz: 17007860ae3438013a112ef79af3ab25eaeaa8eb345e913b8c9ecc75829408989489bfbfef6e82fd675a436ac6e09e8697f93c3af0369e23e8ac57959249d1a9
-  data.tar.gz: 4405b6e57b1ad602b2ae4e3750bb2011b4b209cddc7daa961f2498ad5ddc9767a51a0b826ee7ae2482d0afcd9daff0eb56aebe4e2911ca869062ef2f834a81a8
+  metadata.gz: 31d796e3a2a4cbf892437021da4f5f1a5bac9ad53de19e050751a85494649c94c2c2db984a55c1bdd9e1a4aab6300612202da1f232fa05f4e975f34fcec8c2eb
+  data.tar.gz: db93aa64708dea8c5b3d7f7d825b22f471a0a6c15a67f00560e2308d04c64d7e09b4a99e39914135ed6c5717e1dcb7eda9c37d0d64ff372014e6369dcb4fdc1e

data/History.markdown

@@ -10,6 +10,18 @@
 
 ### Site Enhancements
 
+## v2.0.2 / 2014-05-07
+
+### Bug Fixes
+
+* Correct use of `url` and `baseurl` in the site template. (#2317)
+* Default `baseurl` to `""` (#2317)
+
+### Site Enhancements
+
+* Correct docs for the `gist` plugin so it always includes the username. (#2314)
+* Clarify new (defaults, `where` filter) features in docs (#2316)
+
 ## 2.0.1 / 2014-05-06
 
 ### Bug Fixes
@@ -159,7 +171,7 @@
   * Refactor `Commands::Serve`. (#2269)
   * Refactor `highlight` tag (#2154)
   * Update `Util` hash functions with latest from Rails (#2273)
-  * Workaround for Travis bug (#2290) 
+  * Workaround for Travis bug (#2290)
 
 ### Site Enhancements
   * Document Kramdown's GFM parser option (#1791)

data/lib/jekyll/configuration.rb

@@ -32,7 +32,7 @@ module Jekyll
       'markdown'      => 'kramdown',
       'highlighter'   => 'pygments',
       'permalink'     => 'date',
-      'baseurl'       => '/',
+      'baseurl'       => '',
       'include'       => ['.htaccess'],
       'exclude'       => [],
       'paginate_path' => '/page:num',

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/lib/site_template/_config.yml

@@ -3,7 +3,8 @@ name: Dat site title tho
 title: Your awesome title
 email: your-email@domain.com
 description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
-baseurl: "http://yourdomain.com"
+baseurl: ""
+url: "http://yourdomain.com"
 
 # Build settings
 markdown: kramdown

data/site/docs/configuration.md

@@ -284,7 +284,7 @@ defaults for your custom variables. Of course, any variable actually specified i
 the front matter overrides the defaults.
 
 All defaults go under the `defaults` key, which holds a list of scope-values combinations ("default sets").
-The `scope` key defines for which files the defaults apply, limiting them by their `path` and
+The `scope` key defines for which files the defaults apply, limiting them by their source file `path` and
 optionally by their `type` (`page`, `post` or `draft`). The `values` key holds the actual list of defaults.
 
 For example:

data/site/docs/history.md

@@ -152,7 +152,7 @@ prev_section: contributing
 - Refactor `Commands::Serve`. ([#2269]({{ site.repository }}/issues/2269))
 - Refactor `highlight` tag ([#2154]({{ site.repository }}/issues/2154))
 - Update `Util` hash functions with latest from Rails ([#2273]({{ site.repository }}/issues/2273))
-- Workaround for Travis bug ([#2290]({{ site.repository }}/issues/2290)) 
+- Workaround for Travis bug ([#2290]({{ site.repository }}/issues/2290))
 
 ### Site Enhancements
 - Document Kramdown's GFM parser option ([#1791]({{ site.repository }}/issues/1791))

data/site/docs/templates.md

@@ -82,7 +82,7 @@ common tasks easier.
     <tr>
       <td>
         <p class="name"><strong>Where</strong></p>
-        <p>Select all the object in an array where the key has the given.</p>
+        <p>Select all the objects in an array where the key has the given value.</p>
       </td>
       <td class="align-center">
         <p>
@@ -359,11 +359,11 @@ You can also use this tag to create a link to a post in Markdown as follows:
 
 ### Gist
 
-Use the `gist` tag to easily embed a GitHub Gist onto your site:
+Use the `gist` tag to easily embed a GitHub Gist onto your site. This works with public or secret gists:
 
 {% highlight text %}
 {% raw %}
-{% gist 5555251 %}
+{% gist parkr/931c1c8d465a04042403 %}
 {% endraw %}
 {% endhighlight %}
 
@@ -371,17 +371,6 @@ You may also optionally specify the filename in the gist to display:
 
 {% highlight text %}
 {% raw %}
-{% gist 5555251 result.md %}
+{% gist parkr/931c1c8d465a04042403 jekyll-private-gist.markdown %}
 {% endraw %}
 {% endhighlight %}
-
-The `gist` tag also works with private gists, which require the gist owner's
-github username:
-
-{% highlight text %}
-{% raw %}
-{% gist parkr/931c1c8d465a04042403 %}
-{% endraw %}
-{% endhighlight %}
-
-The private gist syntax also supports filenames.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Tom Preston-Werner