Update docs from wiki:

modified:   doc/wiki/install-linux/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md
	modified:   doc/wiki/install-linux/Install-MMGen-on-Debian-or-Ubuntu-Linux.md

doc/wiki/install-linux/Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux.md

@@ -9,9 +9,10 @@ version 1.54 on Ubuntu 13.10 is reported not to work):
 		libboost-test-dev
 		libboost-thread-dev
 
-You'll also need the standard build tools such as automake, autoconf and
-libtool, but these are probably already on your system if you've done any
-compiling from source.
+You'll also need the standard build tools if they're not already on your system:
+
+		sudo apt-get install build-essential libtool autotools-dev autoconf pkg-config libssl-dev
+
 
 Clone the bitcoin repository from Github, configure, and build:
 
@@ -21,11 +22,16 @@ Clone the bitcoin repository from Github, configure, and build:
 		$ ./configure --without-gui
 		$ make -j4
 
-If 'configure' complains about a missing libdb version 4.8, you have
-two options: either install the libdb4.8-dev package or use the add the
-'--with-incompatible-bdb' option to the 'configure' command line.  Be warned
-that the latter option will result in your 'wallet.dat' files being incompatible
-with the binary build of bitcoind.
+If 'configure' complains about a missing libdb version 4.8, you have two
+options: either install the libdb4.8-dev and libdb4.8++-dev packages (you may
+have to obtain them from elsewhere) or install your distribution's current
+libdbX.X-dev and libdbX.X++-dev packages and add the '--with-incompatible-bdb'
+option to the 'configure' command line.  Be warned that the latter option will
+result in your 'wallet.dat' files being incompatible with the prebuilt binary
+version of bitcoind.
+
+For more detailed information on this and other dependency issues, consult the
+file 'doc/build-unix.md' in the bitcoin source repository.
 
 Your freshly compiled daemon is now in the src/ directory.  Refer to **Run:** on
 the [binary installation page][01] for running instructions.

doc/wiki/install-linux/Install-MMGen-on-Debian-or-Ubuntu-Linux.md

@@ -2,11 +2,27 @@
 
 Install the pip Python installer:
 
-		$ sudo apt-get install python-pip
+		$ sudo apt-get install python-pip python-dev
 
 Install required Python modules:
 
-		$ sudo pip install ecdsa scrypt pycrypto bitcoin-python pexpect
+		$ sudo pip install ecdsa scrypt pycrypto bitcoin-python
+
+Install the pexpect Python module:
+
+		$ sudo pip install pexpect
+
+		Note: pexpect v4.0.1 (the latest version as of this writing) is
+		BROKEN and will cause errors when running the test suite!
+		If this is the version you just installed on your system (examine the
+		output of 'pip freeze' to find out), then you must downgrade.  Note
+		that newer versions may be broken as well.  Version 3.1 is known to work
+		and can be found [here][03].  First, uninstall the broken pexpect:
+
+		$ sudo pip uninstall pexpect
+
+		Then download and unpack the v3.1 tarball, cd to the archive root and
+		run 'sudo python setup.py install' to install it.
 
 Install MMGen:
 
@@ -15,8 +31,10 @@ Install MMGen:
 
 Install vanitygen (optional but recommended):
 
+		$ sudo apt-get install libpcre3-dev
 		$ git clone https://github.com/samr7/vanitygen.git
-		(build and put the "keyconv" executable in your path)
+		$ cd vanitygen; make
+		(copy the "keyconv" executable to your path)
 
 Install bitcoind:
 
@@ -40,3 +58,4 @@ Started with MMGen**][gs].
 [01]: Install-Bitcoind
 [02]: Install-Bitcoind-from-Source-on-Debian-or-Ubuntu-Linux
 [gs]: Getting-Started-with-MMGen
+[03]: https://pypi.python.org/packages/source/p/pexpect/pexpect-3.1.tar.gz