Switch to unified view

a/pyforge/docs/install.rst b/pyforge/docs/install.rst
...
...
51
51
52
    - python-dev
52
    - python-dev
53
    - libldap2-dev
53
    - libldap2-dev
54
    - libsasl2-dev
54
    - libsasl2-dev
55
    - rabbitmq-server
55
    - rabbitmq-server
56
57
    To run Solr you need Java compiler. For Ubuntu::
58
59
       $ sudo apt-get install sun-java6-bin sun-java6-demo sun-java6-jdk sun-java6-jre
60
       $ sudo update-alternatives --config java # select Sun Java
61
       $ export JAVA_HOME=/usr/lib/jvm/java-6-sun
56
62
57
OK, now we can get down to actually getting the forge code and dependencies
63
OK, now we can get down to actually getting the forge code and dependencies
58
downloaded and ready to go.  The first thing we'll need to set up is `Ming
64
downloaded and ready to go.  The first thing we'll need to set up is `Ming
59
<http://merciless.sourceforge.net>`_.  To do this, we'll check out the source
65
<http://merciless.sourceforge.net>`_.  To do this, we'll check out the source
60
from git::
66
from git::