From 220a3c029ca33686b5fa0fa0ce4ff42e5580817e Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 4 Feb 2015 14:48:31 +0200 Subject: [PATCH 1/4] README.md: use ircs with #supybot-fr --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09fbc8220..2f109062b 100644 --- a/README.md +++ b/README.md @@ -47,5 +47,5 @@ understand or think you know of a better way to do something, ### In Other languages -Only in French at the moment, located at [#supybot-fr on freenode](irc://chat.freenode.net/#supybot-fr). +Only in French at the moment, located at [#supybot-fr on freenode](ircs://chat.freenode.net:6697/#supybot-fr). From 2ffc8ef2a25d214df995824c98ad20edb75504f0 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 4 Feb 2015 14:50:51 +0200 Subject: [PATCH 2/4] INSTALL.md: fix links to documentation --- INSTALL.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index aeb633bc8..cbac55460 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -32,13 +32,12 @@ or for a local install (if you don't have or don't want to use root), `pip install -r requirements.txt --user` For more information and help on how to use Supybot, check out -the documents under [docs/], especially [GETTING_STARTED] and -[CONFIGURATION], or on [the website]. +the [documentation], especially [GETTING_STARTED] and +[CONFIGURATION]. -[docs/]:docs/index.rst -[GETTING_STARTED]:docs/GETTING_STARTED.rst -[CONFIGURATION]:docs/CONFIGURATION.rst -[the website]:http://supybot.aperio.fr/doc/use/index.html +[documentation]:http://doc.supybot.aperio.fr/en/latest/use/index.html +[GETTING_STARTED]:http://doc.supybot.aperio.fr/en/latest/use/getting_started.html +[CONFIGURATION]:http://doc.supybot.aperio.fr/en/latest/use/configuration.html So what do you do? That depends on which operating system you're running. We've split this document up to address the different installation From 527b2851bb46c205f9fcadb66d6427941f94167d Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 4 Feb 2015 14:53:37 +0200 Subject: [PATCH 3/4] INSTALL.md: remove mentionings to packages I also removed Windows as it's outdated and would be duplicating documentation on installing. --- INSTALL.md | 66 ------------------------------------------------------ 1 file changed, 66 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index cbac55460..96d41ee07 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -46,8 +46,6 @@ from there. # UNIX/Linux/BSD -If you use [Debian or Ubuntu, click here](INSTALL.md#debian). If you use [Fedora, click here.](INSTALL.md#fedora) - If you're installing Python using your distributor's packages, you may need a python-dev or python3-dev package installed, too. If you don't have a `/usr/lib/python2.x/distutils` directory or @@ -114,29 +112,6 @@ echo 'PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc source ~/.bashrc ``` -## Debian - -*Debian packages are automatically built nightly at 00:00Z.* - -For Debian and other distributions based on it (Ubuntu, etc.), there are -pre-built packages which you can install with: - -``` -wget http://builds.progval.net/limnoria/debian/python2/limnoria-master-HEAD.deb -sudo dpkg -i limnoria-master-HEAD.deb -``` - -## Fedora - -*Fedora packages are automatically built nightly at 00:00Z.* - -For Fedora and other distributions using rpm (RHEL, CentOS etc.), there are -pre-built packages which you can install with: - -``` -yum install http://builds.progval.net/limnoria/fedora/python2/limnoria-master-HEAD.noarch.rpm -``` - ## Pip To install with pip, run: @@ -172,11 +147,6 @@ and then install Limnoria normally. "python setup.py install" doesn't affect con If you don't have the cloned Limnoria repository, clone it again using the installation instructions. -### Debian/Fedora - -Run the same commands as before on the [Debian](INSTALL.md#debian) or -[Fedora](INSTALL.md#fedora) sections of this file. - ### Pip Run the first install command again, but add `--upgrade` to the @@ -194,39 +164,3 @@ rm -rf build/ rm /usr/local/bin/supybot* rm ~/.local/bin/supybot* ``` - -## Windows - -**Note**: If you are using an IPV6 connection, you will not be able -to run Supybot under Windows (unless Python has fixed things). Current -versions of Python for Windows are *not* built with IPV6 support. This -isn't expected to be fixed until Python 2.4, at the earliest. - -Now that you have Python installed, open up a command prompt. The -easiest way to do this is to open the run dialog (Programs -> Run) and -type "cmd" (for Windows 2000/XP/2003+) or "command" (for Windows 9x). In -order to reduce the amount of typing you need to do, I suggest adding -Python's directory to your path. If you installed Python using the -default settings, you would then do the following in the command prompt -(otherwise change the path to match your settings): - -``` -set PATH=C:\Python2x\;%PATH% -``` - -You should now be able to type 'python' to start the Python -interpreter. Exit by pressing CTRL-Z and then Return. Now that that's -setup, you'll want to cd into the directory that was created when you -unzipped Supybot; I'll assume you unzipped it to `C:\Supybot` for these -instructions. From `C:\Supybot`, run - -``` -python setup.py install -``` - -This will install Supybot under `C:\Python2x\`. You will now have several new -programs installed in `C:\Python2x\Scripts\`. The two that might be of -particular interest to you as a new user are 'supybot' and 'supybot-wizard'. -The former, 'supybot', is the script to run an actual bot; the latter, -'supybot-wizard', is an in-depth wizard that provides a nice user interface for -creating a registry file for your bot. From def98c4aabb22edd9e2857faa08faa7d465a10b5 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 4 Feb 2015 14:55:22 +0200 Subject: [PATCH 4/4] INSTALL.md: fix lines in moving to Python 3 --- INSTALL.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 96d41ee07..93cd2adf3 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -154,10 +154,11 @@ end. Then run the second install command. ## Upgrading to Python 3 -Upgrading to Python 3 happens the same way, but if you want to move from 2 to 3 -or 3 to 2, you must remove the `build/` directory and the executable -`supybot*` files first. `The build/` directory is in same directory as this -file and the `supybot*` executables are usually in `/usr/local/bin` or `~/.local/bin`. +Upgrading to Python 3 happens the same way, but if you want to move from 2 +to 3 or 3 to 2, you must remove the `build/` directory and the executable +`supybot*` files first. `The build/` directory is in same directory as +this file and the `supybot*` executables are usually in `/usr/local/bin` +or `~/.local/bin`. ``` rm -rf build/