Skip to content
This repository was archived by the owner on Jun 18, 2024. It is now read-only.

Commit 109ac97

Browse files
committed
Merge branch 'master' into new-url
Conflicts: _config.yml schema.md
2 parents e0f59ae + 8790a24 commit 109ac97

13 files changed

+128
-92
lines changed

Diff for: CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Contributions can be made, primarily in two ways:
1010

1111
### Easy
1212

13-
1. Browse the content at http://project-open-data.github.io/.
14-
2. Click the "Improve this content" button in the top right corner of any page.
13+
1. Browse the content at https://project-open-data.cio.gov/.
14+
2. Click the "Edit this Page" button in the top right corner of any page.
1515
3. Make changes as you would normally.
1616
4. Click "Submit".
1717
5. Your change(s) should appear once approved.

Diff for: Gemfile.lock

+49-40
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,53 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
RedCloth (4.2.9)
5-
activesupport (4.1.5)
6-
i18n (~> 0.6, >= 0.6.9)
5+
activesupport (4.2.0)
6+
i18n (~> 0.7)
77
json (~> 1.7, >= 1.7.7)
88
minitest (~> 5.1)
9-
thread_safe (~> 0.1)
9+
thread_safe (~> 0.3, >= 0.3.4)
1010
tzinfo (~> 1.1)
1111
blankslate (2.1.2.4)
1212
celluloid (0.16.0)
1313
timers (~> 4.0.0)
14-
classifier-reborn (2.0.1)
14+
classifier-reborn (2.0.3)
1515
fast-stemmer (~> 1.0)
1616
coffee-script (2.3.0)
1717
coffee-script-source
1818
execjs
19-
coffee-script-source (1.8.0)
19+
coffee-script-source (1.9.0)
2020
colorator (0.1)
21-
execjs (2.2.1)
21+
execjs (2.3.0)
2222
fast-stemmer (1.0.2)
23-
ffi (1.9.3)
23+
ffi (1.9.6)
2424
gemoji (2.1.0)
25-
github-pages (25)
25+
github-pages (33)
2626
RedCloth (= 4.2.9)
27-
jekyll (= 2.3.0)
28-
jekyll-coffeescript (= 1.0.0)
29-
jekyll-mentions (= 0.1.3)
30-
jekyll-redirect-from (= 0.6.0)
27+
github-pages-health-check (~> 0.2)
28+
jekyll (= 2.4.0)
29+
jekyll-coffeescript (= 1.0.1)
30+
jekyll-mentions (= 0.2.1)
31+
jekyll-redirect-from (= 0.6.2)
3132
jekyll-sass-converter (= 1.2.0)
32-
jekyll-sitemap (= 0.6.0)
33-
jemoji (= 0.3.0)
34-
kramdown (= 1.3.1)
33+
jekyll-sitemap (= 0.6.3)
34+
jemoji (= 0.4.0)
35+
kramdown (= 1.5.0)
3536
liquid (= 2.6.1)
3637
maruku (= 0.7.0)
37-
pygments.rb (= 0.6.0)
38+
mercenary (~> 0.3)
39+
pygments.rb (= 0.6.1)
3840
rdiscount (= 2.1.7)
3941
redcarpet (= 3.1.2)
42+
terminal-table (~> 1.4)
43+
github-pages-health-check (0.2.1)
44+
net-dns (~> 0.6)
45+
public_suffix (~> 1.4)
4046
hitimes (1.2.2)
4147
html-pipeline (1.9.0)
4248
activesupport (>= 2)
4349
nokogiri (~> 1.4)
44-
i18n (0.6.11)
45-
jekyll (2.3.0)
50+
i18n (0.7.0)
51+
jekyll (2.4.0)
4652
classifier-reborn (~> 2.0)
4753
colorator (~> 0.1)
4854
jekyll-coffeescript (~> 1.0)
@@ -57,58 +63,61 @@ GEM
5763
redcarpet (~> 3.1)
5864
safe_yaml (~> 1.0)
5965
toml (~> 0.1.0)
60-
jekyll-coffeescript (1.0.0)
66+
jekyll-coffeescript (1.0.1)
6167
coffee-script (~> 2.2)
6268
jekyll-gist (1.1.0)
63-
jekyll-mentions (0.1.3)
69+
jekyll-mentions (0.2.1)
6470
html-pipeline (~> 1.9.0)
6571
jekyll (~> 2.0)
66-
jekyll-paginate (1.0.0)
67-
jekyll-redirect-from (0.6.0)
72+
jekyll-paginate (1.1.0)
73+
jekyll-redirect-from (0.6.2)
6874
jekyll (~> 2.0)
6975
jekyll-sass-converter (1.2.0)
7076
sass (~> 3.2)
71-
jekyll-sitemap (0.6.0)
72-
jekyll-watch (1.1.1)
77+
jekyll-sitemap (0.6.3)
78+
jekyll-watch (1.2.1)
7379
listen (~> 2.7)
74-
jemoji (0.3.0)
80+
jemoji (0.4.0)
7581
gemoji (~> 2.0)
7682
html-pipeline (~> 1.9)
7783
jekyll (~> 2.0)
78-
json (1.8.1)
79-
kramdown (1.3.1)
84+
json (1.8.2)
85+
kramdown (1.5.0)
8086
liquid (2.6.1)
81-
listen (2.7.9)
87+
listen (2.8.5)
8288
celluloid (>= 0.15.2)
8389
rb-fsevent (>= 0.9.3)
8490
rb-inotify (>= 0.9)
8591
maruku (0.7.0)
86-
mercenary (0.3.4)
87-
mini_portile (0.6.0)
88-
minitest (5.4.1)
89-
nokogiri (1.6.3.1)
90-
mini_portile (= 0.6.0)
92+
mercenary (0.3.5)
93+
mini_portile (0.6.2)
94+
minitest (5.5.1)
95+
net-dns (0.8.0)
96+
nokogiri (1.6.6.2)
97+
mini_portile (~> 0.6.0)
9198
parslet (1.5.0)
9299
blankslate (~> 2.0)
93100
posix-spawn (0.3.9)
94-
pygments.rb (0.6.0)
101+
public_suffix (1.4.6)
102+
pygments.rb (0.6.1)
95103
posix-spawn (~> 0.3.6)
96-
yajl-ruby (~> 1.1.0)
104+
yajl-ruby (~> 1.2.0)
97105
rb-fsevent (0.9.4)
98106
rb-inotify (0.9.5)
99107
ffi (>= 0.5.0)
100108
rdiscount (2.1.7)
101109
redcarpet (3.1.2)
102-
safe_yaml (1.0.3)
103-
sass (3.4.3)
110+
safe_yaml (1.0.4)
111+
sass (3.4.11)
112+
terminal-table (1.4.5)
104113
thread_safe (0.3.4)
105-
timers (4.0.0)
114+
timers (4.0.1)
106115
hitimes
107-
toml (0.1.1)
116+
toml (0.1.2)
108117
parslet (~> 1.5.0)
109118
tzinfo (1.2.2)
110119
thread_safe (~> 0.1)
111-
yajl-ruby (1.1.0)
120+
yajl-ruby (1.2.1)
112121

