X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=HOWTO.md;h=1dc40815a5a41c5dbf695c1eae6a1ed9f382c9a3;hb=ecef9cdc50eb74eb729371dcfb139382113cf868;hp=3c659ba6621901d7f474bd38d55753731d4336a0;hpb=e16e057ad87cb2607b4b3c9cd426a98774b1bc04;p=electrum-server.git

diff --git a/HOWTO.md b/HOWTO.md
index 3c659ba..1dc4081 100644
--- a/HOWTO.md
+++ b/HOWTO.md
@@ -12,7 +12,7 @@ requirements.
 
 The most up-to date version of this document is available at:
 
-    https://gitorious.org/electrum/server/blobs/master/HOWTO
+    https://github.com/spesmilo/electrum-server/blob/master/HOWTO.md
 
 Conventions
 -----------
@@ -34,14 +34,14 @@ should be copied verbatim or adapted, without the indentation tab.
 Prerequisites
 -------------
 
-**Expertise.** You should be familiar with Linux command line and standard
-Linux commands. You should have basic understanding of git, Python packages,
-compiling and applying patches to source code. You should have knowledge
-about how to install and configure software on your Linux distribution. You
-should be able to add commands to your distribution's startup scripts. If
-one of the commands included in this document is not available or does not
-perform the operation described here, you are expected to fix the issue so
-you can continue following this howto.
+**Expertise.** You should be familiar with Linux command line and
+standard Linux commands. You should have basic understanding of git,
+Python packages. You should have knowledge about how to install and
+configure software on your Linux distribution. You should be able to
+add commands to your distribution's startup scripts. If one of the
+commands included in this document is not available or does not
+perform the operation described here, you are expected to fix the
+issue so you can continue following this howto.
 
 **Software.** A recent Linux distribution with the following software
 installed: `python`, `easy_install`, `git`, a SQL server, standard C/C++
@@ -86,29 +86,19 @@ our ~/bin directory:
 
     $ mkdir -p ~/src/electrum
     $ cd ~/src/electrum
-    $ git://gitorious.org/electrum/server.git
+    $ git clone https://github.com/spesmilo/electrum-server.git server
     $ chmod +x ~/src/electrum/server/server.py
     $ ln -s ~/src/electrum/server/server.py ~/bin/electrum
 
-### Step 2. Install a patched version of bitcoind
+### Step 2. Donwnload Bitcoind from git & patch it
 
-Electrum server requires some small modifications to the bitcoind daemon.
-The patch is included in the Electrum sources we just downloaded, now we
-will download the Bitcoin sources, patch, compile and install the binary to
-our `~/bin` directory.
+In order for the latest versions of Electrum to work properly we will need to use the latest 
+build from Git and also patch it with an electrum specific patch.
 
-Note that updated versions may affect these instructions, so *be mindful of 
-what you are doing!*
-
-    $ cd ~/src
-    $ wget https://github.com/bitcoin/bitcoin/tarball/v0.6.0 -O bitcoin-0.6.0.tgz
-    $ tar xvzf bitcoin-0.6.0.tgz
-    $ mv bitcoin-bitcoin-b3b5ab1 bitcoin-0.6.0
-    $ cd bitcoin-0.6.0/src
-    $ patch -p 2 < ~/src/electrum/server/patches/bitcoin-0.6.0.diff
-    $ make -f makefile.unix
-    $ strip bitcoind
-    $ mv bitcoind ~/bin
+   $ cd src && git clone git://github.com/bitcoin/bitcoin.git
+   $ cd bitcoin 
+   $ patch -p2 < ~/src/electrum/server/patch/patch
+   $ cd src && make -f makefile.unix
 
 ### Step 3. Configure and start bitcoind
 
@@ -278,7 +268,7 @@ Write this in `electrum.conf`:
 
 The magic moment has come: you can now start your Electrum server:
 
-    $ electrum-server
+    $ server
 
 You should see this on the screen: