Merge pull request #768 from longcao/fix-docs-duped-url-slashes

Fix docs duped url slashes
typelevel · Jan 5, 2016 · 971f954 · 971f954
2 parents 38d4a35 + 70dadfb
commit 971f954
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/docs/src/main/tut/xor.md b/docs/src/main/tut/xor.md
@@ -39,7 +39,7 @@ How then do we communicate an error? By making it explicit in the data type we r
 
 ### `Xor` vs `Validated`
 
-In general, `Validated` is used to accumulate errors, while `Xor` is used to short-circuit a computation upon the first error. For more information, see the `Validated` vs `Xor` section of the [`Validated` documentation]({{ baseurl }}/tut/validated.html).
+In general, `Validated` is used to accumulate errors, while `Xor` is used to short-circuit a computation upon the first error. For more information, see the `Validated` vs `Xor` section of the [`Validated` documentation]({{ site.baseurl }}/tut/validated.html).
 
 ### Why not `Either`
 `Xor` is very similar to `scala.util.Either` - in fact, they are *isomorphic* (that is,

diff --git a/docs/src/site/_config.dev.yml b/docs/src/site/_config.dev.yml
diff --git a/docs/src/site/_config.yml b/docs/src/site/_config.yml
@@ -1,7 +1,7 @@
 name: Cats Documentation
 markdown: redcarpet
 highlighter: pygments
-baseurl: /cats/
+baseurl: /cats
 apidocs: /cats/api/
 
 collections:

diff --git a/docs/src/site/_layouts/default.html b/docs/src/site/_layouts/default.html
@@ -10,9 +10,9 @@
     </script>
     <title>{{ site.name }} - {{ page.title }}</title>
 
-    <link rel="stylesheet" href="{{ site.baseurl }}css/styles.css">
-    <link rel="stylesheet" href="{{ site.baseurl }}css/custom.css">
-    <link rel="stylesheet" href="{{ site.baseurl }}css/syntax.css">
+    <link rel="stylesheet" href="{{ site.baseurl }}/css/styles.css">
+    <link rel="stylesheet" href="{{ site.baseurl }}/css/custom.css">
+    <link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <!--[if lt IE 9]>
 	<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -79,6 +79,6 @@ <h5>useful links</h5>
       </div>
     </div>
 
-    <script src="{{ site.baseurl }}js/scale.fix.js" type="text/javascript"></script>
+    <script src="{{ site.baseurl }}/js/scale.fix.js" type="text/javascript"></script>
   </body>
 </html>