diff --git a/Gemfile b/Gemfile index aa47855..aa50f3b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,10 @@ source "https://rubygems.org" gem 'jekyll' -gem "redcarpet" -gem 'rouge' +#gem "redcarpet" +#gem 'rouge' gem 'bourbon' gem 'sass' gem 'neat' +gem 'jekyll-redirect-from' \ No newline at end of file diff --git a/README.md b/README.md index f526a37..6d903dd 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ -## Federal Source Code Policy -#### Achieving Efficiency, Transparency, and Innovation through Reusable and Open Source Software +### Public domain -The White House committed to adopting a Government-wide Open Source Software policy in its [Second Open Government National Action Plan](https://www.whitehouse.gov/sites/default/files/microsites/ostp/new_nap_commitments_report_092314.pdf) (NAP) that “will support improved access to custom software code developed for the Federal Government,” emphasizing that using and contributing back to open source software can fuel innovation, lower costs, and benefit the public. In light of that commitment, the [White House Office of Management and Budget (OMB)](https://www.whitehouse.gov/omb/) is accepting public comments on a draft policy to improve the way custom-developed Government code is acquired and distributed moving forward. +This website presents the official Federal Source Code Policy for the United States. It serves as a reference for government and the public. This site has been released and is under active development. -The proposed guidance is now open for public comment on this page. The public comment period will begin on March 10, 2016 and end on April 11, 2016. Following the public comment period, OMB will analyze all submitted feedback and revise the policy as necessary. -### Public domain +While the specifics of the policy have been finalized, contributions in the form of suggestions to improve the policy are welcome and can be shared via pull request or by opening an issue. Improvements to the site itself are also welcome. This project is in the worldwide [public domain](LICENSE.md): diff --git a/SourceCodePolicy.pdf b/SourceCodePolicy.pdf deleted file mode 100644 index 5f98e34..0000000 Binary files a/SourceCodePolicy.pdf and /dev/null differ diff --git a/_config.yml b/_config.yml index 7c513a5..b303e06 100644 --- a/_config.yml +++ b/_config.yml @@ -1,8 +1,8 @@ # markdown -markdown: redcarpet -redcarpet: - extensions: ["superscript","tables","with_toc_data","strikethrough","smart"] -highlighter: pygments +markdown: kramdown +#redcarpet: +# extensions: ["superscript","tables","with_toc_data","strikethrough","smart"] +#highlighter: pygments exclude: - ".ruby-version" @@ -20,7 +20,7 @@ exclude: - LICENSE.md # Site metadata -name: "Source Code Policy" +name: "Federal Source Code Policy" description: "Achieving Efficiency, Transparency, and Innovation through Reusable and Open Source Software" baseurl: https://sourcecode.cio.gov # Uncomment the following line for localhost development at http://127.0.0.1:4000/software/ @@ -34,27 +34,31 @@ branch: gh-pages # Navigation # List links that should appear in the site sidebar here navigation: -- text: Home - url: / - text: Introduction - url: /introduction/ -- text: Objectives + url: / +- text: 1 - Objectives url: /Objectives/ -- text: Scope and Applicability +- text: 2 - Scope and Applicability url: /Scope/ -- text: Software Procurement Considerations - url: /Procurement/ -- text: Government-Wide Code Reuse +- text: 3 - Three-Step Software Solutions Analysis + url: /Three-Step-Software-Solutions-Analysis/ +- text: 4 - Government-Wide Code Reuse url: /Reuse/ -- text: Federally Funded Custom Code as OSS +- text: 5 - Open Source Software url: /OSS/ -- text: Implementation - url: /Implementation/ +- text: 6 - Exceptions to Government Code Reuse + url: /Exceptions/ +- text: 7 - Implementation + url: /Implementation - text: Appendix A - Definitions - url: /Appendixa/ -- text: Appendix B - Procurement Analysis - url: /Appendixb/ + url: /AppendixA/ + #- text: Introduction +# url: /introduction/ + # sass sass: sass_dir: _sass + +gems: + - jekyll-redirect-from diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 8f97112..e9470ea 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -19,7 +19,5 @@

Edit this page

-

- View PDF -

+ diff --git a/_layouts/default.html b/_layouts/default.html index 1f52c2c..81dfe8f 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ - +