Browse Source

Merge branch 'docs-2.0'

Conflicts:
	docs/sources/installation/configuration.md
	docs/sources/installation/docker.md
Torkel Ödegaard 10 years ago
parent
commit
a04a403539

+ 1 - 1
docs/sources/installation/configuration.md

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

+ 1 - 1
docs/sources/installation/docker.md

@@ -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.
 

+ 1 - 1
docs/sources/reference/http_api.md

@@ -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" ],