Merge branch 'master' of github.com:project-open-data/project-open-data.github.io

Author: Rebecca Williams

Diff for: CONTRIBUTING.md

@@ -4,14 +4,14 @@
 
 ## How to Contribute
 
-This project constitutes a collaborative work ("open source"). Federal employees and members of the public are encouraged to improve the project by contributing. For more information, please see [the FAQ](/faq/)
+This project constitutes a collaborative work ("open source"). Federal employees and members of the public are encouraged to improve the project by contributing. For more information, please see [the FAQ](https://project-open-data.cio.gov/faq/)
 
 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.
+1. Browse the content at https://project-open-data.cio.gov/.
+2. Click the "Edit this Page" button in the top right corner of any page.
 3. Make changes as you would normally.
 4. Click "Submit".
 5. Your change(s) should appear once approved.

Diff for: Gemfile.lock

@@ -2,47 +2,53 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     blankslate (2.1.2.4)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    classifier-reborn (2.0.1)
+    classifier-reborn (2.0.3)
       fast-stemmer (~> 1.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.0)
     colorator (0.1)
-    execjs (2.2.1)
+    execjs (2.3.0)
     fast-stemmer (1.0.2)
-    ffi (1.9.3)
+    ffi (1.9.6)
     gemoji (2.1.0)
-    github-pages (25)
+    github-pages (33)
       RedCloth (= 4.2.9)
-      jekyll (= 2.3.0)
-      jekyll-coffeescript (= 1.0.0)
-      jekyll-mentions (= 0.1.3)
-      jekyll-redirect-from (= 0.6.0)
+      github-pages-health-check (~> 0.2)
+      jekyll (= 2.4.0)
+      jekyll-coffeescript (= 1.0.1)
+      jekyll-mentions (= 0.2.1)
+      jekyll-redirect-from (= 0.6.2)
       jekyll-sass-converter (= 1.2.0)
-      jekyll-sitemap (= 0.6.0)
-      jemoji (= 0.3.0)
-      kramdown (= 1.3.1)
+      jekyll-sitemap (= 0.6.3)
+      jemoji (= 0.4.0)
+      kramdown (= 1.5.0)
       liquid (= 2.6.1)
       maruku (= 0.7.0)
-      pygments.rb (= 0.6.0)
+      mercenary (~> 0.3)
+      pygments.rb (= 0.6.1)
       rdiscount (= 2.1.7)
       redcarpet (= 3.1.2)
+      terminal-table (~> 1.4)
+    github-pages-health-check (0.2.1)
+      net-dns (~> 0.6)
+      public_suffix (~> 1.4)
     hitimes (1.2.2)
     html-pipeline (1.9.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
-    i18n (0.6.11)
-    jekyll (2.3.0)
+    i18n (0.7.0)
+    jekyll (2.4.0)
       classifier-reborn (~> 2.0)
       colorator (~> 0.1)
       jekyll-coffeescript (~> 1.0)
@@ -57,58 +63,61 @@ GEM
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.0)
+    jekyll-coffeescript (1.0.1)
       coffee-script (~> 2.2)
     jekyll-gist (1.1.0)
-    jekyll-mentions (0.1.3)
+    jekyll-mentions (0.2.1)
       html-pipeline (~> 1.9.0)
       jekyll (~> 2.0)
-    jekyll-paginate (1.0.0)
-    jekyll-redirect-from (0.6.0)
+    jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.6.2)
       jekyll (~> 2.0)
     jekyll-sass-converter (1.2.0)
       sass (~> 3.2)
-    jekyll-sitemap (0.6.0)
-    jekyll-watch (1.1.1)
+    jekyll-sitemap (0.6.3)
+    jekyll-watch (1.2.1)
       listen (~> 2.7)
-    jemoji (0.3.0)
+    jemoji (0.4.0)
       gemoji (~> 2.0)
       html-pipeline (~> 1.9)
       jekyll (~> 2.0)
-    json (1.8.1)
-    kramdown (1.3.1)
+    json (1.8.2)
+    kramdown (1.5.0)
     liquid (2.6.1)
-    listen (2.7.9)
+    listen (2.8.5)
       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)
+    mercenary (0.3.5)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    net-dns (0.8.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     posix-spawn (0.3.9)
-    pygments.rb (0.6.0)
+    public_suffix (1.4.6)
+    pygments.rb (0.6.1)
       posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.1.0)
+      yajl-ruby (~> 1.2.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)
+    safe_yaml (1.0.4)
+    sass (3.4.11)
+    terminal-table (1.4.5)
     thread_safe (0.3.4)
-    timers (4.0.0)
+    timers (4.0.1)
       hitimes
