From 7438e58dcd4c9bad6d36d715518cd87e9ac5d85d Mon Sep 17 00:00:00 2001 From: Jordan Fearnley Date: Mon, 24 Oct 2016 22:27:14 +0100 Subject: [PATCH 1/2] Goodbye sweet link to my Repo o7 README changed for the sake of it being easier to find and replace all links with `/1.0/` in them for when 1.0 eventually replaces the master branch --- README.md | 2 +- docs/guides/Windows Guide.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f9699c1d..7bb0d57e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![img](https://ci.appveyor.com/api/projects/status/gmu6b3ltc80hr3k9?svg=true) [![Discord](https://discordapp.com/api/servers/117523346618318850/widget.png)](https://discord.gg/0ehQwTK2RBjAxzEY) -[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/latest/?badge=latest) +[![Documentation Status](https://readthedocs.org/projects/nadekobot/badge/?version=latest)](http://nadekobot.readthedocs.io/en/1.0/?badge=latest) # NadekoBot ## [Click here to invite Nadeko to your Discord server](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index 38ec73ce..5c885a77 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -16,13 +16,13 @@ ________________________________________________________________________________ ####Guide - Make sure you have installed both [Git][Git] and the [.NET Core SDK][.NET Core SDK]. - Create a folder somewhere and name it `Nadeko`. -- Head to the [Windows Installer releases page][WinInstaller] and download the latest release zip. +- Head to the [Windows Installer releases page][WinInstaller] and save the zip as prompted. - Extract the contents of the zip you just downloaded to the `Nadeko` folder that we created earlier. -- You will see two files, most importantly, `NadekoInstaller.bat` after extraction (You may not see the `.bat` part of the filename). +- You should see another folder in the `Nadeko` folder, something along the lines of `NadekoBotInstallerWin-master` copy the contents of this folder, to the `Nadeko` folder +- You shoudl now see three files, most importantly, `NadekoInstaller.bat` after moving the contents of the folder mentioned above to the `Nadeko` folder (You may not see the `.bat` part of the filename). - Run/Launch/Open `NadekoInstaller.bat` and you will see it running in the command prompt. -- Wait a while for the file to finish installing, it'll say when it's done in the command prompt. +- Wait a while for the file to finish installing, it'll display it's progress in the command prompt. - You should now have a new folder named `NadekoBot` inside the `Nadeko` folder we previously created. -- You can safely delete the `NadekoInstall_Temp` folder if you so choose. ####Creating DiscordBot application - Go to [the Discord developer application page][DiscordApp]. @@ -66,7 +66,7 @@ ________________________________________________________________________________ - Make sure the bot is closed and is not running (Run `.die` in a connected server to ensure it's not running). - Run `NadekoInstaller.bat` again and wait for it to finish. - Run `NadekoRun.bat`. -- You've updated, easy as that! +- You've updated and are running again, easy as that! ________________________________________________________________________________ #### Setting Up NadekoBot For Music @@ -102,7 +102,7 @@ ________________________________________________________________________________ [.NET Core SDK]: https://go.microsoft.com/fwlink/?LinkID=827524 [Git]: https://git-scm.com/download/win -[WinInstaller]: https://github.com/fearnlj01/NadekoBotInstallerWin/releases +[WinInstaller]: https://github.com/Kwoth/NadekoBotInstallerWin/archive/master.zip [FFMPEG]: https://github.com/Soundofdarkness/FFMPEG-Inst/releases [7zip]: http://www.7-zip.org/download.html [DiscordApp]: https://discordapp.com/developers/applications/me From 155bac2b3f944c7076e5d6f8d87989784b1fa5c5 Mon Sep 17 00:00:00 2001 From: Jordan Fearnley Date: Mon, 24 Oct 2016 22:33:13 +0100 Subject: [PATCH 2/2] Pretend you can't see this commit I do not typo what do you mean --- docs/guides/Windows Guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/Windows Guide.md b/docs/guides/Windows Guide.md index 5c885a77..6a652cac 100644 --- a/docs/guides/Windows Guide.md +++ b/docs/guides/Windows Guide.md @@ -18,8 +18,8 @@ ________________________________________________________________________________ - Create a folder somewhere and name it `Nadeko`. - Head to the [Windows Installer releases page][WinInstaller] and save the zip as prompted. - Extract the contents of the zip you just downloaded to the `Nadeko` folder that we created earlier. -- You should see another folder in the `Nadeko` folder, something along the lines of `NadekoBotInstallerWin-master` copy the contents of this folder, to the `Nadeko` folder -- You shoudl now see three files, most importantly, `NadekoInstaller.bat` after moving the contents of the folder mentioned above to the `Nadeko` folder (You may not see the `.bat` part of the filename). +- You should see another folder in the `Nadeko` folder, something along the lines of `NadekoBotInstallerWin-master` copy the contents of this folder, to the `Nadeko` folder, then (optionally) remove the empty, `NadekoBotInstallerWin-master` folder +- You should now see three files, most importantly, `NadekoInstaller.bat` after moving the contents of the folder mentioned above to the `Nadeko` folder (You may not see the `.bat` part of the filename). - Run/Launch/Open `NadekoInstaller.bat` and you will see it running in the command prompt. - Wait a while for the file to finish installing, it'll display it's progress in the command prompt. - You should now have a new folder named `NadekoBot` inside the `Nadeko` folder we previously created.