Clean up config files.

This removes useless comments and sets the proper encodings.

diff --git a/conf/exodus.py b/conf/exodus.py
index aaba28a8c56694ccb00a4be507f43245a9230eeb..aad10e22f5a121fbf442ebab587d0c33348bffb1 100644 (file)
--- a/conf/exodus.py
+++ b/conf/exodus.py
@@ -1,16 +1,5 @@
-# -*- coding: iso-8859-1 -*-
-# IMPORTANT! This encoding (charset) setting MUST be correct! If you live in a
-# western country and you don't know that you use utf-8, you probably want to
-# use iso-8859-1 (or some other iso charset). If you use utf-8 (a Unicode
-# encoding) you MUST use: coding: utf-8
-# That setting must match the encoding your editor uses when you modify the
-# settings below. If it does not, special non-ASCII chars will be wrong.
-
-"""
-This is a sample config for a wiki that is part of a wiki farm and uses
-farmconfig for common stuff. Here we define what has to be different from
-the farm's common settings.
-"""
+# -*- coding: utf-8 -*-
+# IMPORTANT! This encoding (charset) setting MUST be correct! 
 
 # we import the FarmConfig class for common defaults of our wikis:
 from farmconfig import FarmConfig
@@ -20,12 +9,11 @@ from farmconfig import data_dir_root
 # now we subclass that config (inherit from it) and change what's different:
 class Config(FarmConfig):
 
-    # basic options (you normally need to change these)
+    # basic options
     sitename = u'Exodus' # [Unicode]
     interwikiname = 'Exodus'
 
-    # name of entry page / front page [Unicode], choose one of those:
-
+    # name of entry page
     page_front_page = u"Home"
 
     data_dir = data_dir_root + '/exodus/'

diff --git a/conf/extinction.py b/conf/extinction.py
index 5776e5971c300eed9af31883aeb856d489d40169..3137da196b37b9c399fa8b19e5b407fe1abbd3f8 100644 (file)
--- a/conf/extinction.py
+++ b/conf/extinction.py
@@ -1,16 +1,5 @@
-# -*- coding: iso-8859-1 -*-
-# IMPORTANT! This encoding (charset) setting MUST be correct! If you live in a
-# western country and you don't know that you use utf-8, you probably want to
-# use iso-8859-1 (or some other iso charset). If you use utf-8 (a Unicode
-# encoding) you MUST use: coding: utf-8
-# That setting must match the encoding your editor uses when you modify the
-# settings below. If it does not, special non-ASCII chars will be wrong.
-
-"""
-This is a sample config for a wiki that is part of a wiki farm and uses
-farmconfig for common stuff. Here we define what has to be different from
-the farm's common settings.
-"""
+# -*- coding: utf-8 -*-
+# IMPORTANT! This encoding (charset) setting MUST be correct!
 
 # we import the FarmConfig class for common defaults of our wikis:
 from farmconfig import FarmConfig
@@ -20,12 +9,11 @@ from farmconfig import data_dir_root
 # now we subclass that config (inherit from it) and change what's different:
 class Config(FarmConfig):
 
-    # basic options (you normally need to change these)
-    sitename = u'Extinction' # [Unicode]
+    # basic options
+    sitename = u'Extinction'
     interwikiname = 'Extinction'
 
