aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/deploymenthowto.rst5
-rw-r--r--docs/git.rst4
-rw-r--r--docs/hackinghowto.rst25
3 files changed, 30 insertions, 4 deletions
diff --git a/docs/deploymenthowto.rst b/docs/deploymenthowto.rst
index d943e276..f50edfb6 100644
--- a/docs/deploymenthowto.rst
+++ b/docs/deploymenthowto.rst
@@ -10,4 +10,7 @@ Step 2: ?
Step 3: Write the deployment guide and profit!
-But seriously, this is a stub since we're not quite there, yet.
+But seriously, this is a stub since we're not quite there (yet) but if
+you want to see where we are now, you can try to run the latest
+development version by following the instructions at
+:ref:`hacking-howto`.
diff --git a/docs/git.rst b/docs/git.rst
index 73e7a311..bd0f9d52 100644
--- a/docs/git.rst
+++ b/docs/git.rst
@@ -63,6 +63,10 @@ Further, if you isolate your changes to a branch, then you can work on
multiple issues at the same time and they don't conflict with one
another.
+Name your branches using the isue number and something that makes it clear
+what it's about. For example, if you were working on tagging, you
+might name your branch ``360_tagging``.
+
Properly document your changes
------------------------------
diff --git a/docs/hackinghowto.rst b/docs/hackinghowto.rst
index 914a5135..caafba53 100644
--- a/docs/hackinghowto.rst
+++ b/docs/hackinghowto.rst
@@ -60,7 +60,7 @@ requirements::
On Fedora::
yum install mongodb-server python-paste-deploy python-paste-script \
- git-core python python-devel
+ git-core python python-devel python-lxml
.. YouCanHelp::
@@ -85,7 +85,7 @@ After installing the requirements, follow these steps:
1. Clone the repository::
- git clone http://git.gitorious.org/mediagoblin/mediagoblin.git
+ git clone git://gitorious.org/mediagoblin/mediagoblin.git
2. Bootstrap and run buildout::
@@ -194,7 +194,26 @@ If it's installed, check the mongodb log. On my machine, that's
old lock file: /var/lib/mongodb/mongod.lock. probably means...
-Then delete the lock file and relaunch mongodb.
+in that case you might have had an unclean shutdown. Try::
+
+ sudo mongod --repair
+
+If that didn't work, just delete the lock file and relaunch mongodb.
+
+Anyway, then start the mongodb server in whatever way is appropriate
+for your distro / OS.
+
+
+pkg_resources.DistributionNotFound: distribute
+----------------------------------------------
+
+If you get this while running buildout::
+
+ pkg_resources.DistributionNotFound: distribute
+
+Try this commmand instead::
+
+ python bootstrap.py --distribute && ./bin/buildout
Wiping your user data