From b961c95a1f481d8ba81dfff439f3151d864064cd Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 09:54:14 -0500
Subject: [PATCH 01/10] Add Jekyll

---
 .gitignore       |   3 ++
 Gemfile          |   3 ++
 Gemfile.lock     | 130 +++++++++++++++++++++++++++++++++++++++++++++++
 _config.yml      |  19 +++++++
 script/bootstrap |   9 ++++
 script/server    |   5 ++
 6 files changed, 169 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Gemfile
 create mode 100644 Gemfile.lock
 create mode 100644 _config.yml
 create mode 100755 script/bootstrap
 create mode 100755 script/server

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..b242b82b882
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+.jekyll-metadata
+_site/
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000000..83a45d54fd3
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "github-pages"
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000000..e1c4e8f3b86
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,130 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.10.0)
+    colorator (0.1)
+    ethon (0.9.0)
+      ffi (>= 1.3.0)
+    execjs (2.7.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.14)
+    gemoji (2.1.0)
+    github-pages (90)
+      activesupport (= 4.2.7)
+      github-pages-health-check (= 1.1.2)
+      jekyll (= 3.1.6)
+      jekyll-coffeescript (= 1.0.1)
+      jekyll-feed (= 0.5.1)
+      jekyll-gist (= 1.4.0)
+      jekyll-github-metadata (= 2.0.2)
+      jekyll-mentions (= 1.1.3)
+      jekyll-paginate (= 1.1.0)
+      jekyll-redirect-from (= 0.11.0)
+      jekyll-sass-converter (= 1.3.0)
+      jekyll-seo-tag (= 2.0.0)
+      jekyll-sitemap (= 0.10.0)
+      jemoji (= 0.7.0)
+      kramdown (= 1.11.1)
+      liquid (= 3.0.6)
+      listen (= 3.0.6)
+      mercenary (~> 0.3)
+      rouge (= 1.11.1)
+      terminal-table (~> 1.4)
+    github-pages-health-check (1.1.2)
+      addressable (~> 2.3)
+      net-dns (~> 0.8)
+      octokit (~> 4.0)
+      public_suffix (~> 1.4)
+      typhoeus (~> 0.7)
+    html-pipeline (2.4.2)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    i18n (0.7.0)
+    jekyll (3.1.6)
+      colorator (~> 0.1)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-feed (0.5.1)
+    jekyll-gist (1.4.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.0.2)
+      jekyll (~> 3.1)
+      octokit (~> 4.0)
+    jekyll-mentions (1.1.3)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.11.0)
+      jekyll (>= 2.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-seo-tag (2.0.0)
+      jekyll (~> 3.1)
+    jekyll-sitemap (0.10.0)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    jemoji (0.7.0)
+      activesupport (~> 4.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 2.2)
+      jekyll (>= 3.0)
+    json (1.8.3)
+    kramdown (1.11.1)
+    liquid (3.0.6)
+    listen (3.0.6)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    multipart-post (2.0.0)
+    net-dns (0.8.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    pkg-config (1.1.7)
+    public_suffix (1.5.3)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+    terminal-table (1.6.0)
+    thread_safe (0.3.5)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  github-pages
+
+BUNDLED WITH
+   1.12.5
diff --git a/_config.yml b/_config.yml
new file mode 100644
index 00000000000..c9d19444a08
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1,19 @@
+baseurl: "/open-source-handbook"
+
+exclude:
+  - docs
+  - README.md
+  - script
+  - Gemfile*
+
+collections:
+  content:
+    output: true
+    permalink: /:path/
+
+defaults:
+  - scope:
+      path: ""
+      type: "content"
+    values:
+      layout: article
diff --git a/script/bootstrap b/script/bootstrap
new file mode 100755
index 00000000000..19667e454d3
--- /dev/null
+++ b/script/bootstrap
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+export CC=gcc
+
+echo "==> Installing gem dependencies…"
+bundle check --path vendor/gems 2>&1 > /dev/null || {
+  time bundle install --binstubs bin --path vendor/gems --local --quiet
+}
diff --git a/script/server b/script/server
new file mode 100755
index 00000000000..68cfe8ec499
--- /dev/null
+++ b/script/server
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+bundle exec jekyll serve --watch --incremental --baseurl ''

From 0bd0888683eb352794e8c4138cce0ad172fec38c Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 10:29:48 -0500
Subject: [PATCH 02/10] Add lint tests

---
 Gemfile           |  1 +
 Gemfile.lock      |  2 ++
 Rakefile          |  9 +++++++++
 _config.yml       |  4 +++-
 _data/fields.yml  | 10 ++++++++++
 test/helper.rb    | 29 +++++++++++++++++++++++++++++
 test/lint_test.rb | 36 ++++++++++++++++++++++++++++++++++++
 7 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 Rakefile
 create mode 100644 _data/fields.yml
 create mode 100644 test/helper.rb
 create mode 100644 test/lint_test.rb

diff --git a/Gemfile b/Gemfile
index 83a45d54fd3..3ca8d7baf67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gem "github-pages"
+gem "rake"
diff --git a/Gemfile.lock b/Gemfile.lock
index e1c4e8f3b86..46a90afccbb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,6 +104,7 @@ GEM
       sawyer (~> 0.7.0, >= 0.5.3)
     pkg-config (1.1.7)
     public_suffix (1.5.3)
+    rake (11.2.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -125,6 +126,7 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
+  rake
 
 BUNDLED WITH
    1.12.5
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 00000000000..6ed77b0653d
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,9 @@
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/*_test.rb"]
+  t.warning = false
+  t.verbose = false
+end
+
+task :default => :test
diff --git a/_config.yml b/_config.yml
index c9d19444a08..2b826a3d0b3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -2,9 +2,11 @@ baseurl: "/open-source-handbook"
 
 exclude:
   - docs
+  - Gemfile*
+  - Rakefile
   - README.md
   - script
-  - Gemfile*
+  - test
 
 collections:
   content:
diff --git a/_data/fields.yml b/_data/fields.yml
new file mode 100644
index 00000000000..17d3413979e
--- /dev/null
+++ b/_data/fields.yml
@@ -0,0 +1,10 @@
+# Each piece of content has YAML front matter with these properties:
+
+title:
+  required: true
+
+next:
+  type: String
+
+previous:
+  type: String
diff --git a/test/helper.rb b/test/helper.rb
new file mode 100644
index 00000000000..a52b522b2c8
--- /dev/null
+++ b/test/helper.rb
@@ -0,0 +1,29 @@
+require "minitest/autorun"
+require "jekyll"
+
+module Helper
+  class << self
+    attr_accessor :config, :site
+  end
+end
+
+def source
+  File.expand_path('../', File.dirname(__FILE__))
+end
+
+def config
+  Helper.config ||= Jekyll.configuration("source" => source)
+end
+
+def content
+  site.collections['content'].docs.map { |doc| doc.to_liquid }
+end
+
+def site
+  Helper.site ||= begin
+    site = Jekyll::Site.new(config)
+    site.reset
+    site.read
+    site
+  end
+end
diff --git a/test/lint_test.rb b/test/lint_test.rb
new file mode 100644
index 00000000000..ce7355bbd89
--- /dev/null
+++ b/test/lint_test.rb
@@ -0,0 +1,36 @@
+require_relative "./helper"
+
+describe "lint test" do
+
+  content.each do |page|
+
+    describe page["path"] do
+
+      describe "frontmatter" do
+
+        before do
+          # Load raw metadata to skip defaults
+          @data = SafeYAML.load_file(page["path"])
+        end
+
+        it "contains supported fields" do
+          extra_fields = @data.keys - site.data["fields"].keys
+          assert extra_fields.empty?, "Unexpected metadata in #{page["path"]}: #{extra_fields.inspect}"
+        end
+
+        site.data["fields"].each do |name, attrs|
+          it "#{name} is required" do
+            assert @data.key?(name), "#{name} is required"
+          end if attrs["required"]
+
+          it "#{name} should be of type #{attrs["type"]}" do
+            assert_kind_of Kernel.const_get(attrs["type"]), @data[name] if @data[name]
+          end if attrs["type"]
+
+          it "#{name} has valid attributes" do
+          end
+        end
+      end
+    end
+  end
+end

From d626ed3eadb830b1de12086c1596f02b11a9c09a Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 10:57:28 -0500
Subject: [PATCH 03/10] Make next/previos links work

---
 _config.yml                                   |  6 +----
 _layouts/article.html                         | 13 ++++++++++
 .../branding.md                               |  9 ++++---
 .../index.md                                  |  7 +++---
 .../legal.md                                  | 10 +++++---
 .../preparing.md                              | 25 +++++++++----------
 .../setting-expectations.md                   |  9 ++++---
 _content/index.md => index.md                 |  5 +++-
 .../building-community.md                     | 14 +++++------
 {_content/marketing => marketing}/index.md    |  7 +++---
 .../marketing => marketing}/measuring.md      | 10 +++++---
 .../marketing => marketing}/spreading-word.md | 13 +++++-----
 test/helper.rb                                |  4 +--
 test/lint_test.rb                             | 10 +++++---
 14 files changed, 82 insertions(+), 60 deletions(-)
 create mode 100644 _layouts/article.html
 rename {_content/getting-started => getting-started}/branding.md (98%)
 rename {_content/getting-started => getting-started}/index.md (97%)
 rename {_content/getting-started => getting-started}/legal.md (98%)
 rename {_content/getting-started => getting-started}/preparing.md (96%)
 rename {_content/getting-started => getting-started}/setting-expectations.md (97%)
 rename _content/index.md => index.md (91%)
 rename {_content/marketing => marketing}/building-community.md (98%)
 rename {_content/marketing => marketing}/index.md (80%)
 rename {_content/marketing => marketing}/measuring.md (97%)
 rename {_content/marketing => marketing}/spreading-word.md (97%)

diff --git a/_config.yml b/_config.yml
index 2b826a3d0b3..2493fc4888e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -8,14 +8,10 @@ exclude:
   - script
   - test
 
-collections:
-  content:
-    output: true
-    permalink: /:path/
+permalink: /:path/
 
 defaults:
   - scope:
       path: ""
-      type: "content"
     values:
       layout: article
diff --git a/_layouts/article.html b/_layouts/article.html
new file mode 100644
index 00000000000..43da259ed0d
--- /dev/null
+++ b/_layouts/article.html
@@ -0,0 +1,13 @@
+<h1>{{ page.title }}</h1>
+
+{{ content }}
+
+{% assign previous = site.pages | where: "next", page.path | first %}
+{% if previous %}
+  Previous: <a href="{{ previous.url | prepend: site.baseurl }}">{{ previous.title }}</a> |
+{% endif %}
+
+{% if page.next %}
+  {% assign next = site.pages | where: "path", page.next | first %}
+  Next: <a href="{{ next.url | prepend: site.baseurl }}">{{ next.title }}</a>
+{% endif %}
diff --git a/_content/getting-started/branding.md b/getting-started/branding.md
similarity index 98%
rename from _content/getting-started/branding.md
rename to getting-started/branding.md
index d54d5e9e2df..7b492c417e8 100644
--- a/_content/getting-started/branding.md
+++ b/getting-started/branding.md
@@ -1,4 +1,7 @@
-# **Branding**
+---
+title: Branding
+next: getting-started/preparing.md
+---
 
 You’ve thought about who your users are, what they need from you, and what you might be able to offer them. Next, we’ll put that research into practice as we consider the brand of your project.
 
@@ -24,7 +27,7 @@ Make sure that your project’s name doesn’t infringe upon any trademarks. A c
 
 
 
-You’ll also want to look for open source projects with a similar name, especially if you share the same language or ecosystem. If your name overlaps with a popular existing project, you will confuse your audience and make it less likely that anyone will use what you’ve created. You can check for similar project names here: [http://ivantomic.com/projects/ospnc/](http://ivantomic.com/projects/ospnc/) 
+You’ll also want to look for open source projects with a similar name, especially if you share the same language or ecosystem. If your name overlaps with a popular existing project, you will confuse your audience and make it less likely that anyone will use what you’ve created. You can check for similar project names here: [http://ivantomic.com/projects/ospnc/](http://ivantomic.com/projects/ospnc/)
 
 
 
@@ -69,5 +72,3 @@ We’re almost there! Next, we’ll walk you through a few components that every
 ### Further reading
 
 * [http://producingoss.com/en/getting-started.html#choosing-a-name](http://producingoss.com/en/getting-started.html#choosing-a-name)
-
-[Previous](setting-expecations.md) | [Next](preparing.md)
diff --git a/_content/getting-started/index.md b/getting-started/index.md
similarity index 97%
rename from _content/getting-started/index.md
rename to getting-started/index.md
index 4f89facdc79..cc22b89f5de 100644
--- a/_content/getting-started/index.md
+++ b/getting-started/index.md
@@ -1,4 +1,7 @@
-# Before You Get Started
+---
+title: Before you Get Started
+next: getting-started/setting-expectations.md
+---
 
 ## What does it mean to open source a project?
 
@@ -31,5 +34,3 @@ Remember: open source isn’t just for software! You can open source everything
 When you open source a project, you open yourself to feedback and suggestions from other people who are engaged with your work. It might feel intimidating to open source a project for the first time, but remember that you’re not alone.
 
 In the next section, we’ll help you figure out your goals around open sourcing your project. Understanding these goals beforehand will make it easier to manage your and others’ expectations later on.
-
-[Previous](../index.md) | [Next](setting-expectations.md)
diff --git a/_content/getting-started/legal.md b/getting-started/legal.md
similarity index 98%
rename from _content/getting-started/legal.md
rename to getting-started/legal.md
index acb40671234..8b7d3b45a94 100644
--- a/_content/getting-started/legal.md
+++ b/getting-started/legal.md
@@ -1,4 +1,6 @@
-# **The legal side of open source**
+---
+title: The legal side of open source
+---
 
 Sharing your creative work with the world can be an exciting and rewarding experience. It can also mean a bunch of legal things you didn’t know you had to worry about.
 
@@ -100,7 +102,7 @@ If you use others’ open source code to create anything that could be considere
 
 
 
-To learn more about the implications of different open source licenses, check out: [https://tldrlegal.com/](https://tldrlegal.com/) 
+To learn more about the implications of different open source licenses, check out: [https://tldrlegal.com/](https://tldrlegal.com/)
 
 
 
@@ -108,6 +110,6 @@ To learn more about the implications of different open source licenses, check ou
 
 * [http://choosealicense.com](http://choosealicense.com)
 * [https://tldrlegal.com/](https://tldrlegal.com/)
-* [https://processmechanics.com/2015/07/23/a-model-ip-and-open-source-contribution-policy/](https://processmechanics.com/2015/07/23/a-model-ip-and-open-source-contribution-policy/) 
+* [https://processmechanics.com/2015/07/23/a-model-ip-and-open-source-contribution-policy/](https://processmechanics.com/2015/07/23/a-model-ip-and-open-source-contribution-policy/)
 * [https://blog.docker.com/2014/01/docker-code-contributions-require-developer-certificate-of-origin/](https://blog.docker.com/2014/01/docker-code-contributions-require-developer-certificate-of-origin/)
-* [https://www.joyent.com/blog/broadening-node-js-contributions](https://www.joyent.com/blog/broadening-node-js-contributions) 
+* [https://www.joyent.com/blog/broadening-node-js-contributions](https://www.joyent.com/blog/broadening-node-js-contributions)
diff --git a/_content/getting-started/preparing.md b/getting-started/preparing.md
similarity index 96%
rename from _content/getting-started/preparing.md
rename to getting-started/preparing.md
index e0c001a7a47..2c9bb9948b3 100644
--- a/_content/getting-started/preparing.md
+++ b/getting-started/preparing.md
@@ -1,4 +1,8 @@
-# **Preparing for launch**
+---
+title: Preparing for launch
+previous: getting-started/branding.md
+next: marketing/index.md
+---
 
 You’re almost ready to launch your project! In this section, we’ll talk about what to include in an open source project before releasing it to the world.
 
@@ -87,25 +91,20 @@ Sometimes, it will take a long time before people notice your open source projec
 
 * Licenses
   * [https://github.com/blog/1530-choosing-an-open-source-license](https://github.com/blog/1530-choosing-an-open-source-license)
-  * [http://choosealicense.com](http://choosealicense.com) 
+  * [http://choosealicense.com](http://choosealicense.com)
 * READMEs
   * [http://tom.preston-werner.com/2010/08/23/readme-driven-development.html](http://tom.preston-werner.com/2010/08/23/readme-driven-development.html)
   * [https://github.com/matiassingers/awesome-readme](https://github.com/matiassingers/awesome-readme)
   * [https://pages.18f.gov/open-source-guide/making-readmes-readable/](https://pages.18f.gov/open-source-guide/making-readmes-readable/)
   * [https://changelog.com/a-beginners-guide-to-creating-a-readme/](https://changelog.com/a-beginners-guide-to-creating-a-readme/)
-  * [https://gist.github.com/jxson/1784669](https://gist.github.com/jxson/1784669) 
+  * [https://gist.github.com/jxson/1784669](https://gist.github.com/jxson/1784669)
 * Contributing guides
   * [https://github.com/blog/1184-contributing-guidelines](https://github.com/blog/1184-contributing-guidelines)
-  * [http://www.contribution-guide.org/](http://www.contribution-guide.org/) 
-  * [https://github.com/nayafia/contributing-template](https://github.com/nayafia/contributing-template) 
+  * [http://www.contribution-guide.org/](http://www.contribution-guide.org/)
+  * [https://github.com/nayafia/contributing-template](https://github.com/nayafia/contributing-template)
   * [http://mozillascience.github.io/working-open-workshop/contributing/](http://mozillascience.github.io/working-open-workshop/contributing/)
 * Codes of conduct
-  * [http://contributor-covenant.org/](http://contributor-covenant.org/) 
-  * [https://github.com/django/code-of-conduct](https://github.com/django/code-of-conduct) 
-  * [https://adainitiative.org/2014/02/18/howto-design-a-code-of-conduct-for-your-community/](https://adainitiative.org/2014/02/18/howto-design-a-code-of-conduct-for-your-community/) 
+  * [http://contributor-covenant.org/](http://contributor-covenant.org/)
+  * [https://github.com/django/code-of-conduct](https://github.com/django/code-of-conduct)
+  * [https://adainitiative.org/2014/02/18/howto-design-a-code-of-conduct-for-your-community/](https://adainitiative.org/2014/02/18/howto-design-a-code-of-conduct-for-your-community/)
   * [https://github.com/docker/docker/blob/master/CONTRIBUTING.md#docker-community-guidelines/](https://github.com/docker/docker/blob/master/CONTRIBUTING.md#docker-community-guidelines/)
-
-
-[Previous](branding.md) | [Next](../marketing/index.md)
-
-
diff --git a/_content/getting-started/setting-expectations.md b/getting-started/setting-expectations.md
similarity index 97%
rename from _content/getting-started/setting-expectations.md
rename to getting-started/setting-expectations.md
index bbf1fe6a3f1..6d575bfa8a0 100644
--- a/_content/getting-started/setting-expectations.md
+++ b/getting-started/setting-expectations.md
@@ -1,4 +1,7 @@
-# Setting expectations
+---
+title: Setting expectations
+next: getting-started/branding.md
+---
 
 There are many reasons to open source a project. It’s a good idea to figure out yours before going public with your project. What you want to get out of the experience will guide how you manage your project and help you figure out where to say yes (and no!).
 
@@ -36,7 +39,7 @@ If you’re hoping to get feedback on something you’ve created, consider askin
 
 ## Figure out what others need from you
 
-Finally, open sourcing a project is a two-way street. People who use your project will probably ask you for things, too. 
+Finally, open sourcing a project is a two-way street. People who use your project will probably ask you for things, too.
 
 Try to anticipate these needs beforehand so you can add them to your project from the beginning. Successful open source projects try to document as much as they can in public. Much like reusable pieces of code, reusable information means less people need to ask you the same questions over and over again. (That means less work for you!)
 
@@ -60,5 +63,3 @@ We’ll also use these answers in the next section, as you consider the brand of
 
 * http://mozillascience.github.io/working-open-workshop/personas_pathways/
 * http://tom.preston-werner.com/2010/08/23/readme-driven-development.html
-
-[Previous](index.md) | [Next](branding.md)
diff --git a/_content/index.md b/index.md
similarity index 91%
rename from _content/index.md
rename to index.md
index 3f62a5a5081..efc8b3f71ba 100644
--- a/_content/index.md
+++ b/index.md
@@ -1,4 +1,7 @@
-# Welcome
+---
+title: Welcome
+next: getting-started/index.md
+---
 
 Welcome to the Open Source Handbook! We created this handbook to help creators like you successfully release and grow your projects.
 
diff --git a/_content/marketing/building-community.md b/marketing/building-community.md
similarity index 98%
rename from _content/marketing/building-community.md
rename to marketing/building-community.md
index 46509155fc1..b3bff2bb5f4 100644
--- a/_content/marketing/building-community.md
+++ b/marketing/building-community.md
@@ -1,4 +1,7 @@
-# **Building a Community**
+---
+title: Building a community
+next: marketing/measuring.md
+---
 
 You’ve launched your project, you’re spreading the word, and people are checking out your project. Awesome! Now, how do you get them to stick around? In this section, we’ll discuss ways to encourage people to use, contribute to, and evangelize your project.
 
@@ -54,13 +57,10 @@ You’re doing great so far! Now that you’re promoting your project and growin
 
 ### Further reading
 
-* [http://radek.io/2015/10/12/marketing-for-open-source-projects-5/](http://radek.io/2015/10/12/marketing-for-open-source-projects-5/) 
+* [http://radek.io/2015/10/12/marketing-for-open-source-projects-5/](http://radek.io/2015/10/12/marketing-for-open-source-projects-5/)
 
-* [http://hood.ie/blog/welcoming-communities.html](http://hood.ie/blog/welcoming-communities.html) 
+* [http://hood.ie/blog/welcoming-communities.html](http://hood.ie/blog/welcoming-communities.html)
 
 * [https://ashfurrow.com/blog/building-popular-projects/](https://ashfurrow.com/blog/building-popular-projects/)
 
-* [http://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/](http://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/) 
-
-
-[Previous](spreading-word.md) | [Next](measuring.md)
+* [http://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/](http://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
diff --git a/_content/marketing/index.md b/marketing/index.md
similarity index 80%
rename from _content/marketing/index.md
rename to marketing/index.md
index c19dfeadc99..7acc76cbde0 100644
--- a/_content/marketing/index.md
+++ b/marketing/index.md
@@ -1,7 +1,8 @@
-# **Marketing your project**
+---
+title: Marketing your project
+next: marketing/spreading-word.md
+---
 
 This section of the handbook will help you spread the word about your project and grow your initial community of users and contributors. If you’re looking for feedback on your project, or want people to use and share your work, this part is for you.
 
 Remember, reaching your audience takes time. It may take months or years for you to grow a community around your project. Don’t give up! It’s all part of the process.
-
-[Previous](../getting-started/preparing.md) | [Next](spreading-word.md)
diff --git a/_content/marketing/measuring.md b/marketing/measuring.md
similarity index 97%
rename from _content/marketing/measuring.md
rename to marketing/measuring.md
index a647f3f2cb5..a781a68a35b 100644
--- a/_content/marketing/measuring.md
+++ b/marketing/measuring.md
@@ -1,4 +1,6 @@
-# **Measuring Success**
+---
+title: Measuring Success
+---
 
 Your project is starting to grow.🌱 Well, you think it’s growing. Is it growing? In this section, we’ll talk about how to measure and track the success of your open source project.
 
@@ -54,11 +56,11 @@ Here are a few types of contributor metrics you may want to regularly keep track
 
 ### Further reading
 
-* [http://blog.smartbear.com/news/measuring-success-in-an-open-source-project/](http://blog.smartbear.com/news/measuring-success-in-an-open-source-project/) 
+* [http://blog.smartbear.com/news/measuring-success-in-an-open-source-project/](http://blog.smartbear.com/news/measuring-success-in-an-open-source-project/)
 
-* [https://opensource.com/business/16/6/pirate-metrics](https://opensource.com/business/16/6/pirate-metrics) 
+* [https://opensource.com/business/16/6/pirate-metrics](https://opensource.com/business/16/6/pirate-metrics)
 
-* [https://speakerdeck.com/mikemcquaid/the-open-source-contributor-funnel](https://speakerdeck.com/mikemcquaid/the-open-source-contributor-funnel) 
+* [https://speakerdeck.com/mikemcquaid/the-open-source-contributor-funnel](https://speakerdeck.com/mikemcquaid/the-open-source-contributor-funnel)
 
 * [https://github.com/blog/2195-the-shape-of-open-source](https://github.com/blog/2195-the-shape-of-open-source)
 
diff --git a/_content/marketing/spreading-word.md b/marketing/spreading-word.md
similarity index 97%
rename from _content/marketing/spreading-word.md
rename to marketing/spreading-word.md
index f1fa0539469..a644d6f13ca 100644
--- a/_content/marketing/spreading-word.md
+++ b/marketing/spreading-word.md
@@ -1,4 +1,7 @@
-# **Spreading the word**
+---
+title: Spreading the word
+next: marketing/building-community.md
+---
 
 You’ve just published your project–what’s next? It’s time to tell everybody about your hard work!
 
@@ -44,19 +47,17 @@ Spreading the word is an important step in growing the popularity of your projec
 
 In the next section, we’ll talk about how to retain those early enthusiasts and grow an engaged community around your project.
 
-[Previous](index.md) | [Next](building-community.md)
-
 ### Footnotes
 
-[1] [https://news.ycombinator.com/item?id=7531689](https://news.ycombinator.com/item?id=7531689) 
+[1] [https://news.ycombinator.com/item?id=7531689](https://news.ycombinator.com/item?id=7531689)
 
 [2] [https://github.com/swinton/codeconf/blob/master/the-hashicorp-formula-to-open-source.md](https://github.com/swinton/codeconf/blob/master/the-hashicorp-formula-to-open-source.md)
 
 ### Further reading
 
-* [https://hacks.mozilla.org/2013/05/how-to-spread-the-word-about-your-code/](https://hacks.mozilla.org/2013/05/how-to-spread-the-word-about-your-code/) 
+* [https://hacks.mozilla.org/2013/05/how-to-spread-the-word-about-your-code/](https://hacks.mozilla.org/2013/05/how-to-spread-the-word-about-your-code/)
 
-* [https://zachholman.com/posts/open-source-marketing/](https://zachholman.com/posts/open-source-marketing/) 
+* [https://zachholman.com/posts/open-source-marketing/](https://zachholman.com/posts/open-source-marketing/)
 
 * [http://readwrite.com/2014/10/10/open-source-marketing-apache-storm-nathan-merz/](http://readwrite.com/2014/10/10/open-source-marketing-apache-storm-nathan-merz/)
 
diff --git a/test/helper.rb b/test/helper.rb
index a52b522b2c8..8f522361386 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -15,8 +15,8 @@ def config
   Helper.config ||= Jekyll.configuration("source" => source)
 end
 
-def content
-  site.collections['content'].docs.map { |doc| doc.to_liquid }
+def pages
+  site.pages.map { |doc| doc.to_liquid }
 end
 
 def site
diff --git a/test/lint_test.rb b/test/lint_test.rb
index ce7355bbd89..fb17ade9ad5 100644
--- a/test/lint_test.rb
+++ b/test/lint_test.rb
@@ -2,7 +2,7 @@
 
 describe "lint test" do
 
-  content.each do |page|
+  pages.each do |page|
 
     describe page["path"] do
 
@@ -26,10 +26,12 @@
           it "#{name} should be of type #{attrs["type"]}" do
             assert_kind_of Kernel.const_get(attrs["type"]), @data[name] if @data[name]
           end if attrs["type"]
-
-          it "#{name} has valid attributes" do
-          end
         end
+
+        it "`next` points to a page that exists" do
+          assert pages.detect {|p| p["path"] == page["next"] },
+            "Could not find page with path #{page["next"]}"
+        end if page["next"]
       end
     end
   end

From ec26dacf1ddc37beb45a2ca8d80ee5c366292c9a Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 11:10:20 -0500
Subject: [PATCH 04/10] Allow bootstrap to run without vendored gems

---
 .gitignore       | 3 +++
 _config.yml      | 2 ++
 script/bootstrap | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b242b82b882..653d0b0d144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 .DS_Store
 .jekyll-metadata
 _site/
+.bundle
+bin
+vendor
diff --git a/_config.yml b/_config.yml
index 2493fc4888e..7bb0deb670d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,12 +1,14 @@
 baseurl: "/open-source-handbook"
 
 exclude:
+  - bin
   - docs
   - Gemfile*
   - Rakefile
   - README.md
   - script
   - test
+  - vendor
 
 permalink: /:path/
 
diff --git a/script/bootstrap b/script/bootstrap
index 19667e454d3..599f07e2e7d 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -5,5 +5,5 @@ export CC=gcc
 
 echo "==> Installing gem dependencies…"
 bundle check --path vendor/gems 2>&1 > /dev/null || {
-  time bundle install --binstubs bin --path vendor/gems --local --quiet
+  time bundle install --binstubs bin --path vendor/gems
 }

From a2acf05e13669c50f50b1493aa6e91e9e983b61e Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 11:10:48 -0500
Subject: [PATCH 05/10] Minimal CONTRIBUTING doc to get started

---
 CONTRIBUTING.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000..27d72641bff
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+# Contributing
+
+## Running the site locally
+
+This site is powered by [Jekyll](jekyllrb.com). Running it on your local machine requires a working [Ruby](https://www.ruby-lang.org/en/) installation with [Bundler](http://bundler.io/).
+
+Once you have that set up, run:
+
+    script/bootstrap
+    script/server
+
+…and open http://localhost:4000 in our web browser.

From f367d397e29e44d777dbd4506ed4c617c7a50ae0 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 11:18:33 -0500
Subject: [PATCH 06/10] Remove `previous` field

---
 _data/fields.yml             | 3 ---
 getting-started/preparing.md | 1 -
 2 files changed, 4 deletions(-)

diff --git a/_data/fields.yml b/_data/fields.yml
index 17d3413979e..b5b19857661 100644
--- a/_data/fields.yml
+++ b/_data/fields.yml
@@ -5,6 +5,3 @@ title:
 
 next:
   type: String
-
-previous:
-  type: String
diff --git a/getting-started/preparing.md b/getting-started/preparing.md
index 2c9bb9948b3..b2219f7cc24 100644
--- a/getting-started/preparing.md
+++ b/getting-started/preparing.md
@@ -1,6 +1,5 @@
 ---
 title: Preparing for launch
-previous: getting-started/branding.md
 next: marketing/index.md
 ---
 

From 2035c05a21a7a90b366fe94c20e210efedf1c73c Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 11:24:33 -0500
Subject: [PATCH 07/10] Add script/test

---
 script/test | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100755 script/test

diff --git a/script/test b/script/test
new file mode 100755
index 00000000000..f8fd975cc1e
--- /dev/null
+++ b/script/test
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+bundle exec rake

From d1571608dfbd3c19aeaa9492b5672c1b3aa88b26 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 11:42:21 -0500
Subject: [PATCH 08/10] Add script/cibuild for the robots

---
 script/cibuild | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 script/cibuild

diff --git a/script/cibuild b/script/cibuild
new file mode 100755
index 00000000000..24e3857f083
--- /dev/null
+++ b/script/cibuild
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+script/bootstrap
+script/test

From 80c3a0f8e6a8f63323ec897ac673e1dbd4069c74 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 11:44:31 -0500
Subject: [PATCH 09/10] ENV vars to satisify the robots

---
 script/cibuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/cibuild b/script/cibuild
index 24e3857f083..b52a68ab80e 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -2,5 +2,10 @@
 
 set -e
 
+export RBENV_VERSION="2.1.7-github"
+# clean out the ruby environment
+export RUBYLIB=
+export RUBYOPT=
+
 script/bootstrap
 script/test

From 003ab355a02991ed48e8fc2593f907caba4bdcb8 Mon Sep 17 00:00:00 2001
From: Brandon Keepers <bkeepers@github.com>
Date: Tue, 9 Aug 2016 11:45:55 -0500
Subject: [PATCH 10/10] rbenv, for the robots, obviously

---
 script/cibuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/cibuild b/script/cibuild
index b52a68ab80e..ecb1ca01868 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -2,6 +2,7 @@
 
 set -e
 
+export PATH="/usr/share/rbenv/shims:$PATH"
 export RBENV_VERSION="2.1.7-github"
 # clean out the ruby environment
 export RUBYLIB=