Anonymous avatar Anonymous committed 6c0619a

[soc2009/multidb] Merged up to trunk r11413.

Comments (0)

Files changed (4)


-VERSION = (1, 1, 0, 'final', 0)
+VERSION = (1, 2, 0, 'alpha', 0)
 def get_version():
     version = '%s.%s' % (VERSION[0], VERSION[1])
 # other places throughout the built documents.
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 # The next version to be released
-django_next_version = '1.1'
+django_next_version = '1.2'
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:


 .. _michael meeks:
 `Brian Rosner`_
-    Brian is currently a web developer working on an e-commerce system in
-    Django. He spends his free time contributing to Django and enjoys to learn
-    more about programming languages and system architectures. Brian is the
-    co-host of the weekly podcast, `This Week in Django`_.
+    Brian is currently the tech lead at Eldarion_ managing and developing
+    Django / Pinax_ based websites. He enjoys learning more about programming
+    languages and system architectures and contributing to open source
+    projects. Brian is the host of the `Django Dose`_ podcasts.
     Brian helped immensely in getting Django's "newforms-admin" branch finished
     in time for Django 1.0; he's now a full committer, continuing to improve on
     the admin and forms system.
-    Brian lives in Denver, USA.
+    Brian lives in Denver, Colorado, USA.
 .. _brian rosner:
-.. _this week in django:
+.. _eldarion:
+.. _pinax:
+.. _django dose:
 `Gary Wilson`_
     Gary starting contributing patches to Django in 2006 while developing Web
     name = "Django",
     version = version.replace(' ', '-'),
     url = '',
-    download_url = '',
     author = 'Django Software Foundation',
     author_email = '',
     description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
                    'Topic :: Internet :: WWW/HTTP',
                    'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
                    'Topic :: Internet :: WWW/HTTP :: WSGI',
+                   'Topic :: Software Development :: Libraries :: Application Frameworks',
                    'Topic :: Software Development :: Libraries :: Python Modules',
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.