fix merge

Author: James McKinney

Diff for: .travis.yml

@@ -0,0 +1,2 @@
+language: ruby
+script: "jekyll build"

Diff for: Gemfile

@@ -1,10 +1,11 @@
 source "https://rubygems.org"
 
-gem "jekyll"
-gem "RedCloth"
-gem "sinatra"
-gem "sinatra-index"
-gem "rake"
-gem "sinatra_auth_github"
-gem "foreman"
-gem "redcarpet"
+# for latest versions, see:
+# https://help.github.com/articles/using-jekyll-with-pages#troubleshooting
+
+gem "jekyll",     '=1.0.2'
+gem 'liquid',     '=2.5.0'
+gem 'redcarpet',  '=2.2.2'
+gem 'maruku',     '=0.6.1'
+gem 'rdiscount',  '=1.6.8'
+gem 'RedCloth',   '=4.2.9'

Diff for: Gemfile.lock

@@ -2,86 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    addressable (2.3.4)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
     colorator (0.1)
     commander (4.1.3)
       highline (~> 1.6.11)
     directory_watcher (1.4.1)
-    dotenv (0.7.0)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
     fast-stemmer (1.0.2)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
-    hashie (2.0.4)
     highline (1.6.18)
-    jekyll (1.0.1)
+    jekyll (1.0.2)
       classifier (~> 1.3)
       colorator (~> 0.1)
       commander (~> 4.1.3)
       directory_watcher (~> 1.4.1)
-      kramdown (~> 0.14)
+      kramdown (~> 1.0.2)
       liquid (~> 2.3)
       maruku (~> 0.5)
-      pygments.rb (~> 0.4.2)
+      pygments.rb (~> 0.5.0)
       safe_yaml (~> 0.7.0)
-    kramdown (0.14.2)
+    kramdown (1.0.2)
     liquid (2.5.0)
     maruku (0.6.1)
       syntax (>= 1.0.0)
-    multi_json (1.7.3)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.24.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
     posix-spawn (0.3.6)
-    pygments.rb (0.4.2)
+    pygments.rb (0.5.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.5.2)
-    rack-protection (1.5.0)
-      rack
-    rake (10.0.4)
+    rdiscount (1.6.8)
     redcarpet (2.2.2)
     safe_yaml (0.7.1)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-index (0.0.2)
-      sinatra
-    sinatra_auth_github (0.13.3)
-      sinatra (~> 1.0)
-      warden-github (~> 0.13.1)
     syntax (1.0.0)