-    toml (0.1.1)
+    toml (0.1.2)
       parslet (~> 1.5.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yajl-ruby (1.1.0)
+    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby

Diff for: _config.yml

@@ -1,16 +1,19 @@
 #document settings
 title: Project Open Data
 desc: "Open Data Policy — Managing Information as an Asset"
-url: //project-open-data.cio.gov/
+url: https://project-open-data.cio.gov/
 repo_name: project-open-data.github.io
 branch: master
 
 #global settings, no need to change these
-root_url: //project-open-data.cio.gov
+root_url: https://project-open-data.cio.gov
 org_name: project-open-data
 
 # default build settings for running locally, no need to edit
 pymgemnts: true
 exclude: ["script", "vendor", "Gemfile", "Gemfile.lock", "config.ru", "Procfile", "Rakefile", "readme.md"]
 markdown: kramdown
 relative_permalinks: false
+
+gems:
+  - jekyll-redirect-from

Diff for: _includes/footer.html

@@ -13,11 +13,10 @@
     </div>
   </div><!-- /container -->
 
- 
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-  <script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-1.11.1.min.js"><\/script>')</script>
+
+  <script src="/assets/js/vendor/jquery-1.11.1.min.js"></script>
   <script src="/assets/js/bootstrap.min.js"></script>
-  
+
 
 
 </body>

Diff for: assets/css/site.css

@@ -179,6 +179,7 @@ table tr td:nth-child(1) {
 table tr td code {
     display: inline-block;
     word-wrap: break-word;
+    word-break: break-word;
 }
 
 table + table {
@@ -269,7 +270,9 @@ span.field-required-if-applicable {
     font-weight : normal;
 }
 
-
+.table-breakall tr td:nth-child(6) {
+  word-break : break-all;
+}
 
 
 /* icons */

Diff for: catalog.md

@@ -78,14 +78,15 @@ Version 1.1 Update
 In the year since the release of the Open Data Policy, agencies and the public have suggested several updates to the metadata schema.  In the interest of stability, these updates have been tied together into a methodical update to a version 1.1 of the metadata schema.  Each issue has been rigorously discussed in its own issue thread and at the [July government-wide offsite session](https://github.com/project-open-data/project-open-data.github.io/issues/325) dedicated to this update.  
 
 ####Changes
-* [Changelog for the version 1.1 schema](http://project-open-data.civicagency.org/metadata-changelog/).
+* [Changelog for the version 1.1 schema](/metadata-changelog/).
 *  These updates have been managed through [issues in a single milestone](https://github.com/project-open-data/project-open-data.github.io/milestones/Next%20Version%20of%20Common%20Core%20Metadata%20Schema%20(1.0%20-%3E%201.1.)).  Each issue within the milestone contains the related discussion and a link to the proposed edits.  
 * The proposed edits can also be found bundled in [this combined pull request](https://github.com/project-open-data/project-open-data.github.io/pull/357).
 
-####Preview
-* [Updated Metadata Schema v 1.1 Diagram](https://github.com/project-open-data/project-open-data.github.io/blob/metadata-v-1.1/v1.1/schema-diagram.svg)
-* [Preview of the new updated metadata schema page](http://project-open-data.civicagency.org/v1.1/schema/).  
-* [Example data.json file with the version 1.1 schema](https://gist.github.com/philipashlock/21ff607527863fba200b). 
+####Resources
+* [New updated metadata schema page](/v1.1/schema/). 
+* [Field mapping from v1.0 to v1.1 schema](/v1.1/metadata-resources/#field-mappings).
+* [Updated Metadata Schema v 1.1 Diagram](/v1.1/metadata-resources/#schema-object-model-diagram).
+* [Sample data.json files with the version 1.1 schema](/v1.1/metadata-resources/#sample-data-files). 
 
 ####Guidance
 

Diff for: chief-data-officers.md

@@ -0,0 +1,34 @@
+---
+layout: default
+title: Chief Data Officers
+permalink: /chief-data-officers/
+redirect_from: /chiefdataofficers/
+filename: chief-data-officers.md
+---
+
+Chief Data Officers
+-----------------------------
+The Chief Data Officer is an emerging role in US federal government. 
+
+{: .table .table-striped}
+CFO Act Agencies                                |  Chief Data Officer                 
+--------------                                  | --------------        
+Department of Agriculture                       | Bobby Jones, Acting
+Department of Commerce                          | Lynn Overmann, Deputy CDO 
+Department of Defense                           |
+Department of Education                         |
+Department of Energy                            | Dave Dutton
+Department of Health and Human Services         |
+Department of Homeland Security                 |
+Department of Housing and Urban Development     |
+Department of Justice                           |
+Department of Labor                             |
+Department of State                             |
+Department of the Interior                      |                
+Department of the Treasury                      |
+Department of Transportation                    | Daniel Morgan                  
+Department of Veterans Affairs                  |
+Environmental Protection Agency                 |
+General Services Administration                 | Kris Rowley
+National Aeronautics and Space Administration   |                
+National Science Foundation                     |