Merge pull request #2670 from vector-im/dbkr/fix_config_location

Fix config location in some more places
This commit is contained in:
Richard van der Hoff 2016-12-01 10:04:20 +00:00 committed by GitHub
commit bacd467b4c

View file

@ -59,16 +59,16 @@ to build.
web server. web server.
Note that `npm run dist` is not supported on Windows, so Windows users can run `npm Note that `npm run dist` is not supported on Windows, so Windows users can run `npm
run build`, which will build all the necessary files into the `vector` run build`, which will build all the necessary files into the `webapp`
directory. The version of Vector will not appear in Settings without directory. The version of Riot will not appear in Settings without
using the dist script. You can then mount the vector directory on your using the dist script. You can then mount the `webapp` directory on your
webserver to actually serve up the app, which is entirely static content. webserver to actually serve up the app, which is entirely static content.
config.json config.json
=========== ===========
You can configure the app by copying `vector/config.sample.json` to You can configure the app by copying `config.sample.json` to
`vector/config.json` and customising it: `config.json` and customising it:
1. `default_hs_url` is the default home server url. 1. `default_hs_url` is the default home server url.
1. `default_is_url` is the default identity server url (this is the server used 1. `default_is_url` is the default identity server url (this is the server used