Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 14 insertions, 6 deletions

diff --git a/local_settings.py.example b/local_settings.py.example
index 30ec3d67..4be1e2e9 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -14,14 +14,22 @@ ADMINS = (
 )
 
 ## PostgreSQL Database settings
+#DATABASES = {
+#    'default': {
+#        'ENGINE'  : 'django.db.backends.postgresql_psycopg2',
+#        'NAME'    : 'archlinux',
+#        'USER'    : 'archlinux',
+#        'PASSWORD': 'archlinux',
+#        'HOST'    : '',
+#        'PORT'    : '',
+#    },
+#}
+
+## Sqlite Database settings
 DATABASES = {
     'default': {
-        'ENGINE'  : 'django.db.backends.postgresql_psycopg2',
-        'NAME'    : 'archlinux',
-        'USER'    : 'archlinux',
-        'PASSWORD': 'archlinux',
-        'HOST'    : '',
-        'PORT'    : '',
+        'ENGINE'  : 'django.db.backends.sqlite3',
+        'NAME'    : 'database.db',
     },
 }