Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docs duped url slashes #768

Merged
merged 2 commits into from
Jan 5, 2016
Merged

Fix docs duped url slashes #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70200a9
rm dev jekyll config that wasn't working
longcao Dec 21, 2015
70dadfb
fix docs baseurl to not have trailing slash, fixes duped url slashes
longcao Dec 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/src/main/tut/xor.md
View file
Open in desktop
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
9 changes: 0 additions & 9 deletions docs/src/site/_config.dev.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docs/src/site/_config.yml
View file
Open in desktop
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
View file
Open in desktop
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>