Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

1 files changed, 20 insertions, 20 deletions

diff --git a/local_settings.py.example b/local_settings.py.example
index b452030e..3e33aa7e 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -14,24 +14,24 @@ ADMINS = (
 )
 
 ## PostgreSQL Database settings
-DATABASES = {
-    'default': {
-        'ENGINE'  : 'django.db.backends.postgresql_psycopg2',
-        'NAME'    : 'parabola',
-        'USER'    : 'parabola',
-        'PASSWORD': 'parabola',
-        'HOST'    : '',
-        'PORT'    : '',
-    },
-}
+#DATABASES = {
+#    'default': {
+#        'ENGINE'  : 'django.db.backends.postgresql_psycopg2',
+#        'NAME'    : 'archlinux',
+#        'USER'    : 'archlinux',
+#        'PASSWORD': 'archlinux',
+#        'HOST'    : '',
+#        'PORT'    : '',
+#    },
+#}
 
 ## MySQL Database settings
 #DATABASES = {
 #    'default': {
 #        'ENGINE'  : 'django.db.backends.mysql',
-#        'NAME'    : 'parabola',
-#        'USER'    : 'parabola',
-#        'PASSWORD': 'parabola',
+#        'NAME'    : 'archlinux',
+#        'USER'    : 'archlinux',
+#        'PASSWORD': 'archlinux',
 #        'HOST'    : '',
 #        'PORT'    : '',
 #        # InnoDB WILL NOT work
@@ -39,13 +39,13 @@ DATABASES = {
 #    },
 #}
 
-## sqlite3 Database settings
-#DATABASES = {
-#    'default': {
-#        'ENGINE' : 'sqlite3',
-#        'NAME'   : '/srv/http/web/db.sqlite',
-#    },
-#}
+## Sqlite Database settings
+DATABASES = {
+    'default': {
+        'ENGINE'  : 'django.db.backends.sqlite3',
+        'NAME'    : 'database.db',
+    },
+}
 
 ## Define cache settings
 CACHES = {