-    # name of entry page / front page [Unicode], choose one of those:
-
+    # name of entry page
     page_front_page = u"Home"
 
     data_dir = data_dir_root + '/extinction/'

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 2eb76223dd71a33f4ff54fea84400aebc89d438f..f12dac67d6740c149402546ed23650a81aa302c0 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -1,17 +1,9 @@
-# -*- coding: iso-8859-1 -*-
-# IMPORTANT! This encoding (charset) setting MUST be correct! If you live in a
-# western country and you don't know that you use utf-8, you probably want to
-# use iso-8859-1 (or some other iso charset). If you use utf-8 (a Unicode
-# encoding) you MUST use: coding: utf-8
-# That setting must match the encoding your editor uses when you modify the
-# settings below. If it does not, special non-ASCII chars will be wrong.
+# -*- coding: utf-8 -*-
+# IMPORTANT! This encoding (charset) setting MUST be correct!
 
 """
     MoinMoin - Configuration for a wiki farm
 
-    If you run a single wiki only, you can keep the "wikis" list "as is"
-    (it has a single rule mapping all requests to mywiki.py).
-
     Note that there are more config options than you'll find in
     the version of this file that is installed by default; see
     the module MoinMoin.config.multiconfig for a full list of names and their
@@ -83,17 +75,6 @@ class FarmConfig(DefaultConfig):
 
     # Critical setup  ---------------------------------------------------
 
-    # Misconfiguration here will render your wiki unusable. Check that
-    # all directories are accessible by the web server or moin server.
-
-    # If you encounter problems, try to set data_dir and data_underlay_dir
-    # to absolute paths.
-
-    # Where your mutable wiki pages are. You want to make regular
-    # backups of this directory.
-    #data_dir = './data/'
-    # Will be set by individual configs
-
     # Where read-only system and help page are. You might want to share
     # this directory between several wikis. When you update MoinMoin,
     # you can safely replace the underlay directory with a new one. This
@@ -118,20 +99,10 @@ class FarmConfig(DefaultConfig):
 
     # Security ----------------------------------------------------------
 
-    # This is checked by some rather critical and potentially harmful actions,
-    # like despam or PackageInstaller action:
-    #superuser = [u"YourName", ]
-
-    # IMPORTANT: grant yourself admin rights! replace YourName with
-    # your user name. See HelpOnAccessControlLists for more help.
-    # All acl_rights_xxx options must use unicode [Unicode]
-    #acl_rights_before = u"YourName:read,write,delete,revert,admin"
-
     # Link spam protection for public wikis (uncomment to enable).
     # Needs a reliable internet connection.
     #from MoinMoin.security.antispam import SecurityPolicy
 
-        
     acl_hierarchic = True
 
     # Give users all rights, but don't give any rights to anonymous users
@@ -140,17 +111,7 @@ class FarmConfig(DefaultConfig):
 
     # Mail --------------------------------------------------------------
 
-    # Configure to enable subscribing to pages (disabled by default) or
-    # sending forgotten passwords.
-
-    # SMTP server, e.g. "mail.provider.com" (empty or None to disable mail)
-    #mail_smarthost = ""
-
-    # The return address, e.g u"Jürgen Wiki <noreply@mywiki.org>" [Unicode]
-    #mail_from = u""
-
-    # "user pwd" if you need to use SMTP AUTH
-    #mail_login = ""
+    # Not configured
 
 
     # User interface ----------------------------------------------------
@@ -162,8 +123,6 @@ class FarmConfig(DefaultConfig):
     # page names for system and help pages, those will be used automatically
     # according to the user selected language. [Unicode]
     navi_bar = [
-        # If you want to show your page_front_page here:
-        #u'%(page_front_page)s',
         u'RecentChanges',
         u'FindPage',
         u'HelpContents',
@@ -175,9 +134,6 @@ class FarmConfig(DefaultConfig):
 
     # Language options --------------------------------------------------
 
-    # See http://moinmo.in/ConfigMarket for configuration in
-    # YOUR language that other people contributed.
-
     # The main wiki language, set the direction of the wiki pages
     language_default = 'en'
 
@@ -197,9 +153,6 @@ class FarmConfig(DefaultConfig):
     show_interwiki = 1
     logo_string = u''
 
-    # Enable graphical charts, requires gdchart.
-    #chart_options = {'width': 600, 'height': 300}
-
     # The GUI WYSISYG editor is not installed with Debian.
     # See /usr/share/doc/$(cdbs_curpkg)/README.Debian for more info
     editor_force = True