Prepare for 2.6.
diff --git a/README.md b/README.md
index 6445e02..94da1d9 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@
 [![Build Status](https://travis-ci.org/apache/commons-configuration.svg)](https://travis-ci.org/apache/commons-configuration)
 [![Coverage Status](https://coveralls.io/repos/apache/commons-configuration/badge.svg)](https://coveralls.io/r/apache/commons-configuration)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-configuration2/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-configuration2/)
-[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-configuration2/2.5.svg)](https://javadoc.io/doc/org.apache.commons/commons-configuration2/2.5)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-configuration2/2.6.svg)](https://javadoc.io/doc/org.apache.commons/commons-configuration2/2.6)
 
 Tools to assist in the reading of configuration/preferences files in
         various formats
@@ -68,7 +68,7 @@
 <dependency>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-configuration2</artifactId>
-  <version>2.5</version>
+  <version>2.6</version>
 </dependency>
 ```
 
diff --git a/src/site/xdoc/download_configuration.xml b/src/site/xdoc/download_configuration.xml
index 7d535c5..e9041fb 100644
--- a/src/site/xdoc/download_configuration.xml
+++ b/src/site/xdoc/download_configuration.xml
@@ -113,32 +113,32 @@
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Configuration 2.5 (reworked 2.x version)">
+    <section name="Apache Commons Configuration 2.6 (reworked 2.x version)">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.5-bin.tar.gz">commons-configuration2-2.5-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.6-bin.tar.gz">commons-configuration2-2.6-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.6-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.6-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.5-bin.zip">commons-configuration2-2.5-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.5-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/configuration/binaries/commons-configuration2-2.6-bin.zip">commons-configuration2-2.6-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.6-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/binaries/commons-configuration2-2.6-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.5-src.tar.gz">commons-configuration2-2.5-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.tar.gz.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.6-src.tar.gz">commons-configuration2-2.6-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.6-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.6-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.5-src.zip">commons-configuration2-2.5-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.zip.sha512">sha512</a></td>
-              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.5-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/configuration/source/commons-configuration2-2.6-src.zip">commons-configuration2-2.6-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.6-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/configuration/source/commons-configuration2-2.6-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 4dd4b86..8c68ae0 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -49,7 +49,7 @@
     <section name="Overview">
       <p>
         <a href="index.html">Apache Commons Configuration</a> shares mailing lists with all the other
-        <a href="https://commons.apache.org/components.html">Commons Components</a>.
+        <a href="http://commons.apache.org/components.html">Commons Components</a>.
         To make it easier for people to only read messages related to components they are interested in,
         the convention in Commons is to prefix the subject line of messages with the component's name,
         for example:
@@ -59,9 +59,9 @@
       </p>
       <p>
         Questions related to the usage of Apache Commons Configuration should be posted to the
-        <a href="https://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.
+        <a href="http://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.
         <br />
-        The <a href="https://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>
+        The <a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>
         is for questions and discussion related to the development of Apache Commons Configuration.
         <br />
         Please do not cross-post; developers are also subscribed to the user list.
@@ -105,7 +105,7 @@
           <td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:user-unsubscribe@commons.apache.org">Unsubscribe</a></td>
           <td><a href="mailto:user@commons.apache.org?subject=[configuration]">Post</a></td>
-          <td><a href="https://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-user/">mail-archives.apache.org</a></td>
           <td><a href="http://markmail.org/list/org.apache.commons.users/">markmail.org</a><br />
               <a href="http://www.mail-archive.com/user@commons.apache.org/">www.mail-archive.com</a><br />
               <a href="http://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>
@@ -123,7 +123,7 @@
           <td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:dev-unsubscribe@commons.apache.org">Unsubscribe</a></td>
           <td><a href="mailto:dev@commons.apache.org?subject=[configuration]">Post</a></td>
-          <td><a href="https://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">mail-archives.apache.org</a></td>
           <td><a href="http://markmail.org/list/org.apache.commons.dev/">markmail.org</a><br />
               <a href="http://www.mail-archive.com/dev@commons.apache.org/">www.mail-archive.com</a><br />
               <a href="http://news.gmane.org/gmane.comp.jakarta.commons.devel">news.gmane.org</a>
@@ -141,7 +141,7 @@
           <td><a href="mailto:issues-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:issues-unsubscribe@commons.apache.org">Unsubscribe</a></td>
           <td><i>read only</i></td>
-          <td><a href="https://mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-issues/">mail-archives.apache.org</a></td>
           <td><a href="http://markmail.org/list/org.apache.commons.issues/">markmail.org</a><br />
               <a href="http://www.mail-archive.com/issues@commons.apache.org/">www.mail-archive.com</a>
           </td>
@@ -152,13 +152,13 @@
           <td>
             <strong>Commons Commits List</strong>
             <br /><br />
-            Only for e-mails automatically generated by the <a href="scm.html">source control</a> sytem.
+            Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> sytem.
             <br /><br />
           </td>
           <td><a href="mailto:commits-subscribe@commons.apache.org">Subscribe</a></td>
           <td><a href="mailto:commits-unsubscribe@commons.apache.org">Unsubscribe</a></td>
           <td><i>read only</i></td>
-          <td><a href="https://mail-archives.apache.org/mod_mbox/commons-commits/">mail-archives.apache.org</a></td>
+          <td><a href="http://mail-archives.apache.org/mod_mbox/commons-commits/">mail-archives.apache.org</a></td>
           <td><a href="http://markmail.org/list/org.apache.commons.commits/">markmail.org</a><br />
               <a href="http://www.mail-archive.com/commits@commons.apache.org/">www.mail-archive.com</a>
           </td>
@@ -191,7 +191,7 @@
           <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
           <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>
           <td><i>read only</i></td>
-          <td><a class="externalLink" href="https://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>
+          <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>
           <td><a class="externalLink" href="http://markmail.org/list/org.apache.announce/">markmail.org</a><br />
               <a class="externalLink" href="http://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br />
               <a class="externalLink" href="http://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br />