diff --git a/README.markdown b/README.markdown index 50ec363e..0e37c531 100644 --- a/README.markdown +++ b/README.markdown @@ -14,8 +14,6 @@ [hakiri]: https://hakiri.io/github/jekyll/jekyll/master [travis]: https://travis-ci.org/jekyll/jekyll -By Tom Preston-Werner, Nick Quaranto, Parker Moore, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! - Jekyll is a simple, blog-aware, static site generator perfect for personal, project, or organization sites. Think of it like a file-based CMS, without all the complexity. Jekyll takes your content, renders Markdown and Liquid templates, and spits out a complete, static website ready to be served by Apache, Nginx or another web server. Jekyll is the engine behind [GitHub Pages](http://pages.github.com), which you can use to host sites right from your GitHub repositories. ## Philosophy diff --git a/site/_docs/datafiles.md b/site/_docs/datafiles.md index afa54b8f..4fd85b48 100644 --- a/site/_docs/datafiles.md +++ b/site/_docs/datafiles.md @@ -33,8 +33,8 @@ of code in your Jekyll templates: In `_data/members.yml`: {% highlight yaml %} -- name: Tom Preston-Werner - github: mojombo +- name: Eric Mill + github: konklone - name: Parker Moore github: parkr @@ -47,7 +47,7 @@ Or `_data/members.csv`: {% highlight text %} name,github -Tom Preston-Werner,mojombo +Eric Mill,konklone Parker Moore,parkr Liu Fengyun,liufengyun {% endhighlight %} diff --git a/site/_docs/history.md b/site/_docs/history.md index 6514e2c4..c7086d00 100644 --- a/site/_docs/history.md +++ b/site/_docs/history.md @@ -132,11 +132,11 @@ permalink: "/docs/history/" ### Bug Fixes {: #bug-fixes-v3-0-3} -* Fix extension weirdness with folders ([#4493]({{ site.repository }}/issues/4493)) -* EntryFilter: only include 'excluded' log on excluded files ([#4479]({{ site.repository }}/issues/4479)) -* `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path ([#4468]({{ site.repository }}/issues/4468)) -* `LiquidRenderer#parse`: parse with line numbers ([#4453]({{ site.repository }}/issues/4453)) -* `Document#<=>`: protect against nil comparison in dates. ([#4446]({{ site.repository }}/issues/4446)) +- Fix extension weirdness with folders ([#4493]({{ site.repository }}/issues/4493)) +- EntryFilter: only include 'excluded' log on excluded files ([#4479]({{ site.repository }}/issues/4479)) +- `Jekyll.sanitized_path`: escape tildes before sanitizing a questionable path ([#4468]({{ site.repository }}/issues/4468)) +- `LiquidRenderer#parse`: parse with line numbers ([#4453]({{ site.repository }}/issues/4453)) +- `Document#<=>`: protect against nil comparison in dates. ([#4446]({{ site.repository }}/issues/4446)) ## 3.0.2 / 2016-01-20 diff --git a/site/_includes/footer.html b/site/_includes/footer.html index 09bab737..48935106 100644 --- a/site/_includes/footer.html +++ b/site/_includes/footer.html @@ -1,7 +1,7 @@