mirror of
https://github.com/grafana/grafana.git
synced 2024-11-22 08:56:43 -06:00
Merge branch 'docs-2.0'
Conflicts: docs/sources/installation/configuration.md docs/sources/installation/docker.md
This commit is contained in:
commit
a04a403539
@ -181,7 +181,7 @@ Default is `false`.
|
||||
|
||||
<hr>
|
||||
|
||||
## [user]
|
||||
## [users]
|
||||
|
||||
### allow_sign_up
|
||||
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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" ],
|
||||
|
Loading…
Reference in New Issue
Block a user