merging path fix from #387

CONTRIBUTING.md

@@ -10,11 +10,11 @@ Contributions can be made, primarily in two ways:
 
 ### Easy
 
-1. Browse the content at http://project-open-data.github.io/
-2. Click the "Improve this content" button in the top right corner of any page
-3. Make changes as you would normally
+1. Browse the content at http://project-open-data.github.io/.
+2. Click the "Improve this content" button in the top right corner of any page.
+3. Make changes as you would normally.
 4. Click "Submit".
-5. You change should appear once approved.
+5. Your change(s) should appear once approved.
 
 *Note: You may need to [create a free GitHub account](https://github.com/signup/free) if you do not already have one*
 
@@ -25,7 +25,7 @@ Contributions can be made, primarily in two ways:
 3. Make changes as you would normally using the tools installed in step #1.
 4. Push the changes back to your fork
 5. Submitting a pull request to this repository
-6. You change should appear once approved.
+6. Your change(s) should appear once approved.
 
 ## Running Locally
 

Gemfile.lock

@@ -2,45 +2,112 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    blankslate (2.1.2.4)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.1)
+      fast-stemmer (~> 1.0)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
     colorator (0.1)
-    commander (4.1.5)
-      highline (~> 1.6.11)
-    directory_watcher (1.4.1)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
-    github-pages (1)
+    ffi (1.9.3)
+    gemoji (2.1.0)
+    github-pages (25)
       RedCloth (= 4.2.9)
