Merge branch 'gh-pages' into patch-3

jbjonesjr · web-flow · commit efc127994a2d · 2019-01-28T08:08:17.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,25 @@ language: ruby
 script: "./script/cibuild"
 notifications:
   email: false
+
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
+
+addons:
+  apt:
+    packages:
+    - libcurl4-openssl-dev # required to avoid SSL errors
+
 branches:
   only:
     - gh-pages
     - /.*/
+
+before_install:
+- openssl version
+- openssl ciphers -v
+- openssl s_client -cipher ECDHE-RSA-AES256-GCM-SHA384 -connect github.blog:443 -tls1_2
+- curl -sSL -D - https://github.blog/2014-02-14-rendered-prose-diffs/ -o /dev/null
 sudo: false
 cache: bundler
diff --git a/_data/governments.yml b/_data/governments.yml
@@ -144,6 +144,7 @@ Canada:
   - TBS-EACPD
   - tc-ca
   - thecityofcalgary
+  - veteransaffairscanada
   - VilledeMontreal
   - wet-boew
 
@@ -335,6 +336,7 @@ Mexico:
 
 New Zealand:
   - CanterburyRegionalCouncil
+  - data-govt-nz
   - DigitalNZ
   - ElectricityAuthority
   - GOVTNZ
@@ -475,7 +477,6 @@ Switzerland:
   - kanton-bern
   - ogdch
   - sitn
-  - swiss-gov
 
 The Netherlands:
   - Amsterdam
@@ -538,6 +539,7 @@ U.K. Central:
   - naouk
   - nationalarchives
   - NationalCrimeAgency
+  - nhsuk
   - OfqualGovUK
   - ONSdigital
   - openglasgow
@@ -582,10 +584,11 @@ U.K. Councils:
   - warwickshire
   - wealden
   - west-berkshire-council
+  - wmfs
 
 United Nations:
   - UNGlobalPlatform
-  
+
 U.S. City:
   - austincodeit
   - Baltimore-City-EGIS
diff --git a/index.html b/index.html
@@ -39,7 +39,7 @@ <h2 class="alt-h3 mb-2">
         {% octicon server height:28 class:"fill-blue d-inline mr-2" aria-label:server %}
         On your servers or in the cloud
       </h2>
-      <p class="text-gray">Run GitHub Enterprise on your servers as a virtual appliance, on <a href="{{"/aws-govcloud" | relative_url}}">AWS GovCloud</a> or Azure, or let us host the code for you on GitHub.com, whatever your security requires.</p>
+      <p class="text-gray">Run GitHub Enterprise on your servers as a virtual appliance, on <a href="{{"/aws-govcloud.html" | relative_url}}">AWS GovCloud</a> or Azure, or let us host the code for you on GitHub.com, whatever your security requires.</p>
     </div>
   </div>
 
@@ -104,7 +104,7 @@ <h2 class="alt-h3 mb-2">
   <div class="container-lg p-responsive py-5 py-md-6 ">
 
     <h2 class="alt-h2 text-center mb-3 mt-lg-6" id="more-than-just-code">More than just code</h2>
-    <p class="alt-lead text-gray text-center col-md-10 mx-auto">Agencies use GitHub to engage developers and collaborate with the public on open source, open data and open government efforts. GitHub even renders common formats like <a href="https://github.com/blog/1784-rendered-prose-diffs">text</a>, <a href="https://help.github.com/articles/rendering-csv-and-tsv-data">CSV</a>, <a href="https://github.com/blog/1974-pdf-viewing">PDF</a>, <a href="https://help.github.com/articles/mapping-geojson-files-on-github">geospatial data</a> and Jupyter Notebooks.</p>
+    <p class="alt-lead text-gray text-center col-md-10 mx-auto">Agencies use GitHub to engage developers and collaborate with the public on open source, open data and open government efforts. GitHub even renders common formats like <a href="https://github.blog/2014-02-14-rendered-prose-diffs/">text</a>, <a href="https://help.github.com/articles/rendering-csv-and-tsv-data">CSV</a>, <a href="https://github.blog/2015-03-17-pdf-viewing/">PDF</a>, <a href="https://help.github.com/articles/mapping-geojson-files-on-github">geospatial data</a> and Jupyter Notebooks.</p>
 
     <div class="my-4 my-lg-6 clearfix gutter-spacious">
       <div class="col-md-4 float-left animate-out mb-4">