-    thor (0.18.1)
-    tilt (1.4.0)
-    warden (1.2.1)
-      rack (>= 1.0)
-    warden-github (0.13.2)
-      octokit (>= 1.22.0)
-      warden (> 1.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth
-  foreman
-  jekyll
-  rake
-  redcarpet
-  sinatra
-  sinatra-index
-  sinatra_auth_github
+  RedCloth (= 4.2.9)
+  jekyll (= 1.0.2)
+  liquid (= 2.5.0)
+  maruku (= 0.6.1)
+  rdiscount (= 1.6.8)
+  redcarpet (= 2.2.2)

Diff for: README.md

@@ -1,5 +1,7 @@
 # Project Open Data
 
+[![Build Status](https://travis-ci.org/project-open-data/project-open-data.github.io.png?branch=master)](https://travis-ci.org/project-open-data/project-open-data.github.io)
+
 ## Problem this Solves
 
 Technology moves much faster than policy ever could.  Often when writing policy for technology, agencies are stuck w/ outdated methods as soon as they publish new policies.

Diff for: _config.yml

@@ -8,7 +8,7 @@ branch: master
 #global settings, no need to change these
 root_url: http://project-open-data.github.io
 org_name: project-open-data
-prose_url: http://project-open-data.github.io/contribute/
+prose_url: http://prose.io
 
 # default build settings for running locally, no need to edit
 pymgemnts: true

Diff for: cdo-position-description.md

@@ -99,7 +99,7 @@ The CDO is responsible for data reform and modernization--how the agency collect
 
 ### What the CDO Is Not
 
-The CDO is the Agency’s Chief Privacy Officer. That responsibility is held by the CIO. 
+The CDO is not the Agency’s Chief Privacy Officer. That responsibility is held by the CIO. 
 
 The  CDO is not responsible for the security of information. That responsibility is held by the CISO.
 
@@ -134,4 +134,4 @@ Below is a bullet list of and example data dream team for a medium sized agency.
 *	A senior DBA or dedicated time from DBA to manage the Enterprise Information Catalog, to assist with proper data documentation and management and to interface smoothly with agency’s DBA
 *	Scalable computing resources for the processing and data mining
 *	Project management and/or COTR resource to keep project reporting and contract management inline with Agency policy
-*	Dotted-line reporting of procurement assistance for managing data purchases
+*	Dotted-line reporting of procurement assistance for managing data purchases

Diff for: faq.md

@@ -29,7 +29,7 @@ This project constitutes a collaborative work ("open source"). Federal employees
 1. Click the "Improve this content" button in the top right corner of any page.
 2. Make changes as you would normally.
 3. Click "Submit."
-4. You change should appear, once approved.
+4. Your change should appear, once approved.
 
 *Note: You will need to [create a free GitHub account](https://github.com/signup/free) if you do not already have one.*
 
@@ -40,7 +40,7 @@ This project constitutes a collaborative work ("open source"). Federal employees
 3. Make changes as you would normally using the tools installed in step #1.
 4. Push the changes back to your fork.
 5. Submit a pull request to this repository.
-6. You change should appear once it's approved.
+6. Your change should appear once it's approved.
 
 *Note: All contributors retain the original copyright to their contribution, but by contributing to this project, you grant a world-wide, royalty-free, perpetual, irrevocable, non-exclusive, transferable license to all users under the terms of the license(s) under which this project is distributed.*
 
@@ -56,7 +56,7 @@ Anyone – Federal employees, contractors, developers, the general public – ca
 
 ### Are my interactions to this project subject to any special privacy considerations?
 
-Comments, pull requests, and any other messages received through this repository may be subject to the [Presidential Records Act](http://www.archives.gov/about/laws/presidential-records.html), and may be archived. Learn more at [http://WhiteHouse.gov/privacy](http://WhiteHouse.gov/privacy).
+Comments, pull requests, and any other messages received through this repository may be subject to the [Presidential Records Act](http://www.archives.gov/about/laws/presidential-records.html), and may be archived. Learn more at [http://whitehouse.gov/privacy](http://whitehouse.gov/privacy).
 
 ### Who is in charge of Project Open Data?  
 

Diff for: index.md

@@ -8,7 +8,7 @@ title: Project Open Data
 
 Data is a valuable national resource and a strategic asset to the U.S. Government, its partners, and the public.  Managing this data as an asset and making it available, discoverable, and usable – [in a word, open](principles/) – not only strengthens our democracy and promotes efficiency and effectiveness in government, but also has the potential to create economic opportunity and improve citizens’ quality of life. 
 
-For example, when the U.S. Government released weather and GPS data to the public, it fueled an industry that today is valued at over $90 billion. Now, weather and mapping tools are ubiquitous and help everyday Americans [navigate their lives](business-case/). 
+For example, when the U.S. Government released weather and GPS data to the public, it fueled an industry that today is valued at tens of billions of dollars per year. Now, weather and mapping tools are ubiquitous and help everyday Americans [navigate their lives](business-case/). 
 
 The ultimate value of data can often not be predicted. That’s why the U.S. Government released a [policy](policy-memo/) that instructs agencies to manage their data, and information more generally, as an asset from the start and, wherever possible, release it to the public in a way that makes it open, discoverable, and usable. 
 

Diff for: metadata-resources.md

@@ -11,29 +11,29 @@ This section provides further background and resources to assist agencies in imp
 
 <table width="60%">
 <b><tr><td><ul>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-template.json">JSON</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-template.html">RDFa Lite</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-template.csv">CSV</a></li>
+<li><a href="/examples/catalog-template.json">JSON</a></li>
+<li><a href="/examples/catalog-template.html">RDFa Lite</a></li>
+<li><a href="/examples/catalog-template.csv">CSV</a></li>
 </ul></td>
 <td><ul>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-template-extended.json">JSON (Extended)</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-template-extended.html">RDFa Lite (Extended)</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-template-extended.csv">CSV (Extended)</a></li>
+<li><a href="/examples/catalog-template-extended.json">JSON (Extended)</a></li>
+<li><a href="/examples/catalog-template-extended.html">RDFa Lite (Extended)</a></li>
+<li><a href="/examples/catalog-template-extended.csv">CSV (Extended)</a></li>
 </ul></td></tr></b>
 </table>
 
 ### Sample Data Files
 
 <table width="60%">
 <b><tr><td><ul>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-sample.json">JSON</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-sample.html">RDFa Lite</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-sample.csv">CSV</a></li>
+<li><a href="/examples/catalog-sample.json">JSON</a></li>
+<li><a href="/examples/catalog-sample.html">RDFa Lite</a></li>
+<li><a href="/examples/catalog-sample.csv">CSV</a></li>
 </ul></td>
 <td><ul>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-sample-extended.json">JSON (Extended)</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-sample-extended.html">RDFa Lite (Extended)</a></li>
-<li><a href="https://raw.github.com/project-open-data/project-open-data.github.io/gh-pages/examples/catalog-sample-extended.csv">CSV (Extended)</a></li>
+<li><a href="/examples/catalog-sample-extended.json">JSON (Extended)</a></li>
+<li><a href="/examples/catalog-sample-extended.html">RDFa Lite (Extended)</a></li>
+<li><a href="/examples/catalog-sample-extended.csv">CSV (Extended)</a></li>
 </ul></td></tr></b>
 </table>
 

Diff for: principles.md

@@ -9,11 +9,11 @@ In general, open data will be consistent with the following principles:
 
 * *Public.* Consistent with OMB’s Open Government Directive, agencies must adopt a presumption in favor of openness to the extent permitted by law and subject to privacy, confidentiality, security, or other valid restrictions.  
 
-* *Accessible.* Open data are made available in convenient, modifiable, and open formats that can be retrieved, downloaded, indexed, and searched.  Formats should be machine-readable (i.e., data are reasonably structured to allow automated processing).  Open data structures do not discriminate against any person or group of persons and should be made available to the widest range of users for the widest range of purposes, often by providing the data in multiple formats for consumption.  To the extent permitted by law, these formats should be non-proprietary, publicly available, and no restrictions should be placed upon their use.
+* *Accessible.* Open data are made available in convenient, modifiable, and open formats that can be retrieved, downloaded, indexed, and searched.  Formats should be [machine-readable](/glossary/#machinereadable_file) (i.e., [data](/glossary/#data) are reasonably structured to allow automated processing).  Open data structures do not discriminate against any person or group of persons and should be made available to the widest range of users for the widest range of purposes, often by providing the data in multiple formats for consumption.  To the extent permitted by law, these formats should be non-proprietary, publicly available, and no restrictions should be placed upon their use.
 
 * *Described.* Open data are described fully so that consumers of the data have sufficient information to understand their strengths, weaknesses, analytical limitations, security requirements, as well as how to process them.  This involves the use of robust, granular metadata (i.e., fields or elements that describe data), thorough documentation of data elements, data dictionaries, and, if applicable, additional descriptions of the purpose of the collection, the population of interest, the characteristics of the sample, and the method of data collection.  
 
-* *Reusable.* Open data are made available under an open license that places no restrictions on their use.
+* *Reusable.* Open data are made available under an [open license](/open-licenses/) that places no restrictions on their use.
 
 * *Complete.* Open data are published in primary forms (i.e., as collected at the source), with the finest possible level of granularity that is practicable and permitted by law and other requirements.  Derived or aggregate open data should also be published but must reference the primary data.
 

Diff for: schema.md

@@ -308,7 +308,7 @@ Field       | title
 **Accepted Values** | See Usage Notes
 **Usage Notes** | Distribution is a concatenation, as appropriate, of the following elements: download url, format, endpoint, language, size.  An example of this this model is:  
 
-    "distribution": [`{"accessURL": "http://data.mcc.gov/example_resource/data.json", "format":"JSON", "size":"22mb"}`,`{"accessURL":"http://data.mcc.gov/example_/data.xml", "format":"XML", "size":"24mb"}`]  
+    "distribution": [`{"accessURL": "http://data.mcc.gov/example_resource/data.json", "format":"JSON", "size":"22MB"}`,`{"accessURL":"http://data.mcc.gov/example_/data.xml", "format":"XML", "size":"24MB"}`]  
 
 **Example** | -
 
@@ -318,8 +318,8 @@ Field       | title
 **Cardinality** | (0,n)
 **Required** | No
 **Accepted Values** | See Usage Notes
-**Usage Notes** | Sizes should be formatted as (e.g.), 52kb, 140mb, 2gb. 
-**Example** |  `{"size":"3mb"}`
+**Usage Notes** | Sizes should be formatted as (e.g.), 52kB, 140MB, 2GB. 
+**Example** |  `{"size":"3MB"}`
 
 {.table .table-striped}
 **Field** | **landingPage**