113122
PLATFORMS
114123
ruby

Diff for: _config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ pymgemnts: true
1414
exclude: ["script", "vendor", "Gemfile", "Gemfile.lock", "config.ru", "Procfile", "Rakefile", "readme.md"]
1515
markdown: kramdown
1616
relative_permalinks: false
17+
18+
gems:
19+
- jekyll-redirect-from

Diff for: _includes/footer.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
</div>
1414
</div><!-- /container -->
1515

16-
17-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
18-
<script>window.jQuery || document.write('<script src="/assets/js/vendor/jquery-1.11.1.min.js"><\/script>')</script>
16+
17+
<script src="/assets/js/vendor/jquery-1.11.1.min.js"></script>
1918
<script src="/assets/js/bootstrap.min.js"></script>
20-
19+
2120

2221

2322
</body>

Diff for: chief-data-officers.md

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
layout: default
3+
title: Chief Data Officers
4+
permalink: /chief-data-officers/
5+
redirect_from: /chiefdataofficers/
6+
filename: chief-data-officers.md
7+
---
8+
9+
Chief Data Officers
10+
-----------------------------
11+
The Chief Data Officer is an emerging role in US federal government.
12+
13+
{: .table .table-striped}
14+
CFO Act Agencies | Chief Data Officer
15+
-------------- | --------------
16+
Department of Agriculture | Bobby Jones, Acting
17+
Department of Commerce | Lynn Overmann, Deputy CDO
18+
Department of Defense |
19+
Department of Education |
20+
Department of Energy | Dave Dutton
21+
Department of Health and Human Services |
22+
Department of Homeland Security |
23+
Department of Housing and Urban Development |
24+
Department of Justice |
25+
Department of Labor |
26+
Department of State |
27+
Department of the Interior |
28+
Department of the Treasury |
29+
Department of Transportation | Daniel Morgan
30+
Department of Veterans Affairs |
31+
Environmental Protection Agency |
32+
General Services Administration | Kris Rowley
33+
National Aeronautics and Space Administration |
34+
National Science Foundation |

