fix: build site with jekyll 2.2.0 (#755)

[skip ci]

README.md

@@ -74,7 +74,7 @@ There are also available (snapshot) binary RPMs in [Fedora's Copr repository](ht
 ## Changelog
 Notable changes for:
 
-**[42.0.0]** (2017-02-18):
+**[42.0.0]** (2017-02-20):
 * Support for PostgreSQL versions below 8.2 was dropped
 * java.util.logging is now used for logging: [logging documentation](https://jdbc.postgresql.org//documentation/head/logging.html)
 * Ensure executeBatch() can be used with pgbouncer. Previously pgjdbc could use server-prepared statements for batch execution even with prepareThreshold=0 (see [issue 742](https://github.com/pgjdbc/pgjdbc/issues/742))

docs/_config.yml

@@ -1,3 +1,3 @@
-name: PostgreSQL JDBC driver website
-markdown: kramdown
-highlighter: rouge
+name: PostgreSQL JDBC Driver website
+markdown: redcarpet
+highlighter: pygments

docs/documentation/_changelog/42.0.0-notes.md → docs/_includes/changelog/42.0.0-notes.md

@@ -1,6 +1,6 @@
 * Support for PostgreSQL versions below 8.2 was dropped
-* java.util.logging is now used for logging: [logging documentation](https://jdbc.postgresql.org//documentation/head/logging.html)
+* java.util.logging is now used for logging: [logging documentation](https://jdbc.postgresql.org/documentation/head/logging.html)
 * Ensure executeBatch() can be used with pgbouncer. Previously pgjdbc could use server-prepared statements for batch execution even with prepareThreshold=0 (see [issue 742](https://github.com/pgjdbc/pgjdbc/issues/742))
-* Replication protocol API was added: [replication API documentation](https://jdbc.postgresql.org//documentation/head/replication.html), [GitHub PR 550](https://github.com/pgjdbc/pgjdbc/pull/550)
+* Replication protocol API was added: [replication API documentation](https://jdbc.postgresql.org/documentation/head/replication.html), [GitHub PR 550](https://github.com/pgjdbc/pgjdbc/pull/550)
 * Version bumped to 42.0.0 to avoid version clash with PostgreSQL version
 * Error position is displayed when SQL has unterminated literals, comments, etc (see [issue 688](https://github.com/pgjdbc/pgjdbc/issues/688))

docs/documentation/_changelog/42.0.0-release.md → docs/_includes/changelog/42.0.0-release.md

@@ -1,9 +1,9 @@
 <a name="version_42.0.0"></a>
-## Version 42.0.0 (2017-02-18)
+## Version 42.0.0 (2017-02-20)
 
 Notable changes:
 
-{% include_relative _changelog/42.0.0-notes.md %}
+{% include changelog/42.0.0-notes.md %}
 
 AlexElin (6):
 

docs/_layouts/default.html

@@ -36,7 +36,7 @@
 				<div id="pgSearch">
 
 					<!-- Old pgjdbc form -->
-					<form action="http://www.google.com/search" method="get">
+					<form action="https://www.google.com/search" method="get">
 						<input value="jdbc.postgresql.org" name="sitesearch" type="hidden" />
 						<input id="q" name="q" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="Google Search" accesskey="s" />
 						<!-- <input onFocus="getBlank (this, 'Search the site with google');" size="25" name="q" id="query" type="text" value="Search the site with google">&nbsp; -->
@@ -61,12 +61,12 @@ <h2 class="pgBlockHide"><label for="q">Search</label></h2>
 					<div id="pgHeaderLogoLeft">
 						<img alt="PostgreSQL" height="80" width="390" src="{{ page.resource }}/img/layout/hdr_left3.png" usemap="#maplinks" />
 						<map name="maplinks">
-							<area shape="rect" coords="0,0,231,80" alt="PostgreSQL" href="http://postgresql.org" />
-							<area shape="rect" coords="232,0,390,80" alt="PostgreSQL JDBC Driver" href="http://jdbc.postgresql.org" />
+							<area shape="rect" coords="0,0,231,80" alt="PostgreSQL" href="https://postgresql.org" />
+							<area shape="rect" coords="232,0,390,80" alt="PostgreSQL JDBC Driver" href="https://jdbc.postgresql.org" />
 						</map>
 					</div>
 					<div id="pgHeaderLogoRight">
-						<a href="http://postgresql.org">
+						<a href="https://postgresql.org">
 							<img width="210" height="80" alt="The world's most advanced open source database." src="{{ page.resource }}/img/layout/hdr_right.png" />
 						</a>
 					</div>
@@ -98,8 +98,8 @@ <h2 class="pgBlockHide"><label for="q">Search</label></h2>
 			<hr />
 
 			<div id="pgFooter">
-				<a class="navFooter" href="http://www.postgresql.org/about/privacypolicy">Privacy Policy</a> |
-				<a class="navFooter" href="http://www.postgresql.org/about/">About PostgreSQL</a><br/>
+				<a class="navFooter" href="https://www.postgresql.org/about/privacypolicy">Privacy Policy</a> |
+				<a class="navFooter" href="https://www.postgresql.org/about/">About PostgreSQL</a><br/>
 				Copyright &copy; 1996-{{ site.time | date: "%Y" }} The PostgreSQL Global Development Group
 			</div> <!-- pgFooter -->
 		</div> <!-- pgContainer -->

docs/_layouts/default_docs.html

@@ -15,7 +15,7 @@
 <body>
 	<div id="docHeader">
 		<div id="docHeaderLogo">
-			<a href="https://www.postgresql.org/" title="PostgreSQL"><img src="media/img/layout/hdr_left3a.png" alt="PostgreSQL" height="80" width="390" /></a>
+			<a href="https://jdbc.postgresql.org/" title="PostgreSQL JDBC Driver"><img src="media/img/layout/hdr_left3a.png" alt="PostgreSQL" height="80" width="390" /></a>
 		</div>
 	</div>
 
@@ -81,8 +81,8 @@ <h1>{{ page.title }}</h1>
 			<div id="docComments"></div>
 
 			<div id="docFooter">
-				<a class="navFooter" href="http://www.postgresql.org/about/privacypolicy">Privacy Policy</a> |
-				<a class="navFooter" href="http://www.postgresql.org/about/">About PostgreSQL</a><br/>
+				<a class="navFooter" href="https://www.postgresql.org/about/privacypolicy">Privacy Policy</a> |
+				<a class="navFooter" href="https://www.postgresql.org/about/">About PostgreSQL</a><br/>
 				Copyright &copy; 1996-{{ site.time | date: "%Y" }} The PostgreSQL Global Development Group
 			</div> <!-- pgFooter -->
 		</div> <!-- docContainer -->

docs/documentation/changelog.md

@@ -74,7 +74,7 @@ denote the various action types:![add](../media/img/add.jpg)=add,
 <img alt="update" src="../media/img/update.jpg" />=update
 ***
 
-{% include_relative _changelog/42.0.0-release.md %}
+{% include changelog/42.0.0-release.md %}
 
 <a name="version_9.4.1212"></a>
 ## Version 9.4.1212 (2016-11-02)