From 91c9d226ed2fbb860faebfb30340dc976761b091 2012-09-11 14:19:18
From: HanzZ <hanzz.k@gmail.com>
Date: 2012-09-11 14:19:18
Subject: [PATCH] even more docs

---

diff --git a/docs/guide/CMakeLists.txt b/docs/guide/CMakeLists.txt
index b01697c51e42cf02f377ddd3f2636539e35cbccd..f7c92ead30d8000e47e0fe748b22321174b0b8cf 100644
--- a/docs/guide/CMakeLists.txt
+++ b/docs/guide/CMakeLists.txt
@@ -25,6 +25,8 @@ ADD_TEXTILE("configure_xmpp_server.textile" "Spectrum 2 - Configure XMPP server"
 ADD_TEXTILE("tutorial_gateway_mode.textile" "Spectrum 2 - Spectrum 2 in gateway mode")
 ADD_TEXTILE("config_file.textile" "Spectrum 2 - Config File")
 ADD_TEXTILE("from_source_code.textile" "Spectrum 2 - Installing from source code")
+ADD_TEXTILE("debian_ubuntu.textile" "Spectrum 2 - Debian/Ubuntu packages")
+ADD_TEXTILE("fedora_rhel.textile" "Spectrum 2 - Fedora/RHEL/CentOS packages")
 ADD_TEXTILE("server_ssl.textile" "Spectrum 2 - Server mode SSL support")
 ADD_TEXTILE("mysql.textile" "Spectrum 2 - MySQL Support")
 ADD_TEXTILE("postgresql.textile" "Spectrum 2 - PostgreSQL Support")
diff --git a/docs/guide/debian_ubuntu.textile b/docs/guide/debian_ubuntu.textile
new file mode 100644
index 0000000000000000000000000000000000000000..eff14e2cee9d3c86978069ce423af21ae763140f
--- /dev/null
+++ b/docs/guide/debian_ubuntu.textile
@@ -0,0 +1,39 @@
+We have APT repositories for Debian and Ubuntu that make it very easy to install Spectrum 2.
+
+To use the repositories, just add the following lines to @/etc/apt/sources.list@:
+
+<pre>
+deb http://packages.spectrum.im <dist> spectrum2
+</pre>
+
+where <dist> is either lenny, squeeze, hardy, intrepid, jaunty, karmic or lucid. If you are unsure, you can usually find your distribution in the file /etc/lsb-release. We also have a source repository at the same location if you want to build the package yourself.
+
+h2. Add GPG key
+
+After you have added the repository, you still have to import the GPG key that is used to sign the packages in the repository. You can do this in two ways:
+
+You can download and add the key manually (apt-key requires root privileges):
+
+<pre>
+ wget -O - http://packages.spectrum.im/keys/apt-repository@fsinf.at | apt-key add -
+</pre>
+
+You can simply update the repositories and install the fsinf-keyring packages:
+
+<pre>
+ apt-get update
+ apt-get install fsinf-keyring
+ apt-get update
+</pre>
+
+Don’t worry about the warnings that the packages can’t be identified, they will be gone after you installed the fsinf-keyring package.
+
+h2. Install spectrum2 - development version
+
+After you have done that, simply do:
+
+<pre>
+apt-get install spectrum2-git spectrum2-backend-libpurple-git
+</pre>
+
+Note that these repositories pull in quite a few dependencies, depending on the distribution you use.
diff --git a/docs/guide/fedora_rhel.textile b/docs/guide/fedora_rhel.textile
new file mode 100644
index 0000000000000000000000000000000000000000..d3f2d9c73c4b13b4203c90a7eaa03eda2b6daf44
--- /dev/null
+++ b/docs/guide/fedora_rhel.textile
@@ -0,0 +1,22 @@
+There are nightbuilds for Fedora, CentOS-6 or RHEL6 distributions.
+
+h2. Fedora
+
+
+1. Save "fedora-spectrum2.repo":http://repos.fedorapeople.org/repos/jkaluza/spectrum2/fedora-spectrum2.repo file into /etc/yum.repos.d/
+
+2. Install spectrum2 and spectrum2-libpurple-backend
+
+<pre>
+yum install spectrum2 spectrum2-libpurple-backend
+</pre>
+
+h2. RHEL/CentOS
+
+1. Save "epel-spectrum2.repo":http://repos.fedorapeople.org/repos/jkaluza/spectrum2/epel-spectrum2.repo file into /etc/yum.repos.d/
+
+2. Install spectrum2 and spectrum2-libpurple-backend
+
+<pre>
+yum install spectrum2 spectrum2-libpurple-backend
+</pre>
diff --git a/docs/guide/index.textile b/docs/guide/index.textile
index f358f7c8813ad0c48c0a3cd588eba690da1c4306..4dd213721460e199f31909cbaa330938ce9e6969 100644
--- a/docs/guide/index.textile
+++ b/docs/guide/index.textile
@@ -4,6 +4,8 @@ h2. About
 
 h2. Installation
 
+* "Debian/Ubuntu packages":debian_ubuntu.html
+* "Fedora/RHEL/CentOS packages":fedora_rhel.html
 * "Installing from source code":from_source_code.html
 
 h2. Tutorials