-      jekyll (= 1.1.2)
-      kramdown (= 1.0.2)
-      liquid (= 2.5.1)
-      maruku (= 0.6.1)
-      rdiscount (= 1.6.8)
-      redcarpet (= 2.2.2)
-    highline (1.6.19)
-    jekyll (1.1.2)
-      classifier (~> 1.3)
+      jekyll (= 2.3.0)
+      jekyll-coffeescript (= 1.0.0)
+      jekyll-mentions (= 0.1.3)
+      jekyll-redirect-from (= 0.6.0)
+      jekyll-sass-converter (= 1.2.0)
+      jekyll-sitemap (= 0.6.0)
+      jemoji (= 0.3.0)
+      kramdown (= 1.3.1)
+      liquid (= 2.6.1)
+      maruku (= 0.7.0)
+      pygments.rb (= 0.6.0)
+      rdiscount (= 2.1.7)
+      redcarpet (= 3.1.2)
+    hitimes (1.2.2)
+    html-pipeline (1.9.0)
+      activesupport (>= 2)
+      nokogiri (~> 1.4)
+    i18n (0.6.11)
+    jekyll (2.3.0)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      directory_watcher (~> 1.4.1)
-      kramdown (~> 1.0.2)
-      liquid (~> 2.5.1)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.5.0)
-      redcarpet (~> 2.2.2)
-      safe_yaml (~> 0.7.0)
-    kramdown (1.0.2)
-    liquid (2.5.1)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.5.2)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-mentions (0.1.3)
+      html-pipeline (~> 1.9.0)
+      jekyll (~> 2.0)
+    jekyll-paginate (1.0.0)
+    jekyll-redirect-from (0.6.0)
+      jekyll (~> 2.0)
+    jekyll-sass-converter (1.2.0)
+      sass (~> 3.2)
+    jekyll-sitemap (0.6.0)
+    jekyll-watch (1.1.1)
+      listen (~> 2.7)
+    jemoji (0.3.0)
+      gemoji (~> 2.0)
+      html-pipeline (~> 1.9)
+      jekyll (~> 2.0)
+    json (1.8.1)
+    kramdown (1.3.1)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    maruku (0.7.0)
+    mercenary (0.3.4)
+    mini_portile (0.6.0)
+    minitest (5.4.1)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rdiscount (1.6.8)
-    redcarpet (2.2.2)
-    safe_yaml (0.7.1)
-    syntax (1.0.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdiscount (2.1.7)
+    redcarpet (3.1.2)
+    safe_yaml (1.0.3)
+    sass (3.4.3)
+    thread_safe (0.3.4)
+    timers (4.0.0)
+      hitimes
+    toml (0.1.1)
+      parslet (~> 1.5.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     yajl-ruby (1.1.0)
 
 PLATFORMS

_includes/header.html

@@ -11,12 +11,12 @@
 
   <title>{{ page.title }} - {{ site.title }}</title>
 
+  <link rel="shortcut icon" href="/favicon.ico"/>
   <link rel="stylesheet" href="/assets/css/bootstrap.css">
   <link rel="stylesheet" href="/assets/css/site.css">
 
-
-
-  {% capture edit_url %}https://github.com/{{ site.org_name }}/{{ site.repo_name }}/edit/{{ site.branch }}/{{ page.filename }}{% endcapture %}
+  {% capture edit_url %}https://github.com/{{ site.org_name }}/{{ site.repo_name }}/edit/{{ site.branch }}/{{ page.path }}{% endcapture %}
+
 </head>
 <body class="{{ page.id }}">
   <!--[if lt IE 7]>

api-basics.md

@@ -24,7 +24,7 @@ APIs have been around since the 1980s, when they were used in hardware and softw
 
 ### How government agencies are using APIs
 
-DigitalGov University has recorded a [variety of courses](http://www.howto.gov/training/classes#apis-and-data) on how APIs can be used by government organizations and made them available online.
+DigitalGov University has recorded a [variety of courses](http://18f.github.io/API-All-the-X/pages/education) on how APIs can be used by government organizations and made them available online.
 
 
 ### First Mover
@@ -61,15 +61,15 @@ Many of these pioneers have shaped the way in which we develop, deploy, consume,
 
 APIs are driven by a set of specific technologies, making them easily understood by developers.  This type of focus means that APIs can work with any common programming language, with the most popular approach to delivering web APIs being REST, or [REpresentational State Transfer](http://en.wikipedia.org/wiki/Representational_state_transfer).
 
-REST takes advantage of the same Internet mechanisms that are used to view regular web pages, giving it many advantages, that can result in faster implementations and easier for developers to understand and use. REST APIs allow you to take data and functionality that may already be available on your website and make them available through a programmatic API, that both web and mobile applications can use. Then, instead of returning HTML to represent the information like a website would, an API returns data in one of two possible formats:
-* [Extensible Markup Language (XML)](http://en.wikipedia.org/wiki/Xml)
-* [JavaScript Object Notation (JSON)](http://en.wikipedia.org/wiki/JSON)
+REST takes advantage of the same Internet mechanisms that are used to view regular web pages, giving it many advantages, that can result in faster implementations and easier for developers to understand and use. REST APIs allow you to take data and functionality that may already be available on your website and make them available through a programmatic API, that both web and mobile applications can use. Then, instead of returning HTML to represent the information like a website would, an API returns data in one of two possible formats:  
+* [Extensible Markup Language (XML)](http://en.wikipedia.org/wiki/Xml)  
+* [JavaScript Object Notation (JSON)](http://en.wikipedia.org/wiki/JSON)  
 
 Developers can then take this data and use in web and mobile applications.  However XML and JSON are easily consumed by spreadsheets and other tools non-developers can use as well, making APIs accessible by potentially anyone.  
 
-Easy access to all this data and resources is great, but sometimes we need to control access to APIs. There are two primary ways to secure an API by providing  authentication using:
-* [Basic Auth](http://en.wikipedia.org/wiki/Basic_auth)
-* [OAuth](http://en.wikipedia.org/wiki/Oauth)
+Easy access to all this data and resources is great, but sometimes we need to control access to APIs. There are two primary ways to secure an API by providing  authentication using:  
+* [Basic Auth](http://en.wikipedia.org/wiki/Basic_auth)  
+* [OAuth](http://en.wikipedia.org/wiki/Oauth)  
 
 REST with JSON has become the favorite of developers and API owners, because it is easier to both deploy and consume than other implementations. Even though REST + JSON is not a standard, it is seeing wide acceptance across the industry.
 

assets/css/site.css

@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Roboto+Slab:400,700|Noto+Sans:400,700);
+@import url(//fonts.googleapis.com/css?family=Roboto+Slab:400,700|Noto+Sans:400,700);
 
 body {
   font-family: "Noto Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -766,9 +766,3 @@ span.field-required-if-applicable {
     padding-top:0;
   }
 }
-@media (min-width: 980px) {
-  body {
-    background: url("../img/seal.jpg") no-repeat fixed 80% 90% transparent;
-    padding: 0;
-  }
-}

data-hubs.md

@@ -21,7 +21,7 @@ filename: data-hubs.md
 
 ### [Department of Education](http://www.ed.gov/data)
 * [Federal Student Aid Data Center](http://studentaid.ed.gov/data-center)
-* [Office of Civil Rghts](http://ocrdata.ed.gov/)
+* [Office of Civil Rights](http://ocrdata.ed.gov/)
 
 ### [Department of Energy](http://www.energy.gov/data)
 * [Atmospheric Radiation Measurement - Climate Research Facility](http://www.arm.gov/data)

engagement.md

@@ -48,7 +48,7 @@ Good [Morning/afternoon],
 
 On behalf of [host], and in collaboration with [co-hosts], I would like to invite you to a Data Jam. Please save the date for [date] in [location].
 
-This Data Jam will bring entrepreneurs, technology leaders, and policy experts together to explore and discuss new ideas for private-sector tools, services, and apps designed to improve value, affordability, and outcomes in postsecondary education.
+This Data Jam will bring entrepreneurs, technology leaders, and policy experts together to explore and discuss new ideas for private-sector tools, services, and apps designed to improve value, affordability, and outcomes in [topic].
 
 [Host] will be sending further information in the coming days, but if you are interested in participating, please RSVP or send questions to [Email address for logistics]. This invitation is non-transferrable.
 

implementation-guide.md

@@ -82,8 +82,8 @@ Project Open Data provides metadata requirements, additional optional metadata f
 ### Minimum Requirements to Create and Maintain an Enterprise Data Inventory
 
 #### Develop and Submit to OMB an Inventory Schedule (by November 30, 2013)
-* Describe how the agency will ensure that all data assets from each bureau and program in the agency have been identified and accounted for in the Inventory, to the extent practicable, no later than November 1, 2014.  
-* Describe how the agency plans to expand, enrich, and open their Inventory each quarter through November 1, 2014 at a minimum; include a summary and milestones in the schedule.<sup>[10](#footnote-10)</sup>
+* Describe how the agency will ensure that all data assets from each bureau and program in the agency have been identified and accounted for in the Inventory, to the extent practicable, no later than November 30, 2014.  
+* Describe how the agency plans to expand, enrich, and open their Inventory each quarter through November 30, 2014 at a minimum; include a summary and milestones in the schedule.<sup>[10](#footnote-10)</sup>
 * Publish Inventory Schedule on the www.\[agency\].gov/digitalstrategy page by November 30, 2013.<sup>[11](#footnote-11)</sup>
 
 #### Create an Enterprise Data Inventory (by November 30, 2013)
@@ -158,7 +158,7 @@ The objectives of this activity are to:
 **Tools and Resources on Project Open Data**
 
 * Data “Kickstart” Plug-in
-* [GSA’s Innovation Center](http://gsablogs.gsa.gov/dsic/)  API Resources
+* [GSA’s API Resources](http://18f.github.io/API-All-the-X/)
 
 ### D. Document if Data Cannot be Released
 

index.md

@@ -64,7 +64,7 @@ This section is a list of ready-to-use solutions or tools that will help agencie
 
 4-5 [PDF Filler](https://github.com/project-open-data/pdf-filler) - PDF Filler is a RESTful service (API) to aid in the completion of existing PDF-based forms and empower web developers to use browser-based forms and modern web standards to facilitate the collection of information. - *[Hosted](http://labs.data.gov/pdf-filler)*
 
-4-6 [Catalog Generator](https://github.com/project-open-data/catalog-generator) - Multi-format tool to generate and maintain agency.gov/data catalog files. - *[Hosted](http://data.civicagency.org/datagov/csv_to_json)* *[Alternative](http://project-open-data.github.com/catalog-generator/)*
+4-6 [Catalog Generator](http://labs.data.gov/dashboard/datagov/csv_to_json) - Multi-format tool to generate and maintain agency.gov/data catalog files. - *[Alternative](http://project-open-data.github.com/catalog-generator/)*
 
 4-7 A data.json validator can help you check compliance with the POD schema. - *[Hosted](http://data.civicagency.org/validate)*
 
@@ -169,8 +169,8 @@ An event where developers, designers, and strategists work in teams to solve pro
 **Goal:** To build relationships with the tech community and to see immediate tools and prototypes.
 
 ### Online Community
-A website, social networking group and/or email mailing list where people who use open data congregate to offer feedback, tips, new uses or reuses, data requests or case studies.
-*Ex: Data.gov communities, NICAR/IRE, Code for America and Sunlight Foundation email listserv, Open Government Facebook and Google+ groups*
+A website, social networking group and/or listserv where people who use open data congregate to offer feedback, tips, new uses or reuses, data requests or case studies.
+*Ex: Listservs for [NICAR](http://www.ire.org/resource-center/listservs/subscribe-nicar-l/), Code for America, Sunlight Foundation, the Open Government Facebook and Google+ groups*
 
 **Goal:** To build and sustain ongoing relationships with media, nonprofits, good government advocates and civic technologists
 

metadata-resources.md

@@ -132,7 +132,7 @@ The mapping is from the POD field to the XPATH(s) in the common metadata schema
 
 ###FGDC CSDGM
 
-Established by Office of Management and Budget Circular A-16, the Federal Geographic Data Committee ([FGDC](ttp://www.fgdc.gov)) promotes the coordinated development, use, sharing, and dissemination of geographic data. 
+Established by Office of Management and Budget Circular A-16, the Federal Geographic Data Committee ([FGDC](http://www.fgdc.gov)) promotes the coordinated development, use, sharing, and dissemination of geographic data. 
 The [Content Standard for Digital Geospatial Metadata](http://www.fgdc.gov/metadata/csdgm) aims to provide a common set of terminology and definitions for the documentation of digital geospatial data.
 
 {: .table .table-striped}

policy-docs.md

@@ -21,7 +21,7 @@ This section offers examples of policy documents (memos, guidance, manuals, etc)
 * Department of Education, [Data Standardization Policies and Procedures](http://federalstudentaid.ed.gov/static/gw/docs/ciolibrary/ECONOPS_Docs/DataStandardizationPolicies&Procedures.pdf).  The purpose of this document, released in 2007, is to describe policies and procedures for data standardization and data exchange in Federal Student Aid.
 * Department of Energy, [Atmospheric Radiation Measurement (ARM) Data Sharing and Distribution Policy](http://www.arm.gov/data/docs/policy).  This document sets expectations and establishes procedures for sharing data acquired in through the operations of Atmospheric Radiation Measurement (ARM) Climate Research Facility.
 * Los Alamos National Laboratory, [GISLab Data Policy](http://gislab.lanl.gov/policies/data_policy.html).  GISLab has established a spatial data warehouse to provide for access to spatial data at LANL. The GISLab spatial data policy specifies provisions for both data providers and data users. 
-
+* United States Agency for International Development, [Open Data Policy](http://pdf.usaid.gov/pdf_docs/pbaab096.pdf).  The document, released in October 2014, sets forth the agency's plan for data management.  
 
 ## Guidance