Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

3 files changed, 12 insertions, 14 deletions

diff --git a/_layouts/customize.html b/_layouts/customize.html
index a2affb0de..5fd92549e 100644
--- a/_layouts/customize.html
+++ b/_layouts/customize.html
@@ -26,7 +26,7 @@
 
     <div class="bs-customize-placeholder">
       <div class="container bs-docs-container">
-        <p class="lead">Until RC2, the Bootstrap 3 customizer will be disabled. In the mean time, snag the <a href="https://github.com/twbs/bootstrap/releases">compiled CSS and JavaScript</a>. Hang tight!</p>
+        <p class="lead">Until RC2, the Bootstrap 3 customizer will be disabled. In the mean time, snag the <a href="{{ site.repo }}/releases">compiled CSS and JavaScript</a>. Hang tight!</p>
       </div>
     </div>
 
@@ -38,11 +38,11 @@
       <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
       <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
       <ul class="footer-links">
-        <li><a href="http://blog.getbootstrap.com">Blog</a></li>
+        <li><a href="{{ site.blog }}">Blog</a></li>
         <li class="muted">&middot;</li>
-        <li><a href="https://github.com/twbs/bootstrap/issues?state=open">Issues</a></li>
+        <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
         <li class="muted">&middot;</li>
-        <li><a href="https://github.com/twbs/bootstrap/releases">Releases</a></li>
+        <li><a href="{{ site.repo }}/releases">Releases</a></li>
       </ul>
     </footer>
 
diff --git a/_layouts/default.html b/_layouts/default.html
index 2169c44aa..fc6003260 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -51,9 +51,7 @@
     </div>
 
     <!-- Quick back to top -->
-    <a href="#" class="bs-top">
-      Back to top
-    </a>
+    <a href="#" class="bs-top">Back to top</a>
 
     <!-- Footer
     ================================================== -->
@@ -63,11 +61,11 @@
       <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
       <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
       <ul class="footer-links">
-        <li><a href="http://blog.getbootstrap.com">Blog</a></li>
+        <li><a href="{{ site.blog }}">Blog</a></li>
         <li class="muted">&middot;</li>
-        <li><a href="https://github.com/twbs/bootstrap/issues?state=open">Issues</a></li>
+        <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
         <li class="muted">&middot;</li>
-        <li><a href="https://github.com/twbs/bootstrap/releases">Releases</a></li>
+        <li><a href="{{ site.repo }}/releases">Releases</a></li>
       </ul>
     </footer>
 
diff --git a/_layouts/home.html b/_layouts/home.html
index 13da28f0b..588533766 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -21,16 +21,16 @@
 
       <ul class="bs-masthead-links">
         <li>
-          <a href="http://github.com/twbs/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
+          <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
         </li>
         <li>
-          <a href="http://examples.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+          <a href="{{ site.examples }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
         </li>
         <li>
-          <a href="http://glyphicons.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
+          <a href="{{ site.glyphicons }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
         </li>
         <li>
-          <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
+          <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
         </li>
       </ul>
     </div>