project-open-data
diff --git a/Diff for: ‎_config.yml
+4-4 b/Diff for: ‎_config.yml
+4-4
diff --git a/Diff for: ‎_includes/header.html
+9-7 b/Diff for: ‎_includes/header.html
+9-7
diff --git a/Diff for: ‎federal-awards-faq.md
+36-36 b/Diff for: ‎federal-awards-faq.md
+36-36
diff --git a/Diff for: ‎glossary.md
+36-36 b/Diff for: ‎glossary.md
+36-36
diff --git a/Diff for: ‎implementation-guide.md
+5-5 b/Diff for: ‎implementation-guide.md
+5-5
diff --git a/Diff for: ‎licenses.md
+2-3 b/Diff for: ‎licenses.md
+2-3
diff --git a/Diff for: ‎licensing-resources.md
+1-1 b/Diff for: ‎licensing-resources.md
+1-1
@@ -1,13 +1,13 @@
 #document settings
 title: Project Open Data
 desc: "Open Data Policy — Managing Information as an Asset"
-url: https://project-open-data.cio.gov/
-repo_name: project-open-data.github.io
-branch: master
+url: https://project-open-data.cio.gov
 
 #global settings, no need to change these
 root_url: https://project-open-data.cio.gov
 org_name: project-open-data
+repo_name: project-open-data.github.io
+branch: master
 
 # default build settings for running locally, no need to edit
 pymgemnts: true
@@ -16,4 +16,4 @@ markdown: kramdown
 relative_permalinks: false
 
 gems:
-  - jekyll-redirect-from
+  - jekyll-redirect-from
@@ -15,8 +15,10 @@
   <link rel="stylesheet" href="/assets/css/bootstrap.css">
   <link rel="stylesheet" href="/assets/css/site.css">
 
+  <link rel="canonical" href="{{ site.url }}{{ page.url }}" />
+
   {% 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]>
@@ -49,22 +51,22 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Definitions<span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu">
               <li><a href="/v1.1/schema">Metadata Schema v1.1</a></li>
-              <li><a href="/glossary">Open Data Glossary</a></li>              
+              <li><a href="/glossary">Open Data Glossary</a></li>
               <li><a href="/open-standards">Data Standards</a></li>
               <li><a href="/principles">Open Data Principles </a></li>
               <li><a href="/open-licenses">Open Licenses</a></li>
             </ul>
-          </li>     
+          </li>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Guidance<span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu">
               <li><a href="/policy-memo">Policy - OMB M-13-13</a></li>
               <li><a href="/implementation-guide">Implementation Guide</a></li>
-              <li><a href="/catalog">Public Data Listing</a></li> 
-              <li><a href="http://goals.performance.gov/opendata">Open Data CAP Goal</a></li>              
-              <li><a href="/faq">FAQ</a></li>          
+              <li><a href="/catalog">Public Data Listing</a></li>
+              <li><a href="http://goals.performance.gov/opendata">Open Data CAP Goal</a></li>
+              <li><a href="/faq">FAQ</a></li>
             </ul>
-          </li>               
+          </li>
           <li><a href="https://github.com/{{ site.org_name }}/{{ site.repo_name }}/issues">Discuss</a></li>
         </ul>
       </div><!--/.nav-collapse -->
 
@@ -19,7 +19,7 @@ The purpose of this guidance is to provide additional clarification and detailed
 4. Document if data cannot be released
 5. Clarify roles and responsibilities for promoting efficient and effective data release
 
-Agencies will establish an open data infrastructure by implementing this guidance and Memorandum [M-13-13](/policy-memo) and taking advantage of the resources provided on [Project Open Data](http://project-open-data.github.io).    Once established, agencies will continue to evolve the infrastructure by identifying and adding new data assets<sup>[1](#footnote-1)</sup>,  enriching the description of those data assets through improved metadata, and increasing the amount of data shared with other agencies and the public.  
+Agencies will establish an open data infrastructure by implementing this guidance and Memorandum [M-13-13](/policy-memo) and taking advantage of the resources provided on [Project Open Data](/).    Once established, agencies will continue to evolve the infrastructure by identifying and adding new data assets<sup>[1](#footnote-1)</sup>,  enriching the description of those data assets through improved metadata, and increasing the amount of data shared with other agencies and the public.
 
 At a minimum, a successful open data infrastructure must:
 
@@ -29,7 +29,7 @@ At a minimum, a successful open data infrastructure must:
 
 The “access level” categories described in this document are intended to be used for organizational purposes within agencies and to reflect decisions already made in agencies about whether data assets can be made public; simply marking data assets “public” cannot substitute for the analysis necessary to ensure the data can be made public. Agencies are reminded that this underlying data from the inventory may only be released to the public after a full analysis of privacy, confidentiality, security, and other valid restrictions pertinent to law and policy.
 
-This guidance seeks to balance the need to establish clear and meaningful expectations for agencies to meet, while allowing sufficient flexibility on the approach each agency may take to address their own unique needs.  This guidance also includes references to other OMB memoranda that relate to the management of information.  Agencies should refer to the definitions included in the attachment in [OMB Memorandum M-13-13](/policy-memo) *Open Data Policy-Managing Information as an Asset*.  
+This guidance seeks to balance the need to establish clear and meaningful expectations for agencies to meet, while allowing sufficient flexibility on the approach each agency may take to address their own unique needs.  This guidance also includes references to other OMB memoranda that relate to the management of information.  Agencies should refer to the definitions included in the attachment in [OMB Memorandum M-13-13](/policy-memo) *Open Data Policy-Managing Information as an Asset*.
 
 This guidance introduces an Enterprise Data Inventory framework to provide agencies with improved clarity on specific actions to be taken and minimum requirements to be met.  It also provides OMB with a rubric by which to evaluate compliance and progress toward the objectives laid out in the Open Data Policy.  Following the November 30, 2013 deadline, agencies shall report progress on a quarterly basis, and performance will be tracked through the Open Data Cross-Agency Priority (CAP) Goal. Meeting the requirements of this guidance will ensure agencies are putting in place a basic infrastructure for inventorying, managing, and opening up data to unlock the value created by opening up information resources.
 
@@ -109,7 +109,7 @@ To improve the discoverability and usability of data assets, all federal agencie
 
 Agencies, at their discretion, may choose to include entries for non-public data assets in their Public Data Listings, taking into account guidance in section D. For example, an agency may choose to list data assets with an ‘accessLevel’ of ‘restricted public’ to make the public aware of their existence and the process by which these data may be obtained.
 
-Agencies’ Public Data Listings will be used to dynamically populate the newly renovated Data.gov, the main website to find data assets generated and held by the U.S. Government.  Data.gov allows anyone from the public to find, download, and use government data.  The upcoming re-launch of Data.gov (currently in beta at next.data.gov) will automatically aggregate the agency-managed Public Data Listings into one centralized location, using the Project Open Data metadata standards and tagging to improve the user ability to find and use government data.  
+Agencies’ Public Data Listings will be used to dynamically populate the newly renovated Data.gov, the main website to find data assets generated and held by the U.S. Government.  Data.gov allows anyone from the public to find, download, and use government data.  The upcoming re-launch of Data.gov (currently in beta at next.data.gov) will automatically aggregate the agency-managed Public Data Listings into one centralized location, using the Project Open Data metadata standards and tagging to improve the user ability to find and use government data.
 
 The objectives of this activity are to:
 
@@ -135,7 +135,7 @@ The objectives of this activity are to:
 ### C. Create a Process to Engage With Customers to Help Facilitate and Prioritize Data Release
 
 #### Purpose
-Identifying and engaging with key data customers to help determine the value of federal data assets can help agencies prioritize those of highest value for quickest release. Data customers include public as well as government stakeholders<sup>[17](#footnote-17)</sup>.  All Federal Agencies will be required to engage public input and reflect on how to incorporate customer feedback into their data management practices. Agencies may develop criteria at their discretion for prioritizing the opening of data assets, accounting for a range of factors, such as the quantity and quality of user demand, internal management priorities, and agency mission relevance. As customer feedback mechanisms and internal prioritization criteria will likely evolve over time and vary across agencies, agencies should share successful innovations in incorporating customer feedback through interagency working groups and Project Open Data to disseminate best practices. Agencies should regularly review the evolving customer feedback and public engagement strategy.  
+Identifying and engaging with key data customers to help determine the value of federal data assets can help agencies prioritize those of highest value for quickest release. Data customers include public as well as government stakeholders<sup>[17](#footnote-17)</sup>.  All Federal Agencies will be required to engage public input and reflect on how to incorporate customer feedback into their data management practices. Agencies may develop criteria at their discretion for prioritizing the opening of data assets, accounting for a range of factors, such as the quantity and quality of user demand, internal management priorities, and agency mission relevance. As customer feedback mechanisms and internal prioritization criteria will likely evolve over time and vary across agencies, agencies should share successful innovations in incorporating customer feedback through interagency working groups and Project Open Data to disseminate best practices. Agencies should regularly review the evolving customer feedback and public engagement strategy.
 
 The objectives of this activity are to:
 
@@ -163,7 +163,7 @@ The objectives of this activity are to:
 ### D. Document if Data Cannot be Released
 
 #### Purpose
-The Open Data Policy requires agencies to strengthen and develop policies and processes to ensure that only the appropriate data are made available publicly.  Agencies should work with their Senior Agency Official for Privacy and other relevant officials to ensure a complete analysis of issues that could preclude public disclosure of information collected or created.  If the agency determines the data should not be made publicly available because of law, regulation, or policy or because the data are subject to privacy, confidentiality, security, trade secret, contractual, or other valid restrictions to release, agencies must document the determination in consultation with their Office of General Counsel or equivalent. The agency should designate one of three “access levels” for each data asset listed in the inventory: public, restricted public, and non-public.  The descriptions of these categories can be found below and on Project Open Data.  
+The Open Data Policy requires agencies to strengthen and develop policies and processes to ensure that only the appropriate data are made available publicly.  Agencies should work with their Senior Agency Official for Privacy and other relevant officials to ensure a complete analysis of issues that could preclude public disclosure of information collected or created.  If the agency determines the data should not be made publicly available because of law, regulation, or policy or because the data are subject to privacy, confidentiality, security, trade secret, contractual, or other valid restrictions to release, agencies must document the determination in consultation with their Office of General Counsel or equivalent. The agency should designate one of three “access levels” for each data asset listed in the inventory: public, restricted public, and non-public.  The descriptions of these categories can be found below and on Project Open Data.
 
 The objectives of this activity are to:
 
 
@@ -6,7 +6,7 @@ redirect_from: /license-examples/
 filename: licenses.md
 ---
 
-The [Federal Open Data Policy](https://project-open-data.cio.gov/policy-memo/#c-ensure-information-stewardship-through-the-use-of-open-licenses) states: *"Agencies must apply open licenses, in consultation with the best practices found in Project Open Data, to information as it is collected or created so that if data are made public there are no restrictions on copying, publishing, distributing, transmitting, adapting, or otherwise using the information for non-commercial or for commercial purposes."* 
+The [Federal Open Data Policy](https://project-open-data.cio.gov/policy-memo/#c-ensure-information-stewardship-through-the-use-of-open-licenses) states: *"Agencies must apply open licenses, in consultation with the best practices found in Project Open Data, to information as it is collected or created so that if data are made public there are no restrictions on copying, publishing, distributing, transmitting, adapting, or otherwise using the information for non-commercial or for commercial purposes."*
 
 As described below, works created by U.S. Government employees within the scope of their employment default to U.S. Public Domain. However, works produced by outside parties which are created or obtained for use by the U.S. Government may need open licenses applied to them: *"When information is acquired or accessed by an agency through performance of a contract, appropriate existing clauses <sup>[22](https://acquisition.gov/far/current/html/Subpart%2027_4.html)</sup> shall be utilized to meet these objectives"*
 
@@ -18,7 +18,7 @@ For the purposes of Project Open Data, the term "Open License" is used to refer
 
 * *Reuse*. The license must allow for reproductions, modifications and derivative works and permit their distribution under the terms of the original work. The rights attached to the work must not depend on the work being part of a particular package. If the work is extracted from that package and used or distributed within the terms of the work’s license, all parties to whom the work is redistributed should have the same rights as those that are granted in conjunction with the original package.
 
-* *Redistribution*. The license shall not restrict any party from selling or giving away the work either on its own or as part of a package made from works from many different sources. The license shall not require a royalty or other fee for such sale or distribution. The license may require as a condition for the work being distributed in modified form that the resulting work carry a different name or version number from the original work. The rights attached to the work must apply to all to whom it is redistributed without the need for execution of an additional license by those parties.  The license must not place restrictions on other works that are distributed along with the licensed work. For example, the license must not insist that all other works distributed on the same medium are open. If adaptations of the work are made publicly available, these must be under the same license terms as the original work. 
+* *Redistribution*. The license shall not restrict any party from selling or giving away the work either on its own or as part of a package made from works from many different sources. The license shall not require a royalty or other fee for such sale or distribution. The license may require as a condition for the work being distributed in modified form that the resulting work carry a different name or version number from the original work. The rights attached to the work must apply to all to whom it is redistributed without the need for execution of an additional license by those parties.  The license must not place restrictions on other works that are distributed along with the licensed work. For example, the license must not insist that all other works distributed on the same medium are open. If adaptations of the work are made publicly available, these must be under the same license terms as the original work.
 
 * *No Discrimination against Persons, Groups, or Fields of Endeavor*. The license must not discriminate against any person or group of persons. The license must not restrict anyone from making use of the work in a specific field of endeavor. For example, it may not restrict the work from being used in a business, or from being used for research.
 
@@ -52,4 +52,3 @@ When agencies purchase data or content from third-party vendors, care must be ta
 * *[Copyright and Other Rights Pertaining to U.S. Government Works](http://www.usa.gov/copyright.shtml)*
 * *[Licensing Policies, Principles, and Resources: Examples of how government has addressed open licensing questions](https://project-open-data.cio.gov/licensing-resources/)*
 * *[Extended list of conformant licenses](http://opendefinition.org/licenses/)*
-
@@ -71,7 +71,7 @@ This Source Code Policy, forked from the DoD/CFPB policy, includes a new "Commun
 An educational resource for government employees and government contractors to understand the policies and legal issues relating to the use of open source software in the DoD.  Much of the information collected there is applicable to other Federal agencies.   The FAQ covers a range of issues, including:  DoD policy on OSS, general information about OSS, OSS licenses, release of government software as OSS, and OSS-like approaches used within the Federal government.
 * [Working Version of the FAQs](http://risacher.github.io/DoD-OSS-FAQ/)
 
-###[How to FOSS Your Government Project](http://bit.ly/HowToFOSS)
+###[How to FOSS Your Government Project](https://bit.ly/HowToFOSS)
 *National Security Agency & DoD CIO*
 
 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.