Merge branch 'master' into jf/remove-old-sections

pages/oss.html

@@ -13,7 +13,7 @@
 <p>We are 88% open sourced right now.  This is largely due to new work in newer areas of the organization.  What we want to do is make sure all work with custom code is represented in an open environment over the next couple of years.  
 </p>
 
-<p>The good news is that we are leading the government by providing good <a href="{{site.baseurl}}/assets/files/GSAOSSPolicy.pdf" target="_blank" rel="noopener noreferrer">policy</a>, open sourced scripts (<a href="https://github.com/GSA/codeinventory-github" target="blank">here</a> & <a href="https://github.com/GSA/codeinventory" target="blank">here</a>) for inventory automation, and sharing as much as possible with OMB, agencies, and the public.  This portion of our Open <a href="https://open.gsa.gov/" target="blank">site</a> is a place for us to tell our story and inform internal agency components the best way to open source their code.  It also provides a place for external stakeholders to see some good examples and understand our policy providing insight into working with us.
+<p>The good news is that we are leading the government by providing good <a href="{{ '/oss-policy/' | prepend: site.baseurl }}">policy</a>, open sourced scripts (<a href="https://github.com/GSA/codeinventory-github" target="blank">here</a> & <a href="https://github.com/GSA/codeinventory" target="blank">here</a>) for inventory automation, and sharing as much as possible with OMB, agencies, and the public.  This portion of our Open <a href="https://open.gsa.gov/" target="blank">site</a> is a place for us to tell our story and inform internal agency components the best way to open source their code.  It also provides a place for external stakeholders to see some good examples and understand our policy providing insight into working with us.
 </p>
 
 <p>We will continually update this page with our current efforts to move to 100% open source.  Please explore&mdash;innovate, create, and make sure to give us your <a href="https://github.com/GSA/open-gsa-redesign/issues" target="blank">feedback</a>.
@@ -25,12 +25,12 @@
 
 <ol>
     <li>
-    <p>We are working with internal offices that develop custom code and explaining the <a href="https://sourcecode.cio.gov/" target="blank">M-16-21</a> and our <a href="{{site.baseurl}}/assets/files/GSAOSSPolicy.pdf" target="_blank">responsibilities</a>.  This includes creating guidance for inventorying and for opening code.
+    <p>We are working with internal offices that develop custom code and explaining the <a href="https://sourcecode.cio.gov/" target="blank">M-16-21</a> and our <a href="{{ '/oss-policy/#7-responsibilities' | prepend: site.baseurl }}">responsibilities</a>.  This includes creating guidance for inventorying and for opening code.
     </p>
     </li>
 
     <li>
-    <p>We are spreading our knowledge of Open Source Software (OSS) when possible with recently being asked to share our <a href="{{site.baseurl}}/assets/files/GSAOSSPolicy.pdf" target="_blank" rel="noopener noreferrer">policy</a> with all CFO Act agencies.  Agencies are considering our <a href="{{site.baseurl}}/assets/files/GSAOSSPolicy.pdf" target="_blank" rel="noopener noreferrer">policy</a> as they develop theirs.</p>
+    <p>We are spreading our knowledge of Open Source Software (OSS) when possible with recently being asked to share our <a href="{{ '/oss-policy/' | prepend: site.baseurl }}">policy</a> with all CFO Act agencies.  Agencies are considering our <a href="{{ '/oss-policy/' | prepend: site.baseurl }}">policy</a> as they develop theirs.</p>
     </li>
 
     <li>