Permalink
Browse files

Added a link to the sample installation. Fixed typos.

  • Loading branch information...
1 parent 6f43fa8 commit 35b96e38c5926f4728534049a25e4b58076253d1 @bartTC bartTC committed May 28, 2009
Showing with 9 additions and 5 deletions.
  1. +8 −4 README.rst
  2. +1 −1 setup.py
View
@@ -3,7 +3,11 @@ django-wakawaka
===============
django-wakawka is a super simple wiki system written in Python using the Django
-framework.
+framework. A sample installation is available under::
+
+ http://wakawaka.mahner.org/
+
+Log in with the username ``admin`` and the password ``admin``.
Installation:
=============
@@ -32,9 +36,9 @@ Example::
WAKAWAKA_DEFAULT_INDEX = 'Home'
Words that are written in CamelCase (a pair of one upper letter followed by
-*n* lower letters) are automatically treated as internal wiki link. You can
-change this behaviour by adding a setting ``WAKAWAKA_SLUG_REGEX`` in your
-settings.py. This holds a regular expression of the wiki urls. Default::
+*n* lower letters) are automatically treated as internal wiki links. You can
+change this behaviour by adding a setting ``WAKAWAKA_SLUG_REGEX`` to your
+settings.py. This holds a regular expression of the wiki name format. Default::
WAKAWAKA_SLUG_REGEX = r'((([A-Z]+[a-z]+){2,})(/([A-Z]+[a-z]+){2,})*)'
View
@@ -2,7 +2,7 @@
setup(
name='django-wakawaka',
- version='0.1',
+ version='0.1.1',
description='A super simple wiki app written in Python using the Django Framwork',
long_description=open('README.rst').read(),
author='Martin Mahner',

0 comments on commit 35b96e3

Please sign in to comment.