mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.9' of https://github.com/kwoth/nadekobot into 1.9

Browse Source
This commit is contained in:
Master Kwoth 2017-11-18 18:00:33 +01:00
commit 5c26036634
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/JSON Explanations.md
View File

@ -186,7 +186,7 @@ For windows (regular installation, or from the updater), this is usually
## DB files ## DB files
Nadeko saves all the settings and infomations in `NadekoBot.db` file here: Nadeko saves all the settings and infomations in `NadekoBot.db` file here:
`NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data/NadekoBot.db` (macOS and Linux) `NadekoBot/src/NadekoBot/bin/Release/netcoreapp2.0/data/NadekoBot.db` (macOS and Linux)
`NadekoBot\system\data` (Windows) `NadekoBot\system\data` (Windows)
in order to open the database file you will need [DB Browser for SQLite](http://sqlitebrowser.org/). in order to open the database file you will need [DB Browser for SQLite](http://sqlitebrowser.org/).

4
docs/guides/Docker Guide.md
View File

@ -8,7 +8,7 @@ Nadeko is written in C# and Discord.Net for more information visit <https://gith
#### Setting up the container #### Setting up the container
For this guide we will be using the folder /nadeko as our config root folder. For this guide we will be using the folder /nadeko as our config root folder.
``` ```
docker create --name=nadeko -v /nadeko/conf/:/root/nadeko -v /nadeko/data:/opt/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data uirel/nadeko:1.4 docker create --name=nadeko -v /nadeko/conf/:/root/nadeko -v /nadeko/data:/opt/NadekoBot/src/NadekoBot/bin/Release/netcoreapp2.0/data uirel/nadeko:1.4
``` ```
#### Moving `credentials.json` into the docker container. #### Moving `credentials.json` into the docker container.
@ -46,7 +46,7 @@ The following commands are required for the default options
`docker stop nadeko; docker rm nadeko` `docker stop nadeko; docker rm nadeko`
``` ```
docker create --name=nadeko -v /nadeko/conf/:/root/nadeko -v /nadeko/data:/opt/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data uirel/nadeko:1.4 docker create --name=nadeko -v /nadeko/conf/:/root/nadeko -v /nadeko/data:/opt/NadekoBot/src/NadekoBot/bin/Release/netcoreapp2.0/data uirel/nadeko:1.4
``` ```
`docker start nadeko` `docker start nadeko`