Merge branch 'master' of github.com:spf13/hugo

README.md

@@ -115,7 +115,8 @@ We welcome your contributions. To make the process as seamless as possible, we a
 * When you're ready to create a pull request, be sure to:
      * Have test cases for the new code. If you have questions about how to do it, please ask in your pull request.
      * Run `go fmt`
-     * Squash your commits into a single commit. `git rebase -i`. It's okay to force update your pull request.     * Make sure `go test ./...` passes, and `go build` completes. Our Travis CI loop will catch most things that are missing. The exception: Windows. We run on Windows from time to time, but if you have access, please check on a Windows machine too.
+     * Squash your commits into a single commit. `git rebase -i`. It's okay to force update your pull request.
+     * Make sure `go test ./...` passes, and `go build` completes. Our Travis CI loop will catch most things that are missing. The exception: Windows. We run on Windows from time to time, but if you have access, please check on a Windows machine too.
 
 **Complete documentation is available at [Hugo Documentation](http://gohugo.io/).**
 

docs/content/community/press.md

@@ -18,6 +18,7 @@ Hugo has been featured in the following Blog Posts, Press and Media.
 | ------ | ------ | -----: |
 | [把这个博客静态化了 <small>(Migrate to Hugo)</small>](http://lich-eng.com/2015/01/03/migrate-to-hugo/) | Li Cheng | 3 Jan 2015 |
 | [My Hugo Experiment](http://baty.net/2014/12/2014-12-31-my-hugo-experiment/) | Jack Baty | 31 Dec 2014 |
+| [6 Static Blog Generators That Aren’t Jekyll](http://www.sitepoint.com/6-static-blog-generators-arent-jekyll/) | David Turnbull | 8 Dec 2014 |
 | [Travel Blogging Setup](http://www.stou.dk/2014/11/travel-blogging-setup/) | Rasmus Stougaard | 23 Nov 2014 |
 | [使用Hugo搭建免费个人Blog <small>(How to use Hugo)</small>](http://ulricqin.com/post/how-to-use-hugo/) | Ulric Qin 秦晓辉 | 11 Nov 2014 |
 | [Hugo para crear sitios web estáticos](http://www.webbizarro.com/noticias/1076/hugo-para-crear-sitios-web-estaticos/) | Web Bizarro | 19 Aug 2014 |

docs/content/meta/roadmap.md

@@ -15,11 +15,21 @@ In no particular order, here is what we are working on:
 
  * Intelligently Related Posts
  * Even easier deployment to S3, SSH, GitHub, rsync
- * Import from other website systems (WordPress, Jekyll)
- * An interactive web based editor
- * Additional themes
+ * Import from other website systems
+    * from Drupal (See https://bitbucket.org/rickb777/drupal2hugo by Rick Beton (@rickb777))
+    * from WordPress (See [#100][], especially https://github.com/SchumacherFM/wordpress-to-hugo-exporter by Cyrill Schumacher (@SchumacherFM), but volunteers are needed to make it work with latest versions of WordPress.)
+    * from Jekyll (See [#101][])
+ * An interactive web based editor (See http://discuss.gohugo.io/t/web-based-editor/155)
+ * Additional [themes](https://github.com/spf13/hugoThemes) (always on-going, contributions welcome!)
  * Dynamic image resizing via shortcodes
- * Support for additional formats
- * Pagination
- * Your best ideas
+ * Support for additional formats (AsciiDoc ([#470][], [#826][]), reST [#472][])
+ * Pagination (See [#96][], [#750][])
+ * And, last but not least, ***Your best ideas***!
 
+[#100]: https://github.com/spf13/hugo/issues/100 "hugo import from wordpress · Issue #100 · spf13/hugo"
+[#101]: https://github.com/spf13/hugo/issues/101 "hugo import from jekyll · Issue #101 · spf13/hugo"
+[#96]: https://github.com/spf13/hugo/issues/96 "Support for pagination · Issue #96 · spf13/hugo"
+[#750]: https://github.com/spf13/hugo/pull/750 "Add pagination support for home page, sections and taxonomies by bep · Pull Request #750 · spf13/hugo"
+[#470]: https://github.com/spf13/hugo/issues/470 "Support for AsciiDoc · Issue #470 · spf13/hugo"
+[#826]: https://github.com/spf13/hugo/pull/826 "Experimental AsciiDoc support with external helpers by anthonyfok · Pull Request #826 · spf13/hugo"
+[#472]: https://github.com/spf13/hugo/issues/472 "support for using reST · Issue #472 · spf13/hugo"

docs/layouts/index.html

@@ -166,6 +166,7 @@
                       <div class="item"> <blockquote><p>Also, I re-launched my blog (it looks the same as before) using Hugo, a *fast* static engine. Very happy with it.  <a href="http://gohugo.io/">gohugo.io</a></p>&mdash; Ryan Martinsen (@popthestack) <a href="https://twitter.com/popthestack/status/549972754125307904">December 30, 2014</a></blockquote> </div>
                       <div class="item"> <blockquote><p>I migrated the <a href="https://twitter.com/BlackOpsTesting">@BlackOpsTesting</a>.com website from docpad to Hugo last weekend. http://gohugo.io/  Super Fast HTML Generation <a href="https://twitter.com/spf13">@spf13</a></p>&mdash; Alan Richardson (@eviltester) <a href="https://twitter.com/eviltester/status/553520335115808768">January 9, 2015</a></blockquote> </div>
                       <div class="item"> <blockquote><p>Hugo is impressively capable. It's a static site generator by <a href="https://twitter.com/spf13">@spf13</a> written in <a href="https://twitter.com/hashtag/golang?src=hash">#golang</a>. Just upgraded to latest release; very powerful.</p>&mdash; Baron Schwartz (@xaprb) <a href="https://twitter.com/xaprb/status/556894866488455169">January 18, 2015</a></blockquote> </div>
+                      <div class="item"> <blockquote><p><a href="https://twitter.com/hashtag/Hugo?src=hash">#Hugo</a> A very good alternative for <a href="https://twitter.com/hashtag/wordpress?src=hash">#wordpress</a>!!! A fast and modern static website engine <a href="http://gohugo.io/">gohugo.io</a></p>&mdash; WorkHTML (@workhtml) <a href="https://twitter.com/workhtml/status/563064361301053440">February 4, 2015</a></blockquote> </div>
                   </div>
 
                 </div>