Skip to content

Commit

Permalink
fix docs baseurl to not have trailing slash, fixes duped url slashes
Browse files Browse the repository at this point in the history
  • Loading branch information
longcao committed Jan 4, 2016
1 parent 70200a9 commit 70dadfb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/src/main/tut/xor.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/site/_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Cats Documentation
markdown: redcarpet
highlighter: pygments
baseurl: /cats/
baseurl: /cats
apidocs: /cats/api/

collections:
Expand Down
8 changes: 4 additions & 4 deletions docs/src/site/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

0 comments on commit 70dadfb

Please sign in to comment.