tigefa 1.1.2 → 1.1.3

data/site/docs/installation.md

@@ -46,16 +46,6 @@ installing Jekyll, check out the [troubleshooting](../troubleshooting/) page or
 [report an issue]({{ site.repository }}/issues/new) so the Jekyll
 community can improve the experience for everyone.
 
-<div class="note info">
-  <h5>Installing Xcode Command-Line Tools</h5>
-  <p>
-    If you run into issues installing Jekyll's dependencies which make use of
-    native extensions and are using Mac OS X, you will need to install Xcode
-    and the Command-Line Tools it ships with. Download in
-    <code>Preferences &#8594; Downloads &#8594; Components</code>.
-  </p>
-</div>
-
 ## Optional Extras
 
 There are a number of (optional) extra features that Jekyll supports that you

data/site/docs/migrations.md

@@ -1,11 +1,248 @@
 ---
 layout: docs
 title: Blog migrations
-prev_section: datafiles
+prev_section: variables
 next_section: templates
 permalink: /docs/migrations/
 ---
 
 If you’re switching to Jekyll from another blogging system, Jekyll’s importers
-can help you with the move. To learn more about importing your site to Jekyll,
-visit our [`jekyll-import` docs site](http://import.jekyllrb.com).
+can help you with the move. Most methods listed on this page require read access
+to the database from your old system to generate posts for Jekyll. Each method
+generates `.markdown` posts in the `_posts` directory based on the entries in
+the foreign system.
+
+## Preparing for migrations
+
+Because the importers have many of their own dependencies, they are made
+available via a separate gem called
+[`jekyll-import`](https://github.com/jekyll/jekyll-import). To use them, all
+you need to do is install the gem, and they will become available as part of
+Jekyll's standard command line interface.
+
+{% highlight bash %}
+$ gem install jekyll-import --pre
+{% endhighlight %}
+
+You should now be all set to run the importers below. If you ever get stuck, you
+can see help for each importer:
+
+{% highlight bash %}
+$ jekyll help import           # => See list of importers
+$ jekyll help import IMPORTER  # => See importer specific help
+{% endhighlight %}
+
+Where IMPORTER is the name of the specific importer.
+
+<div class="note info">
+  <h5>Note: Always double-check migrated content</h5>
+  <p>
+
+    Importers may not distinguish between published or private posts, so
+    you should always check that the content Jekyll generates for you appears as
+    you intended.
+
+  </p>
+</div>
+
+<!-- TODO all these need to be fixed -->
+
+## WordPress
+
+### WordPress export files
+
+If hpricot is not already installed, you will need to run `gem install hpricot`.
+Next, export your blog using the WordPress export utility. Assuming that the
+exported file is saved as `wordpress.xml`, here is the command you need to run:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpressdotcom";
+    JekyllImport::WordpressDotCom.process({ :source => "wordpress.xml" })'
+{% endhighlight %}
+
+<div class="note">
+  <h5>ProTip™: WordPress.com Export Tool</h5>
+  <p markdown="1">If you are migrating from a WordPress.com account, you can
+  access the export tool at the following URL:
+  `https://YOUR-USER-NAME.wordpress.com/wp-admin/export.php`.</p>
+</div>
+
+### Using WordPress MySQL server connection
+
+If you want to import using a direct connection to the WordPress MySQL server,
+here's how:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
+    JekyllImport::WordPress.process({:database => "database", :user => "user", :pass => "pass"})'
+{% endhighlight %}
+
+If you are using Webfaction and have to set up an [SSH
+tunnel](http://docs.webfaction.com/user-guide/databases.html?highlight=mysql#starting-an-ssh-tunnel-with-ssh),
+be sure to make the hostname (`127.0.0.1`) explicit, otherwise MySQL may block
+your access based on `localhost` and `127.0.0.1` not being equivalent in its
+authentication system:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
+    JekyllImport::WordPress.process("database", "user", "pass", "127.0.0.1")'
+{% endhighlight %}
+
+### Further WordPress migration alternatives
+
+While the above methods work, they do not import much of the metadata that is
+usually stored in WordPress posts and pages. If you need to export things like
+pages, tags, custom fields, image attachments and so on, the following resources
+might be useful to you:
+
+- [Exitwp](https://github.com/thomasf/exitwp) is a configurable tool written in
+  Python for migrating one or more WordPress blogs into Jekyll (Markdown) format
+  while keeping as much metadata as possible. Exitwp also downloads attachments
+  and pages.
+- [A great
+  article](http://vitobotta.com/how-to-migrate-from-wordpress-to-jekyll/) with a
+  step-by-step guide for migrating a WordPress blog to Jekyll while keeping most
+  of the structure and metadata.
+- [wpXml2Jekyll](https://github.com/theaob/wpXml2Jekyll) is an executable
+  windows application for creating Markdown posts from your WordPress XML file.
+
+## Drupal
+
+If you’re migrating from [Drupal](http://drupal.org), there are two migrators
+for you, depending upon your Drupal version:
+- [Drupal 6](https://github.com/jekyll/jekyll-import/blob/v0.1.0.beta1/lib/jekyll/jekyll-import/drupal6.rb)
+- [Drupal 7](https://github.com/jekyll/jekyll-import/blob/v0.1.0.beta1/lib/jekyll/jekyll-import/drupal7.rb)
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
+    JekyllImport::Drupal6.process("dbname", "user", "pass")'
+# ... or ...
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
+    JekyllImport::Drupal7.process("dbname", "user", "pass")'
+{% endhighlight %}
+
+If you are connecting to a different host or need to specify a table prefix for
+your database, you may optionally add those two parameters to the end of either
+Drupal migrator execution:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
+    JekyllImport::Drupal6.process("dbname", "user", "pass", "host", "table_prefix")'
+# ... or ...
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
+    JekyllImport::Drupal7.process("dbname", "user", "pass", "host", "table_prefix")'
+{% endhighlight %}
+
+## Movable Type
+
+To import posts from Movable Type:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/mt";
+    JekyllImport::MT.process("database", "user", "pass")'
+{% endhighlight %}
+
+## Typo
+
+To import posts from Typo:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/typo";
+    JekyllImport::Typo.process("database", "user", "pass")'
+{% endhighlight %}
+
+This code has only been tested with Typo version 4+.
+
+## TextPattern
+
+To import posts from TextPattern:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/textpattern";
+    JekyllImport::TextPattern.process("database_name", "username", "password", "hostname")'
+{% endhighlight %}
+
+You will need to run the above from the parent directory of your `_import`
+folder. For example, if `_import` is located in `/path/source/_import`, you will
+need to run this code from `/path/source`. The hostname defaults to `localhost`,
+all other variables are required. You may need to adjust the code used to filter
+entries. Left alone, it will attempt to pull all entries that are live or
+sticky.
+
+## Mephisto
+
+To import posts from Mephisto:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/mephisto";
+    JekyllImport::Mephisto.process("database", "user", "password")'
+{% endhighlight %}
+
+If your data is in Postgres, you should do this instead:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/mephisto";
+    JekyllImport::Mephisto.postgres({:database => "database", :username=>"username", :password =>"password"})'
+{% endhighlight %}
+
+## Blogger (Blogspot)
+
+To import posts from Blogger, see [this post about migrating from Blogger to
+Jekyll](http://blog.coolaj86.com/articles/migrate-from-blogger-to-jekyll.html). If
+that doesn’t work for you, you might want to try some of the following
+alternatives:
+
+- [@kennym](https://github.com/kennym) created a [little migration
+  script](https://gist.github.com/1115810), because the solutions in the
+  previous article didn't work out for him.
+- [@ngauthier](https://github.com/ngauthier) created [another
+  importer](https://gist.github.com/1506614) that imports comments, and does so
+  via blogger’s archive instead of the RSS feed.
+- [@juniorz](https://github.com/juniorz) created [yet another
+  importer](https://gist.github.com/1564581) that works for
+  [Octopress](http://octopress.org). It is like [@ngauthier’s
+  version](https://gist.github.com/1506614) but separates drafts from posts, as
+  well as importing tags and permalinks.
+
+## Posterous
+
+To import posts from your primary Posterous blog:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/posterous";
+    JekyllImport::Posterous.process("my_email", "my_pass")'
+{% endhighlight %}
+
+For any other Posterous blog on your account, you will need to specify the
+`blog_id` for the blog:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/posterous";
+    JekyllImport::Posterous.process("my_email", "my_pass", "blog_id")'
+{% endhighlight %}
+
+There is also an [alternative Posterous
+migrator](https://github.com/pepijndevos/jekyll/blob/patch-1/lib/jekyll/migrators/posterous.rb)
+that maintains permalinks and attempts to import images too.
+
+## Tumblr
+
+To import posts from Tumblr:
+
+{% highlight bash %}
+$ ruby -rubygems -e 'require "jekyll/jekyll-import/tumblr";
+    JekyllImport::Tumblr.process(url, format, grab_images, add_highlights, rewrite_urls)'
+# url    - String: your blog's URL
+# format - String: the output file extension. Use "md" to have your content
+#          converted from HTML to Markdown. Defaults to "html".
+# grab_images    - Boolean: whether to download images as well. Defaults to false.
+# add_highlights - Boolean: whether to wrap code blocks (indented 4 spaces) in a Liquid
+                   "highlight" tag. Defaults to false.
+# rewrite_urls   - Boolean: whether to write pages that redirect from the old Tumblr paths
+                   to the new Jekyll paths. Defaults to false.
+{% endhighlight %}
+
+## Other Systems
+
+If you have a system for which there is currently no migrator, consider writing
+one and sending us [a pull request](https://github.com/jekyll/jekyll-import).

data/site/docs/pages.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Creating pages
-prev_section: drafts
+prev_section: posts
 next_section: variables
 permalink: /docs/pages/
 ---
@@ -53,9 +53,9 @@ and associated URLs might look like:
 |-- _layouts/
 |-- _posts/
 |-- _site/
-|-- about.html    # => http://example.com/about.html
-|-- index.html    # => http://example.com/
-└── contact.html  # => http://example.com/contact.html
+|-- about.html    # => http://yoursite.com/about.html
+|-- index.html    # => http://yoursite.com/
+└── contact.html  # => http://yoursite.com/contact.html
 {% endhighlight %}
 
 ### Named folders containing index HTML files
@@ -76,10 +76,10 @@ look like:
 ├── _posts/
 ├── _site/
 ├── about/
-|   └── index.html  # => http://example.com/about/
+|   └── index.html  # => http://yoursite.com/about/
 ├── contact/
-|   └── index.html  # => http://example.com/contact/
-└── index.html      # => http://example.com/
+|   └── index.html  # => http://yoursite.com/contact/
+└── index.html      # => http://yoursite.com/
 {% endhighlight %}
 
 This approach may not suit everyone, but for people who like clean URLs it’s

data/site/docs/pagination.md

@@ -182,30 +182,51 @@ page with links to all but the current page.
 
 {% highlight html %}
 {% raw %}
-{% if paginator.total_pages > 1 %}
-<div class="pagination">
+<div id="post-pagination" class="pagination">
   {% if paginator.previous_page %}
-    <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}">&laquo; Prev</a>
+    <p class="previous">
+      {% if paginator.previous_page == 1 %}
+        <a href="/">Previous</a>
+      {% else %}
+        <a href="{{ paginator.previous_page_path }}">Previous</a>
+      {% endif %}
+    </p>
   {% else %}
-    <span>&laquo; Prev</span>
+    <p class="previous disabled">
+      <span>Previous</span>
+    </p>
   {% endif %}
 
-  {% for page in (1..paginator.total_pages) %}
-    {% if page == paginator.page %}
-      <em>{{ page }}</em>
-    {% elsif page == 1 %}
-      <a href="{{ '/index.html' | prepend: site.baseurl | replace: '//', '/' }}">{{ page }}</a>
-    {% else %}
-      <a href="{{ site.paginate_path | prepend: site.baseurl | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
-    {% endif %}
-  {% endfor %}
+  <ul class="pages">
+    <li class="page">
+      {% if paginator.page == 1 %}
+        <span class="current-page">1</span>
+      {% else %}
+        <a href="/">1</a>
+      {% endif %}
+    </li>
+
+    {% for count in (2..paginator.total_pages) %}
+      <li class="page">
+        {% if count == paginator.page %}
+          <span class="current-page">{{ count }}</span>
+        {% else %}
+          <a href="/page{{ count }}">{{ count }}</a>
+        {% endif %}
+      </li>
+    {% endfor %}
+  </ul>
 
   {% if paginator.next_page %}
-    <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}">Next &raquo;</a>
+    <p class="next">
+      <a href="{{ paginator.next_page_path }}">Next</a>
+    </p>
   {% else %}
-    <span>Next &raquo;</span>
+    <p class="next disabled">
+      <span>Next</span>
+    </p>
   {% endif %}
+
 </div>
-{% endif %}
 {% endraw %}
 {% endhighlight %}

data/site/docs/plugins.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Plugins
-prev_section: pagination
+prev_section: assets
 next_section: extras
 permalink: /docs/plugins/
 ---
@@ -25,27 +25,9 @@ having to modify the Jekyll source itself.
 
 ## Installing a plugin
 
-You have 2 options for installing plugins:
-
-1. In your site source root, make a `_plugins` directory. Place your plugins here.
-    Any file ending in `*.rb` inside this directory will be loaded before Jekyll
-    generates your site.
-2. In your `_config.yml` file, add a new array with the key `gems` and the values
-    of the gem names of the plugins you'd like to use. An example:
-
-        gems: [jekyll-test-plugin, jekyll-jsonify, jekyll-assets]
-        # This will require each of these gems automatically.
-
-<div class="note info">
-  <h5>
-    <code>_plugins</code> and <code>gems</code>
-    can be used simultaneously
-  </h5>
-  <p>
-    You may use both of the aforementioned plugin options simultaneously in the
-    same site if you so choose. Use of one does not restrict the use of the other
-  </p>
-</div>
+In your site source root, make a `_plugins` directory. Place your plugins here.
+Any file ending in `*.rb` inside this directory will be loaded before Jekyll
+generates your site.
 
 In general, plugins you make will fall into one of three categories:
 
@@ -56,45 +38,7 @@ In general, plugins you make will fall into one of three categories:
 ## Generators
 
 You can create a generator when you need Jekyll to create additional content
-based on your own rules.
-
-A generator is a subclass of `Jekyll::Generator` that defines a `generate`
-method, which receives an instance of
-[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb).
-
-Generation is triggered for its side-effects, the return value of `generate` is
-ignored. Jekyll does not assume any particular side-effect to happen, it just
-runs the method.
-
-Generators run after Jekyll has made an inventory of the existing content, and
-before the site is generated. Pages with YAML front-matters are stored as
-instances of
-[`Jekyll::Page`]({{ site.repository }}/blob/master/lib/jekyll/page.rb)
-and are available via `site.pages`. Static files become instances of
-[`Jekyll::StaticFile`]({{ site.repository }}/blob/master/lib/jekyll/static_file.rb)
-and are available via `site.static_files`. See
-[`Jekyll::Site`]({{ site.repository }}/blob/master/lib/jekyll/site.rb)
-for more details.
-
-For instance, a generator can inject values computed at build time for template
-variables. In the following example the template `reading.html` has two
-variables `ongoing` and `done` that we fill in the generator:
-
-{% highlight ruby %}
-module Reading
-  class Generator < Jekyll::Generator
-    def generate(site)
-      ongoing, done = Book.all.partition(&:ongoing?)
-
-      reading = site.pages.detect {|page| page.name == 'reading.html'}
-      reading.data['ongoing'] = ongoing
-      reading.data['done'] = done
-    end
-  end
-end
-{% endhighlight %}
-
-This is a more complex generator that generates new pages:
+based on your own rules. For example, a generator might look like this:
 
 {% highlight ruby %}
 module Jekyll
@@ -151,7 +95,7 @@ Generators are only required to implement one method:
         <p><code>generate</code></p>
       </td>
       <td>
-        <p>Generates content as a side-effect.</p>
+        <p>String output of the content being generated.</p>
       </td>
     </tr>
   </tbody>
@@ -412,16 +356,13 @@ You can find a few useful plugins at the following locations:
 
 - [ArchiveGenerator by Ilkka Laukkanen](https://gist.github.com/707909): Uses [this archive page](https://gist.github.com/707020) to generate archives.
 - [LESS.js Generator by Andy Fowler](https://gist.github.com/642739): Renders LESS.js files during generation.
-- [Version Reporter by Blake Smith](https://gist.github.com/449491): Creates a version.html file containing the Jekyll version.
+- [Version Reporter by Blake Smith](https://gist.github.com/449491): Creates a version.html file containing the Jekyll version. 
 - [Sitemap.xml Generator by Michael Levin](https://github.com/kinnetica/jekyll-plugins): Generates a sitemap.xml file by traversing all of the available posts and pages.
 - [Full-text search by Pascal Widdershoven](https://github.com/PascalW/jekyll_indextank): Adds full-text search to your Jekyll site with a plugin and a bit of JavaScript.
 - [AliasGenerator by Thomas Mango](https://github.com/tsmango/jekyll_alias_generator): Generates redirect pages for posts when an alias is specified in the YAML Front Matter.
 - [Pageless Redirect Generator by Nick Quinlan](https://github.com/nquinlan/jekyll-pageless-redirects): Generates redirects based on files in the Jekyll root, with support for htaccess style redirects.
 - [Projectlist by Frederic Hemberger](https://github.com/fhemberger/jekyll-projectlist): Renders files in a directory as a single page instead of separate posts.
 - [RssGenerator by Assaf Gelber](https://github.com/agelber/jekyll-rss): Automatically creates an RSS 2.0 feed from your posts.
-- [Monthly archive generator by Shigeya Suzuki](https://github.com/shigeya/jekyll-monthly-archive-plugin): Generator and template which renders monthly archive like MovableType style, based on the work by Ilkka Laukkanen and others above.
-- [Category archive generator by Shigeya Suzuki](https://github.com/shigeya/jekyll-category-archive-plugin): Generator and template which renders category archive like MovableType style, based on Monthly archive generator.
-- [Emoji for Jekyll](https://github.com/yihangho/emoji-for-jekyll): Seamlessly enable emoji for all posts and pages.
 
 #### Converters
 
@@ -440,7 +381,6 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc’s markdown extensions.
 - [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
 - [Transform Layouts](https://gist.github.com/1472645): Allows HAML layouts (you need a HAML Converter plugin for this to work).
-- [Org-mode Converter](https://gist.github.com/abhiyerra/7377603): Org-mode converter for Jekyll.
 
 #### Filters
 
@@ -459,7 +399,6 @@ You can find a few useful plugins at the following locations:
 
 #### Tags
 
-- [Asset Path Tag](https://github.com/samrayner/jekyll-asset-path-plugin) by [Sam Rayner](http://www.samrayner.com/): Allows organisation of assets into subdirectories by outputting a path for a given file relative to the current post or page.
 - [Delicious Plugin by Christian Hellsten](https://github.com/christianhellsten/jekyll-plugins): Fetches and renders bookmarks from delicious.com.
 - [Ultraviolet Plugin by Steve Alex](https://gist.github.com/480380): Jekyll tag for the [Ultraviolet](http://ultraviolet.rubyforge.org/) code highligher.
 - [Tag Cloud Plugin by Ilkka Laukkanen](https://gist.github.com/710577): Generate a tag cloud that links to tag pages.
@@ -491,10 +430,6 @@ You can find a few useful plugins at the following locations:
 - [Jekyll Image Tag](https://github.com/robwierzbowski/jekyll-image-tag): Better images for Jekyll. Save image presets, generate resized images, and add classes, alt text, and other attributes.
 - [Ditaa Tag](https://github.com/matze/jekyll-ditaa) by [matze](https://github.com/matze): Renders ASCII diagram art into PNG images and inserts a figure tag.
 - [Good Include](https://github.com/penibelst/jekyll-good-include) by [Anatol Broder](http://penibelst.de/): Strips newlines and whitespaces from the end of include files before processing.
-- [Jekyll Suggested Tweet](https://github.com/davidensinger/jekyll-suggested-tweet) by [David Ensinger](https://github.com/davidensinger/): A Liquid tag for Jekyll that allows for the embedding of suggested tweets via Twitter’s Web Intents API.
-- [Jekyll Date Chart](https://github.com/GSI/jekyll_date_chart) by [GSI](https://github.com/GSI): Block that renders date line charts based on textile-formatted tables.
-- [Jekyll Image Encode](https://github.com/GSI/jekyll_image_encode) by [GSI](https://github.com/GSI): Tag that renders base64 codes of images fetched from the web.
-- [Jekyll Quick Man](https://github.com/GSI/jekyll_quick_man) by [GSI](https://github.com/GSI): Tag that renders pretty links to man page sources on the internet.
 
 #### Collections