diff --git a/docs/README b/docs/README
deleted file mode 100644
index 60b411cb..00000000
--- a/docs/README
+++ /dev/null
@@ -1 +0,0 @@
-Jekyll's awesome website.
diff --git a/docs/_config.yml b/docs/_config.yml
index 8dfea987..00ca42de 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,18 +1,14 @@
title: "jekyll-import • Import your old & busted site to Jekyll"
url: https://import.jekyllrb.com
-highlighter: rouge
-relative_permalinks: false
-permalink: /news/:year/:month/:day/:title/
-excerpt_separator: ""
repository: https://github.com/jekyll/jekyll-import
-latest_release: 0.14.0
+permalink: pretty
collections:
docs:
output: true
+ sort_by: doc_order
importers:
output: true
- permalink: /docs/:path/
defaults:
- scope:
@@ -23,6 +19,4 @@ defaults:
type: importers
values:
layout: importer
-
-sass:
- style: compressed
+ title_suffix: " Importer"
diff --git a/docs/_docs/contributing.md b/docs/_docs/contributing.md
index 822083c3..1c5c9cdf 100644
--- a/docs/_docs/contributing.md
+++ b/docs/_docs/contributing.md
@@ -1,9 +1,5 @@
---
-layout: docs
-title: Contributing
-prev_section: third-party
-next_section: history
-permalink: /docs/contributing/
+doc_order: 4
---
jekyll-import is entirely open-source, which means we need your help to make it better!
@@ -28,7 +24,7 @@ So you have a new system you want to be able to import from? Great! It's pretty
First thing's first: create the file where the importer will go. In this case, that will be `lib/jekyll-import/importers/columbus.rb`.
Inside this file, we'll add this template:
-{% highlight ruby %}
+```ruby
module JekyllImport
module Importers
class Columbus < Importer
@@ -59,7 +55,7 @@ module JekyllImport
end
end
end
-{% endhighlight %}
+```
Let's go through this quickly.
@@ -79,16 +75,17 @@ Where the magic happens! This method should read from your *Columbus* source, th
This function is entirely optional, but allows for some validation of the options. This method allows you to validate the options in any way you wish. For example:
-{% highlight ruby %}
+```ruby
def self.validate(opts)
abort "Specify a username!" if opts["username"].nil?
abort "Your username must be a number." unless opts["username"].match(%r!\A\d+\z!)
end
-{% endhighlight %}
+```
Once you have your importer working (test with `script/console`), then you're ready to add **documentation**. Add your new file:
`./docs/_importers/columbus.md`. Take a look at one of the other importers as an example. You just add basic usage and you're golden.
All set? Add everything to a branch on your fork of `jekyll-import` and
[submit a pull request](https://github.com/jekyll/jekyll-import/compare/).
+
Thank you!
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index 62fdec8d..8332b9fe 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -1,8 +1,6 @@
---
-layout: docs
-title: History
-permalink: "/docs/history/"
-prev_section: contributing
+title: Project History
+doc_order: 6
---
## 0.21.0 / 2021-10-31
diff --git a/docs/_docs/index.md b/docs/_docs/index.md
index 6068210a..6c291e02 100644
--- a/docs/_docs/index.md
+++ b/docs/_docs/index.md
@@ -1,17 +1,18 @@
---
-layout: docs
-title: Getting started
-next_section: installation
-permalink: /docs/home/
+title: Getting Started
+permalink: /docs/
+doc_order: 1
---
-If you’re switching to Jekyll from another blogging system, Jekyll’s importers
-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.
+If you're switching to Jekyll from another blogging system, Jekyll's importers
+can help you with the move. Most importers listed on this site require read-access
+to the database from your old system to generate posts for Jekyll. Importers
+typically generates Markdown posts in the `_posts` directory based on the entries
+in the foreign system.
## 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).
+If you are from a system for which there is currently no builtin importer,
+[consider writing one][creating_importer] and sending us a pull request.
+
+[creating_importer]: {{ '/docs/contributing#creating-a-new-importer' | relative_url }}
diff --git a/docs/_docs/installation.md b/docs/_docs/installation.md
index 87e2b3f3..3a829264 100644
--- a/docs/_docs/installation.md
+++ b/docs/_docs/installation.md
@@ -1,27 +1,21 @@
---
-layout: docs
-title: Installation
-prev_section: home
-next_section: usage
-permalink: /docs/installation/
+doc_order: 2
---
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
+available to Jekyll via a separate gem named `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
-{% endhighlight %}
+```bash
+gem install jekyll-import
+```
+
+ Jekyll Import requires you to manually install some dependencies.
-
-
Jekyll-import requires you to manually install some dependencies.
-
Most importers require one or more dependencies. In order to keep
- jekyll-import's footprint small, we don't bundle the gem
- with every plausible dependency. Instead, you will see a nice error
- message describing any missing dependency and how to install it. If
- you're especially savvy, take a look at the require_deps
- method in your chosen importer to install all of the deps in one go.
+ Most importers require one or more dependencies. In order to keep the plugin's
+ footprint small, we don't bundle the gem with every plausible dependency.
+ Instead, you will see a nice error message describing any missing dependency
+ and how to install it. We also document such dependencies in the dedicated
+ page for a given importer.
diff --git a/docs/_importers/third-party.md b/docs/_docs/third-party.md
similarity index 92%
rename from docs/_importers/third-party.md
rename to docs/_docs/third-party.md
index 9d8cdbd5..a217f016 100644
--- a/docs/_importers/third-party.md
+++ b/docs/_docs/third-party.md
@@ -1,9 +1,6 @@
---
-layout: docs
-title: Third-party
-prev_section: wordpressdotcom
-next_section: contributing
-permalink: /docs/third-party/
+title: Third-party Importers
+doc_order: 5
---
Various third-party importers for Jekyll have been created separate from this
diff --git a/docs/_docs/usage.md b/docs/_docs/usage.md
index a9161283..855ace45 100644
--- a/docs/_docs/usage.md
+++ b/docs/_docs/usage.md
@@ -1,9 +1,5 @@
---
-layout: docs
-title: Usage
-prev_section: installation
-next_section: behance
-permalink: /docs/usage/
+doc_order: 3
---
You should now be all set to run the importers with the following incantation:
diff --git a/docs/_importers/behance.md b/docs/_importers/behance.md
index 50932a78..de99391f 100644
--- a/docs/_importers/behance.md
+++ b/docs/_importers/behance.md
@@ -1,7 +1,3 @@
---
-title: Behance
-importer: true
-prev_section: usage
-link_source: behance
-next_section: blogger
+prereq_info: To import your posts from Behance, generate an API token for your user account.
---
diff --git a/docs/_importers/blogger.md b/docs/_importers/blogger.md
index 83263a97..cc884486 100644
--- a/docs/_importers/blogger.md
+++ b/docs/_importers/blogger.md
@@ -1,8 +1,4 @@
---
-importer: true
-prev_section: behance
-link_source: blogger
-next_section: csv
prereq_info: |-
To import your posts from Blogger, you have to first [export the blog][export-blogger-xml]
to an XML file (`blog-MM-DD-YYYY.xml`).
diff --git a/docs/_importers/csv.md b/docs/_importers/csv.md
index ebb7fc17..45e0bb76 100644
--- a/docs/_importers/csv.md
+++ b/docs/_importers/csv.md
@@ -1,8 +1,5 @@
---
title: CSV
-prev_section: blogger
-link_source: csv
-next_section: drupal6
---
Your CSV file will be read in with the following columns:
@@ -15,4 +12,4 @@ Your CSV file will be read in with the following columns:
If you wish to specify custom front matter for each of your posts, you can use
the `--no-front-matter` option to prevent the default front matter from being
-written to the imported files.
+imparted to the imported files.
diff --git a/docs/_importers/dotclear.md b/docs/_importers/dotclear.md
index 1273266e..19a3b7f1 100644
--- a/docs/_importers/dotclear.md
+++ b/docs/_importers/dotclear.md
@@ -1,6 +1,3 @@
---
-title: Dotclear
-prev_section: csv
-link_source: dotclear
-next_section: drupal6
+title: DotClear
---
diff --git a/docs/_importers/drupal6.md b/docs/_importers/drupal6.md
index 24bd1130..ad25e02e 100644
--- a/docs/_importers/drupal6.md
+++ b/docs/_importers/drupal6.md
@@ -1,10 +1,9 @@
---
title: Drupal 6
-prev_section: csv
-link_source: drupal6
-next_section: drupal7
---
-By default, this will pull in nodes of type `blog`, `story`, and `article`.
-To specify custom types, you can use the `types` option when you run the
-importer to select node types.
+By default, the importer will pull in nodes of type `blog`, `story`, and `article`.
+To specify custom types, you may use the `types` option while invoking the importer.
+
+The default Drupal 6 expects database to be MySQL. If you want to import posts from
+Drupal 6 installation with PostgreSQL define, pass `postgresql` to the `--engine` option.
diff --git a/docs/_importers/drupal7.md b/docs/_importers/drupal7.md
index eda41315..aea041fd 100644
--- a/docs/_importers/drupal7.md
+++ b/docs/_importers/drupal7.md
@@ -1,10 +1,9 @@
---
title: Drupal 7
-prev_section: drupal6
-link_source: drupal7
-next_section: drupal8
---
-By default, this will pull in nodes of type `blog`, `story`, and `article`.
-To specify custom types, you can use the `types` option when you run the
-importer to select node types.
+By default, the importer will pull in nodes of type `blog`, `story`, and `article`.
+To specify custom types, you may use the `types` option while invoking the importer.
+
+The default Drupal 7 expects database to be MySQL. If you want to import posts from
+Drupal 7 installation with PostgreSQL define, pass `postgresql` to the `--engine` option.
diff --git a/docs/_importers/drupal8.md b/docs/_importers/drupal8.md
index dbe599ff..bbab8348 100644
--- a/docs/_importers/drupal8.md
+++ b/docs/_importers/drupal8.md
@@ -1,10 +1,9 @@
---
title: Drupal 8
-prev_section: drupal7
-link_source: drupal8
-next_section: easyblog
---
-By default, this will pull in nodes of type `blog`, `story`, and `article`.
-To specify custom types, you can use the `types` option when you run the
-importer to select node types.
+By default, the importer will pull in nodes of type `blog`, `story`, and `article`.
+To specify custom types, you may use the `types` option while invoking the importer.
+
+The default Drupal 8 expects database to be MySQL. If you want to import posts from
+Drupal 8 installation with PostgreSQL define, pass `postgresql` to the `--engine` option.
diff --git a/docs/_importers/easyblog.md b/docs/_importers/easyblog.md
index 08835dad..e46725b3 100644
--- a/docs/_importers/easyblog.md
+++ b/docs/_importers/easyblog.md
@@ -1,6 +1,5 @@
---
title: EasyBlog
-prev_section: drupal8
-link_source: easyblog
-next_section: enki
---
+
+This importer will export all articles (in any state). Category and tags will also be included in export.
diff --git a/docs/_importers/enki.md b/docs/_importers/enki.md
index b9db6cb5..a845151c 100644
--- a/docs/_importers/enki.md
+++ b/docs/_importers/enki.md
@@ -1,5 +1,2 @@
---
-prev_section: easyblog
-link_source: enki
-next_section: ghost
---
diff --git a/docs/_importers/ghost.md b/docs/_importers/ghost.md
index bc930f25..88fdf21f 100644
--- a/docs/_importers/ghost.md
+++ b/docs/_importers/ghost.md
@@ -1,7 +1,7 @@
---
-prev_section: enki
-link_source: ghost
-next_section: google_reader
+prereq_info: >-
+ To import your posts from your self-hosted Ghost instance, you first have to download
+ your `ghost.db` from your server.
---
If you have a Ghost backup file, consider using another tool called
diff --git a/docs/_importers/googlereader.md b/docs/_importers/googlereader.md
index 0cf4a05b..e646497b 100644
--- a/docs/_importers/googlereader.md
+++ b/docs/_importers/googlereader.md
@@ -1,7 +1,3 @@
---
title: Google Reader
-prev_section: enki
-link_source: google_reader
-next_section: joomla
-permalink: /docs/google_reader/
---
diff --git a/docs/_importers/joomla.md b/docs/_importers/joomla.md
index a65eccfa..a845151c 100644
--- a/docs/_importers/joomla.md
+++ b/docs/_importers/joomla.md
@@ -1,5 +1,2 @@
---
-prev_section: google_reader
-link_source: joomla
-next_section: joomla3
---
diff --git a/docs/_importers/joomla3.md b/docs/_importers/joomla3.md
index ee3789de..8e26c665 100644
--- a/docs/_importers/joomla3.md
+++ b/docs/_importers/joomla3.md
@@ -1,9 +1,6 @@
---
title: Joomla 3
-prev_section: joomla
-link_source: joomla3
-next_section: jrnl
---
-If the `category` numerical field is not filled, all articles will be imported, except the ones that are
-uncategorized.
+If the `category` numerical field is not filled, all articles will be imported, except the ones that are
+uncategorized.
diff --git a/docs/_importers/jrnl.md b/docs/_importers/jrnl.md
index a1b4b4a8..a845151c 100644
--- a/docs/_importers/jrnl.md
+++ b/docs/_importers/jrnl.md
@@ -1,5 +1,2 @@
---
-prev_section: joomla3
-link_source: jrnl
-next_section: marley
---
diff --git a/docs/_importers/marley.md b/docs/_importers/marley.md
index 42d29dc4..a845151c 100644
--- a/docs/_importers/marley.md
+++ b/docs/_importers/marley.md
@@ -1,5 +1,2 @@
---
-prev_section: jrnl
-link_source: marley
-next_section: mephisto
---
diff --git a/docs/_importers/medium.md b/docs/_importers/medium.md
index 83063775..1f770e7e 100644
--- a/docs/_importers/medium.md
+++ b/docs/_importers/medium.md
@@ -1,8 +1,7 @@
---
-prev_section: marley
-link_source: medium
-next_section: mephisto
---
-This importer will also import the existing tags/labels from Medium post and
-include the tags to [Front Matter](https://jekyllrb.com/docs/front-matter/).
+This importer will also import existing tags / labels from Medium post and
+include those tags to the generated post's [front matter][front_matter_docs].
+
+[front_matter_docs]: https://jekyllrb.com/docs/front-matter/
diff --git a/docs/_importers/mephisto.md b/docs/_importers/mephisto.md
index 243d10b3..a845151c 100644
--- a/docs/_importers/mephisto.md
+++ b/docs/_importers/mephisto.md
@@ -1,5 +1,2 @@
---
-prev_section: marley
-link_source: mephisto
-next_section: mt
---
diff --git a/docs/_importers/mt.md b/docs/_importers/mt.md
index 694bd8b4..43a0ea33 100644
--- a/docs/_importers/mt.md
+++ b/docs/_importers/mt.md
@@ -1,18 +1,17 @@
---
title: Movable Type
-prev_section: mephisto
-link_source: mt
-next_section: posterous
---
-`comments`, which defaults to false, control the generation of
-comment. If `comments` set to true, posts will be generated and placed
-in `_comments` directory.
+Posts will be generated and placed in `_posts` directory.
-All of the posts and comments will include `post_id` in YAML front
-matter to link a post and its comments.
+`comments`, which defaults to false, control the generation of comments. If
+`comments` is set to true, posts will be generated and placed in `_comments`
+directory.
-To include imported comments as part of a post, use the yet to merge
-[fork of mt-static-comments](https://github.com/shigeya/jekyll-static-comments/tree/mt_static_comments)
-to include statically generate comments in your post. Fork and provide
-feedback if necessary.
+All of the posts and comments will include `post_id` in YAML front matter to
+link a post and its comments.
+
+You can use the [fork of mt-static-comments][fork of mt-static-comments] to
+include statically generate comments in your post.
+
+[fork of mt-static-comments]: https://github.com/shigeya/jekyll-static-comments/tree/mt_static_comments
diff --git a/docs/_importers/pluxml.md b/docs/_importers/pluxml.md
index 4ab844ba..fbac4690 100644
--- a/docs/_importers/pluxml.md
+++ b/docs/_importers/pluxml.md
@@ -1,8 +1,6 @@
---
-title: PluXML
-prev_section: mt
-link_source: pluxml
-next_section: posterous
+title: PluXml
---
-The `avoid_liquid` field is optional, it will add `render_with_liquid: false` option in the header of each file. Usefull if you have à lot of source code to show to your visitors.
+The `--avoid_liquid` will disable rendering of each file with Liquid. Useful if
+you have a lot of source code to show to your visitors.
diff --git a/docs/_importers/posterous.md b/docs/_importers/posterous.md
index 9b941acc..add7127f 100644
--- a/docs/_importers/posterous.md
+++ b/docs/_importers/posterous.md
@@ -1,9 +1,5 @@
---
-prev_section: mt
-link_source: posterous
-next_section: rss
---
-There is also an [alternative Posterous
-migrator](https://github.com/pepijndevos/jekyll/blob/patch-1/lib/jekyll/migrators/posterous.rb)
+There is also an [alternative Posterous importer](https://github.com/pepijndevos/jekyll/blob/patch-1/lib/jekyll/migrators/posterous.rb)
that maintains permalinks and attempts to import images too.
diff --git a/docs/_importers/roller.md b/docs/_importers/roller.md
index 96081d97..2498cb18 100644
--- a/docs/_importers/roller.md
+++ b/docs/_importers/roller.md
@@ -1,6 +1,5 @@
---
-prev_section: wordpressdotcom
-link_source: roller
-next_section: third-party
render_limited_import_note: true
---
+
+Currently this importer assumes a MySQL database.
diff --git a/docs/_importers/rss.md b/docs/_importers/rss.md
index ba9ceae0..f113527d 100644
--- a/docs/_importers/rss.md
+++ b/docs/_importers/rss.md
@@ -1,8 +1,7 @@
---
title: RSS
-prev_section: posterous
-link_source: rss
-next_section: s9y
---
-__Note:__ `tag` and `extract_tags` are exclusive option, both can not be provided together.
+The `source` option may either be a local file or a remote one.
+
+`tag` and `extract_tags` are exclusive options. Both can not be provided together.
diff --git a/docs/_importers/s9y.md b/docs/_importers/s9y.md
index 805ca71c..0978490f 100644
--- a/docs/_importers/s9y.md
+++ b/docs/_importers/s9y.md
@@ -1,6 +1,3 @@
---
title: S9Y
-prev_section: rss
-link_source: s9y
-next_section: s9ydatabase
---
diff --git a/docs/_importers/s9ydatabase.md b/docs/_importers/s9ydatabase.md
index 41766aa3..8be75c01 100644
--- a/docs/_importers/s9ydatabase.md
+++ b/docs/_importers/s9ydatabase.md
@@ -1,87 +1,50 @@
---
title: S9Y Database
-prev_section: s9y
-link_source: s9ydatabase
-next_section: textpattern
render_limited_import_note: true
---
-
-
Migration Options
-
- This importer now supports two options to help migrate your blog to a new
- hosting provider.
-
-
-
- relative
-
- Set this to your URL prefix to convert all the absolute URLs in your
- posts to relative. For example, when set to
- myhost.com/blog, URLs like
- http://myhost.com/blog/lifestyle/7-lucky-post.html will be
- converted to /lifestyle/7-lucky-post.html. Note that you
- should not include the trailing / slash, and that https:
- is not yet supported.
-
-
- linebreak
-
- If you used a formatting extension, this option might be useful. Use
- one of the following values to try and replicate your post line breaks as
- closely as possible:
-
-
-
wp (the default)
-
Replicate the Wordpress line break behavior, the default for S9Y.
-
-
nokogiri
-
- Uses the nokogiri gem to interpret entries as XHTML
- formatted. If you write HTML entries, this preserves the HTML
- line breaks.
-
-
-
ignore
-
- This option does not process the entries at all, but imports them
- into Jekyll verbatim. This may be useful if you wrote your entries in
- a Jekyll-compatible format.
-
-
-
-
-
-
-
Extension Options
-
- This importer now supports some of the most common S9Y plugins.
-
-
-
- includeentry
-
- Set this true to transclude entries like the includeentry
- plugin. The current, static content of the entry will be included.
- Future updates will not be synced.
-
-
- excerpt_separator
-
- S9Y treats the regular post body as an excerpt, displaying the extended
- body only in the post details. Jekyll only shows the first paragraph of
- the post as an excerpt. This option allows you to restore the S9Y
- behavior: posts with extended body will have the specified separator
- added to their front matter, and you can modify your index layout to
- show the excerpts.
-
-
- imgfig
-
- By default, this converts references to S9Y's media library into HTML
- figure tags. Set it to false to keep the
- original references, which you'll have to update manually.
-
-
-
-
+## Migration Options
+
+- ### `--relative`
+
+ Set this to your URL prefix to convert all the absolute URLs in your posts to relative. For example, when set to **`myhost.com/blog`**,
+ URLs like `http://myhost.com/blog/lifestyle/7-lucky-post.html` will be converted to `/lifestyle/7-lucky-post.html`. Note that you should
+ not include the trailing slash `/`, and that `https://` is not supported.
+
+- ### `--linebreak`
+
+ If you used a formatting extension, this option might be useful. Use one of the following values to try and replicate your post line breaks
+ as closely as possible:
+
+ - #### `wp`
+
+ Replicate the Wordpress line break behavior, the default for S9Y.
+
+ - #### `nokogiri`
+
+ Uses the `nokogiri` gem to interpret entries as XHTML formatted. If you write HTML entries, this preserves the HTML line breaks.
+
+ - #### `ignore`
+
+ This option does not process the entries at all, but imports them into Jekyll verbatim. This may be useful if you wrote your entries
+ in a Jekyll-compatible format.
+
+## Extension Options
+
+This importer supports some of the most common S9Y plugins.
+
+- ### `--includeentry`
+
+ Use this option to transclude entries like the `includeentry`plugin. The current static content of the entry will be included. Future updates
+ will not be synced.
+
+- ### `--excerpt_separator`
+
+ S9Y treats the regular post body as an excerpt, displaying the extended body only in the post details. Jekyll only shows the first paragraph
+ of the post as an excerpt. This option allows you to restore the S9Y behavior: posts with extended body will have the specified separator
+ added to their front matter, and you can modify your index layout to show the excerpts.
+
+- ### `--imgfig`
+
+ By default, this converts references to S9Y's media library into HTML `figure` tags. Set it to `false` to keep the original references, which
+ you'll have to update manually.
diff --git a/docs/_importers/textpattern.md b/docs/_importers/textpattern.md
index 2f6450b8..d2ab353d 100644
--- a/docs/_importers/textpattern.md
+++ b/docs/_importers/textpattern.md
@@ -1,11 +1,7 @@
---
-title: Textpattern
-prev_section: s9y
-link_source: textpattern
-next_section: tumblr
---
-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`. This importer will attempt to pull
-all entries that are live or sticky.
+You may need to invoke the importer from the parent directory of your `_import`
+folder. For example, if `_import` is located in `/path/source/_import`, invoke
+this importer from `/path/source`. This importer will attempt to pull all entries
+that are live or sticky.
diff --git a/docs/_importers/tumblr.md b/docs/_importers/tumblr.md
index 272b3194..a845151c 100644
--- a/docs/_importers/tumblr.md
+++ b/docs/_importers/tumblr.md
@@ -1,5 +1,2 @@
---
-prev_section: textpattern
-link_source: tumblr
-next_section: typo
---
diff --git a/docs/_importers/typo.md b/docs/_importers/typo.md
index 94ee8c0c..f1c633a5 100644
--- a/docs/_importers/typo.md
+++ b/docs/_importers/typo.md
@@ -1,10 +1,5 @@
---
-title: Typo
-prev_section: tumblr
-link_source: typo
-next_section: wordpress
+title: Typo (Publify)
---
-Typo is now [Publify](http://publify.co).
-
This importer has only been tested with Typo version 4+.
diff --git a/docs/_importers/wordpress.md b/docs/_importers/wordpress.md
index 837c7179..450ad3de 100644
--- a/docs/_importers/wordpress.md
+++ b/docs/_importers/wordpress.md
@@ -1,7 +1,4 @@
---
title: WordPress
-prev_section: typo
-link_source: wordpress
render_limited_import_note: true
-next_section: wordpressdotcom
---
diff --git a/docs/_importers/wordpressdotcom.md b/docs/_importers/wordpressdotcom.md
index 296ad579..913863af 100644
--- a/docs/_importers/wordpressdotcom.md
+++ b/docs/_importers/wordpressdotcom.md
@@ -1,18 +1,13 @@
---
title: WordPress.com
-prev_section: wordpress
-link_source: wordpressdotcom
-next_section: third-party
---
-The `source`, `no_fetch_images`, and `assets_folder` fields are not required.
-Their default values are what you see above.
+
+ **ProTip: WordPress.com Export Tool**
-
-
ProTip™: WordPress.com Export Tool
-
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`.
+ 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`.
### Further WordPress migration alternatives
@@ -26,9 +21,8 @@ might be useful to you:
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](https://vitobotta.com/2011/03/28/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.
+- [A great article](https://vitobotta.com/2011/03/28/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.
diff --git a/docs/_includes/analytics.html b/docs/_includes/analytics.html
deleted file mode 100644
index bbdc351e..00000000
--- a/docs/_includes/analytics.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% if site.gauges_id %}
-
-
-{% endif %}
-
-{% if site.google_analytics_id %}
-
-
-{% endif %}
diff --git a/docs/_includes/docs_contents.html b/docs/_includes/docs_contents.html
deleted file mode 100644
index e911f35d..00000000
--- a/docs/_includes/docs_contents.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
You may install the needed gem by running gem install {{ importer_deps }}
- {% else %}
-
- You may install the needed gems individually by running gem install GEM_NAME or install all of them
- with a single invocation:gem install {{ importer_deps | join: " " }}
-
+ This importer depends on the following third-party gems:
+
{% for gem in page.cmd_deps %}
{{ gem }}
{% endfor %}
+ You may either install the gem(s) individually by running a command with syntax gem install GEM_NAME
+ or install the required gems in a batch by running the following snippet:
+
gem install {{ page.cmd_deps | join: ' ' }}
+
+
+{% endif %}
+
{% if page.render_limited_import_note %}
@@ -30,12 +42,12 @@
Invocation
{{ option.switch }}
{{ option.desc | markdownify }}
- {% if option.default_value %}
Default: {{ option.default_value }}
{% endif %}
+ {% if option.default_value %}
Default: {{ option.default_value }}
{% endif %}
{% endfor %}
{% if has_required_opts %}
-
Highlighted row(s) in table above indicate required options.
Sick of dealing with hosting companies? GitHub Pages are powered by Jekyll, so you can easily deploy your site using GitHub for free—custom domain name and all.