Skip to content
This repository has been archived by the owner on Jul 11, 2019. It is now read-only.

Commit

Permalink
Merge pull request #843 from rowanthorpe/patch-1
Browse files Browse the repository at this point in the history
Various syntax fixes in INSTALL.rst
  • Loading branch information
xi committed Apr 8, 2014
2 parents c80c60f + d954002 commit 87e97a0
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions INSTALLATION.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ Add ``-c hhu`` to install with the preconfiguration for HHU Düsseldorf.
Manual installation
-------------------

## Preparations
Preparations
````````````

Install required system packages (Debian Squeeze example):

Expand Down Expand Up @@ -74,8 +75,8 @@ Check out Adhocracy:
$ git submodule init
$ git submodule update

## Setup an isolated python environment to run Adhocracy

Setup an isolated python environment to run Adhocracy
`````````````````````````````````````````````````````
To install Adhocracy you need python (2.6|2.7) with PIL (python imaging) but
no other system-packages.

Expand All @@ -86,7 +87,8 @@ Compile python and PIL with the included python buildout::
$ bin/buildout
$ cd ..

## Install and start Adhocracy
Install and start Adhocracy
```````````````````````````

Run buildout:

Expand Down Expand Up @@ -155,14 +157,16 @@ Buildout configuration
- Use your custom buildout file to remove the included files you do not
need:

[buildout] extends = buildout\_development.cfg parts -= postgresql
::

[buildout] extends = buildout\_development.cfg parts -= postgresql

Developer instructions
----------------------

To use your own `fork <https://help.github.com/articles/fork-a-repo>`_
instead of the regular("upstream") adhocracy, use
```git remote`` <http://www.kernel.org/pub/software/scm/git/docs/git-remote.html>`_:
`git remote <http://www.kernel.org/pub/software/scm/git/docs/git-remote.html>`_:

::

Expand All @@ -174,9 +178,9 @@ instead of the regular("upstream") adhocracy, use

You can now execute ``git pull origin`` to update your local copy with
new upstream changes. Use
```commit`` <http://www.kernel.org/pub/software/scm/git/docs/git-commit.html>`_
`commit <http://www.kernel.org/pub/software/scm/git/docs/git-commit.html>`_
and
```push`` <http://www.kernel.org/pub/software/scm/git/docs/git-push.html>`_
`push <http://www.kernel.org/pub/software/scm/git/docs/git-push.html>`_
to record and publish your changes. As soon as you are confident that
you have implemented a feature or corrected a bug, create a `pull
request <https://help.github.com/articles/using-pull-requests>`_ to ask
Expand Down

0 comments on commit 87e97a0

Please sign in to comment.