Merge pull request #56 from edlinklater/master

Use protocolless URLs where possible.

app/_config/toolbar.yml

@@ -3,12 +3,13 @@ After:
   - toolbar/*
 ---
 GlobalNav:
-  hostname: 'http://www.silverstripe.org/'
+  hostname: '//www.silverstripe.org/'
   css_path: '/themes/ssv3/css/toolbar.css'
+  snippet_path: '/assets/global-nav.html'
   use_localhost: false
 GlobalNavTemplateProvider:
   connection_timeout: 2000
   transfer_timeout: 6000  
 SiteController:
   extensions:
-    - GlobalNavExtension
+    - GlobalNavExtension

themes/docs/templates/Includes/DocumentationFooter.ss

@@ -1,5 +1,5 @@
 <div id="footer">
 	<p>Documentation powered by <a href="http://www.silverstripe.org">SilverStripe</a> (<a href="https://github.com/silverstripe/doc.silverstripe.org">code</a>). <a href="{$BaseHref}sapphire/en/misc/contributing/documentation">Contribute to doc.silverstripe.org</a>, <a href="https://github.com/silverstripe/sapphire/issues/new?labels=documentation">raise a bug or enhancement ticket</a>. Except where otherwise noted, content on this wiki is licensed under <a class="urlextern" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">CC Attribution-Noncommercial-Share Alike 3.0 Unported</a></p>
 
-	<p><a href="http://creativecommons.org/licenses/by/3.0/nz/" rel="license"><img class="cc-logo" src="http://i.creativecommons.org/l/by/3.0/nz/80x15.png" style="border-width: 0pt;" alt="Creative Commons License"></a></p>
+	<p><a href="http://creativecommons.org/licenses/by/3.0/nz/" rel="license"><img class="cc-logo" src="//licensebuttons.net/l/by/3.0/nz/80x15.png" style="border-width: 0pt;" alt="Creative Commons License"></a></p>
 </div>