Merge branch 'docs-2.0'

Conflicts:
	docs/sources/installation/configuration.md
	docs/sources/installation/docker.md
This commit is contained in:
Torkel Ödegaard 2015-05-11 08:02:28 +02:00
commit a04a403539
3 changed files with 3 additions and 3 deletions

View File

@ -181,7 +181,7 @@ Default is `false`.
<hr>
## [user]
## [users]
### allow_sign_up

View File

@ -33,6 +33,6 @@ an `ENV` instruction.
## Configuration
The back-end web server has a number of configuration options. Go the
[Configuration](/installation/configuration) page for details on all
[Configuration](../installation/configuration.md) page for details on all
those options.

View File

@ -121,7 +121,7 @@ Will return the dashboard given the dashboard slug. Slug is the url friendly ver
"isStarred": false,
"slug": "production-overview"
},
"dashboard": {
"model": {
"id": null,
"title": "Production Overview",
"tags": [ "templated" ],