Skip to content

Commit 0136ff7

Browse files
authored
Merge branch 'gh-pages' into patch-16
2 parents 7c1c92e + 52a7f3f commit 0136ff7

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

.travis.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,25 @@ language: ruby
22
script: "./script/cibuild"
33
notifications:
44
email: false
5+
6+
env:
7+
global:
8+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
9+
10+
addons:
11+
apt:
12+
packages:
13+
- libcurl4-openssl-dev # required to avoid SSL errors
14+
515
branches:
616
only:
717
- gh-pages
818
- /.*/
19+
20+
before_install:
21+
- openssl version
22+
- openssl ciphers -v
23+
- openssl s_client -cipher ECDHE-RSA-AES256-GCM-SHA384 -connect github.blog:443 -tls1_2
24+
- curl -sSL -D - https://github.blog/2014-02-14-rendered-prose-diffs/ -o /dev/null
925
sudo: false
1026
cache: bundler

_data/governments.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,6 @@ Switzerland:
474474
- kanton-bern
475475
- ogdch
476476
- sitn
477-
- swiss-gov
478477

479478
The Netherlands:
480479
- Amsterdam

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2 class="alt-h3 mb-2">
3939
{% octicon server height:28 class:"fill-blue d-inline mr-2" aria-label:server %}
4040
On your servers or in the cloud
4141
</h2>
42-
<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>
42+
<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>
4343
</div>
4444
</div>
4545

@@ -104,7 +104,7 @@ <h2 class="alt-h3 mb-2">
104104
<div class="container-lg p-responsive py-5 py-md-6 ">
105105

106106
<h2 class="alt-h2 text-center mb-3 mt-lg-6" id="more-than-just-code">More than just code</h2>
107-
<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>
107+
<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>
108108

109109
<div class="my-4 my-lg-6 clearfix gutter-spacious">
110110
<div class="col-md-4 float-left animate-out mb-4">

0 commit comments

Comments
 (0)