From ee52cafbb46bd2f375e697709ae9b547af47de87 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 15 Jun 2017 16:25:52 +1200
Subject: [PATCH] Switch default version from 3.5 to 3.6

---
 conf/apigen/templates/@layout.latte | 1 +
 htdocs/.htaccess                    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/apigen/templates/@layout.latte b/conf/apigen/templates/@layout.latte
index 243675e..bce1d21 100644
--- a/conf/apigen/templates/@layout.latte
+++ b/conf/apigen/templates/@layout.latte
@@ -168,6 +168,7 @@ the file LICENSE.md that was distributed with this source code.
 		</a>
 		<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
 			<li><a tabindex="-1" href="/master">master</a></li>
+			<li><a tabindex="-1" href="/3.6">3.6</a></li>
 			<li><a tabindex="-1" href="/3.5">3.5</a></li>
 			<li><a tabindex="-1" href="/3.4">3.4</a></li>
 			<li><a tabindex="-1" href="/3.3">3.3</a></li>
diff --git a/htdocs/.htaccess b/htdocs/.htaccess
index 913dcd2..c1c3457 100644
--- a/htdocs/.htaccess
+++ b/htdocs/.htaccess
@@ -1,10 +1,10 @@
 RewriteEngine On
 
 # "Symlink" a "current" folder to the latest release
-RewriteRule ^current/?(.*)? /3.5/$1 [R=301]
+RewriteRule ^current/?(.*)? /3.6/$1 [R=301]
 
 # "Symlink" the root to the latest release (with "moved temporarily")
-RewriteRule ^/?$ /3.5/ [R=302,L]
+RewriteRule ^/?$ /3.6/ [R=302,L]
 
 # Lookup script (used to be a SS app, now just a simple script)
 RewriteCond %{REQUEST_URI} !^/search/lookup\.php