Diff for: chiefdataofficers.md

-27
This file was deleted.

Diff for: federal-awards-faq.md

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ filename: federal-awards-faq.md
77

88
---
99

10-
# Applying the Open Data Policy to Federal Awards
11-
1210
##Frequently Asked Questions
1311

1412
###[General Questions:](#general)

Diff for: index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ This section is a list of ready-to-use solutions or tools that will help agencie
6666

6767
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. -&nbsp;*[Hosted](http://labs.data.gov/pdf-filler)*
6868

69-
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/)*
69+
4-6 [Inventory.data.gov](https://inventory.data.gov/) - A data management tool to generate and maintain Enterprise Data Inventory and Public Data Listing JSON files. - *[How to Guide](https://www.digitalgov.gov/resources/inventory-data-gov-guide/)*
7070

7171
4-7 [Data.json validator](http://labs.data.gov/dashboard/validate) can help you check compliance with the POD schema.
7272

Diff for: licensing-resources.md

+10
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,15 @@ An educational resource for government employees and government contractors to u
7676

7777
A checklist developed at NSA to document the internal processes required to release government-developed software as open source software. It provides a detailed example for other agencies to use as a starting point. The original document contained a number of NSA-specific processes, the linked document is a "template" version that removes the specifics, and leaves just the outline and advisory material.
7878

79+
###[National Aeronautics and Space Administration ESDSWG Open Source Working Group](https://earthdata.nasa.gov/esdswg#OpenSourceWorkingGroup-MissionStatement)
80+
81+
The National Aeronuatics and Space Administration (NASA) Earth Science Data System Working Groups (ESDSWG) are chartered to
82+
provide recommendations and guidance to the NASA data center community (missions, archives, etc.) in Earth
83+
science including standards, technical infusion, recommendations in open source and software reuse and in
84+
big data. The Open Source Working Group within this organization promotes the consumption and production of
85+
open source software, processes, standards and governance models throughout NASA’s Earth Science Data Systems.
86+
Work includes recommendations of open source licenses for NASA software projects, and case studies and use
87+
cases of leveraging licenses in both the consumption and production of open source software.
88+
7989

8090

Diff for: schema.md

+14-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,21 @@ permalink: /schema/
66
filename: schema.md
77
id: schema
88
---
9-
9+
10+
11+
******************
12+
13+
14+
1015
{: .bg-warning .text-danger}
11-
***IMPORTANT NOTE***
12-
This version of the schema has been deprecated in favor of the [Project Open Data Metadata Schema v1.1](/v1.1/schema). Federal CFO-Act agencies are expected to complete the transition to the v1.1 schema by **February 1st, 2015**.
13-
16+
***IMPORTANT NOTE***
17+
This version of the schema has been deprecated in favor of the [Project Open Data Metadata Schema v1.1](/v1.1/schema). Federal CFO-Act agencies are expected to complete the transition to the v1.1 schema by **February 1st, 2015**.
18+
19+
20+
******************
21+
22+
23+
1424
This section contains guidance to support the use of the common core metadata to list agency datasets and application programming interfaces (APIs) as hosted at agency.gov/data.
1525

1626
Updates to the metadata schema can be found in the [changelog](/metadata-changelog). This is metadata version: 1.0 FINAL as of 9/20/13.

Diff for: standards.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ permalink: /open-standards/
55
filename: standards.md
66
---
77

8-
Consistent with existing agency responsibilities under [OMB Circular A-119] (http://www.whitehouse.gov/omb/circulars_a119) (Federal Participation in the Development and Use of Voluntary Consensus Standards and in Conformity Assessment Activities), and [M-12-08](http://www.whitehouse.gov/sites/default/files/omb/memoranda/2012/m-12-08.pdf), the use of consensus standards, specifications, and formats can be used to support open data objectives. OMB Circular A-119 states that voluntary consensus standards should be developed through a process that is defined by the following attributes:
8+
Consistent with existing agency responsibilities under [OMB Circular A-119](http://www.whitehouse.gov/omb/circulars_a119) (Federal Participation in the Development and Use of Voluntary Consensus Standards and in Conformity Assessment Activities), and [M-12-08](http://www.whitehouse.gov/sites/default/files/omb/memoranda/2012/m-12-08.pdf), the use of consensus standards, specifications, and formats can be used to support open data objectives. OMB Circular A-119 states that voluntary consensus standards should be developed through a process that is defined by the following attributes:
99

1010
* Openness
1111
* Balance of interest

Diff for: v1.1/api.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,38 @@ permalink: /v1.1/api/
66
filename: api.md
77
---
88

9-
Agencies should list private, internal, and public-facing web APIs as part of their Enterprise Data Inventory and Public Data Listing data.json files. The original v1.0 schema accommodated the listing of APIs with a separate `webServices` field, but with the [v1.1 schema](/v1.1/schema/), APIs should now be listed as a separate distribution within a dataset. Since an API provides indirect access to a dataset and the primary URL that a user needs in order to access the API is the API documentation, all web APIs should be referenced using the primary API documentation URL as an `accessURL` with the `format` specified as "API". The `downloadURL` and `mediaType` fields should be left empty for a distribution that describes an API, but if the raw data download that powers the API is also available (as it should be) then that should be specified using the `downloadURL` and `mediaType` of another distribution entry on the same dataset.
9+
Agencies should list private, internal, and public-facing web APIs as part of their Enterprise Data Inventory and Public Data Listing data.json files. The original v1.0 schema accommodated the listing of APIs with a separate `webServices` field, but with the [v1.1 schema](/v1.1/schema/), APIs should now be listed as a separate distribution within a dataset. Since an API provides indirect access to a dataset and the primary URL that a user needs in order to access the API is the API documentation, all web APIs should be referenced using the primary API documentation URL as an `accessURL` with the `format` specified as "API". The `downloadURL` and `mediaType` fields should be left empty for a distribution that describes an API, but if the raw data download that powers the API is also available (as it should be) then that should be specified using the `downloadURL` and `mediaType` of another distribution entry on the same dataset.
1010

1111
Machine Readable API Documentation
1212
--------------------------------------------------
1313

14-
For APIs that also have machine readable documentation (like [Swagger](https://github.com/swagger-api/swagger-spec#readme), [RAML](http://raml.org/), [API Blueprint](https://apiblueprint.org/), [HAL](http://stateless.co/hal_specification.html), [Hydra](http://www.w3.org/ns/hydra/spec/latest/core/), etc) it can be specified with `describedBy` and `describedByType`. The URL for the machine readable documentation should be specified by `describedBy` and `describedByType` should be a media type that identifies the format of the machine readable documentation.
14+
For APIs that also have machine readable documentation (like [Swagger](https://github.com/swagger-api/swagger-spec#readme), [RAML](http://raml.org/), [API Blueprint](https://apiblueprint.org/), [HAL](http://stateless.co/hal_specification.html), [Hydra](http://www.w3.org/ns/hydra/spec/latest/core/), etc) it can be specified with `describedBy` and `describedByType`. The URL for the machine readable documentation should be specified by `describedBy` and `describedByType` should be a media type that identifies the format of the machine readable documentation.
1515

1616
Media Types for Machine Readable API Documentation
1717
--------------------------------------------------
1818

19-
These media types should be used for the `describedByType` field along with the URL to the machine readable documentation itself using the `describedBy` field. This should not be confused with the `format` field which should be "API" for an API and `mediaType` which should be blank for an API.
19+
These media types should be used for the `describedByType` field along with the URL to the machine readable documentation itself using the `describedBy` field. This should not be confused with the `format` field which should be "API" for an API and `mediaType` which should be blank for an API.
2020

21-
* The media type for Swagger has been [proposed](https://github.com/wordnik/swagger-spec/issues/110) as `application/swagger+json`
21+
* The media type for Swagger has been [proposed](https://github.com/wordnik/swagger-spec/issues/110) as `application/swagger+json`
2222
* The media type for RAML has been [defined](http://raml.org/spec.html#overview) as `application/raml+yaml`
2323
* The media type for API Blueprint has been [defined](https://github.com/apiaryio/api-blueprint-ast#media-types) as `application/vnd.apiblueprint.ast` in abstract syntax tree form, plus others depending on the serialization
2424
* The media type for HAL has been [defined](http://stateless.co/hal_specification.html) as `application/hal+json` and `application/hal+xml` for the JSON and XML variants.
25-
* The media type for Hydra has been [proposed](http://www.w3.org/ns/hydra/spec/latest/core/#h3_adding-affordances-to-representations) as `application/ld+json` with `rel="http://www.w3.org/ns/hydra/core#apiDocumentation"` included in the `Link` HTTP header.
25+
* The media type for Hydra has been [proposed](http://www.w3.org/ns/hydra/spec/latest/core/#h3_adding-affordances-to-representations) as `application/ld+json` with `rel="http://www.w3.org/ns/hydra/core#apiDocumentation"` included in the `Link` HTTP header.
2626

2727
Reference Standardized API Specifications
2828
--------------------------------------------------
29-
Some APIs may implement a common standard such as WMS, WFS, or Open311. If this is an established standard, use the canonical URI for the standard as the value for the `conformsTo` field in the same distribution object where the API is listed.
29+
Some APIs may implement a common standard such as WMS, WFS, or Open311. If this is an established standard, use the canonical URI for the standard as the value for the `conformsTo` field in the same distribution object where the API is listed.
3030

3131
Example of an API listing in a data.json file
3232
--------------------------------------------------
3333
~~~~
3434
"distribution":
3535
{
36-
"accessURL": "http://www.agency.gov/api/vegetables/",
36+
"accessURL": "http://www.agency.gov/api/vegetables/",
3737
"description": "A fully queryable REST API with JSON and XML output",
38-
"describedBy": "http: //www.agency.gov/api/vegetables/swagger.json",
39-
"describedByType": "application/swagger+json",
40-
"format": "API",
38+
"describedBy": "http://www.agency.gov/api/vegetables/swagger.json",
39+
"describedByType": "application/swagger+json",
40+
"format": "API",
4141
"title": "Vegetables REST API"
4242
}
4343
]

Diff for: v1.1/schema/vcard.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"hasEmail": {
2626
"title": "Email",
2727
"description": "Email address for the contact",
28-
"pattern": "^mailto:([\\w.-]+@[\\w.-]+\\.[\\w.-]+)?$",
28+
"pattern": "^mailto:[\\w\\_\\~\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=\\:.-]+@[\\w.-]+\\.[\\w.-]+?$",
2929
"type": "string"
3030
}
3131
}

0 commit comments

Comments
 (0)