--- a/ChangeLog	Sat Feb 04 17:23:14 2006 +0000
+++ b/ChangeLog	Sat Feb 04 20:21:16 2006 +0000
@@ -2,6 +2,28 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-02-04 21:21:16 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-430
+
+    Summary:
+      make farmconfig samples easier to use for a single wiki, too
+    Revision:
+      moin--main--1.5--patch-430
+
+    make farmconfig samples easier to use for a single wiki, too
+    
+
+    modified files:
+     ChangeLog wiki/config/wikiconfig.py
+     wiki/config/wikifarm/farmconfig.py
+     wiki/config/wikifarm/mywiki.py
+
+    renamed files:
+     wiki/config/wikifarm/.arch-ids/moinmaster.py.id
+       ==> wiki/config/wikifarm/.arch-ids/mywiki.py.id
+     wiki/config/wikifarm/moinmaster.py
+       ==> wiki/config/wikifarm/mywiki.py
+
+
 2006-02-04 18:23:14 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-429
 
     Summary:

--- a/wiki/config/wikiconfig.py	Sat Feb 04 17:23:14 2006 +0000
+++ b/wiki/config/wikiconfig.py	Sat Feb 04 20:21:16 2006 +0000
@@ -23,9 +23,6 @@
 
     ** Please do not use this file for a wiki farm. Use the sample file 
     from the wikifarm directory instead! **
-
-    @copyright: 2000-2005 by Juergen Hermann <jh@web.de>
-    @license: GNU GPL, see COPYING for details.
 """
 
 from MoinMoin.multiconfig import DefaultConfig
@@ -44,10 +41,10 @@
     logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo">'
 
     # name of entry page / front page [Unicode], choose one of those:
-    
+
     # a) if most wiki content is in a single language
     #page_front_page = u"MyStartingPage"
-    
+
     # b) if wiki content is maintained in many languages
     #page_front_page = u"FrontPage"
 
@@ -56,8 +53,7 @@
     # Show the interwiki name (and link it to page_front_page) in the Theme,
     # nice for farm setups or when your logo does not show the wiki's name.
     #show_interwiki = 1
-    
-    
+
 
     # Critical setup  ---------------------------------------------------
 
@@ -81,26 +77,26 @@
     # This must be '/wiki' for twisted and standalone. For CGI, it should
     # match your Apache Alias setting.
     url_prefix = '/wiki'
-    
+
 
     # 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.util.antispam import SecurityPolicy
 
 
     # Mail --------------------------------------------------------------
-    
+
     # Configure to enable subscribing to pages (disabled by default)
     # or sending forgotten passwords.
 
@@ -115,7 +111,7 @@
 
 
     # User interface ----------------------------------------------------
-    
+
     # Add your wikis important pages at the end. It is not recommended to
     # remove the default links.  Leave room for user links - don't use
     # more than 6 short items.
@@ -132,7 +128,7 @@
 
     # The default theme anonymous or new users get
     theme_default = 'modern'
-    
+
 
     # Language options --------------------------------------------------
 

--- a/wiki/config/wikifarm/farmconfig.py	Sat Feb 04 17:23:14 2006 +0000
+++ b/wiki/config/wikifarm/farmconfig.py	Sat Feb 04 20:21:16 2006 +0000
@@ -9,9 +9,8 @@
 """
     MoinMoin - Configuration for a wiki farm
 
-    If you run a single wiki only, you can omit this file file and just
-    use wikiconfig.py - it will be used for every request we get in that
-    case.
+    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
@@ -20,9 +19,6 @@
 
     Also, the URL http://moinmoin.wikiwikiweb.de/HelpOnConfiguration has
     a list of config options.
-
-    @copyright: 2000-2005 by Juergen Hermann <jh@web.de>
-    @license: GNU GPL, see COPYING for details.
 """
 
 
@@ -44,11 +40,16 @@
 #  * in the right part, "^" means "beginning" and "$" means "end"
 
 wikis = [
-    # wikiname,     url regular expression (no protocol)
     # Standalone server needs the port e.g. localhost:8000
     # Twisted server can now use the port, too.
-    ("moinmaster",  r"^moinmaster.wikiwikiweb.de/.*$"),
-    ("moinmoin",    r"^moinmoin.wikiwikiweb.de/.*$"),
+    
+    # wikiname,     url regular expression (no protocol)
+    # ---------------------------------------------------------------
+    ("mywiki",  r".*"),   # this is ok for a single wiki
+
+    # for multiple wikis, do something like this:
+    #("moinmoin",    r"^moinmoin.wikiwikiweb.de/.*$"),
+    #("moinmaster",  r"^moinmaster.wikiwikiweb.de/.*$"),
 ]
 
 
@@ -93,26 +94,26 @@
     # This must be '/wiki' for twisted and standalone. For CGI, it should
     # match your Apache Alias setting.
     url_prefix = '/wiki'
-    
+
 
     # 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.util.antispam import SecurityPolicy
 
 
     # Mail --------------------------------------------------------------
-    
+
     # Configure to enable subscribing to pages (disabled by default) or
     # sending forgotten passwords.
 
@@ -127,7 +128,7 @@
 
 
     # User interface ----------------------------------------------------
-    
+
     # Add your wikis important pages at the end. It is not recommended to
     # remove the default links.  Leave room for user links - don't use
     # more than 6 short items.
@@ -144,7 +145,7 @@
 
     # The default theme anonymous or new users get
     theme_default = 'modern'
-    
+
 
     # Language options --------------------------------------------------
 
@@ -157,7 +158,6 @@
     # You must use Unicode strings here [Unicode]
     page_category_regex = u'^Category[A-Z]'
     page_dict_regex = u'[a-z]Dict$'
-    page_form_regex = u'[a-z]Form$'
     page_group_regex = u'[a-z]Group$'
     page_template_regex = u'[a-z]Template$'
 
@@ -170,7 +170,7 @@
     # nice for farm setups or when your logo does not show the wiki's name.
     show_interwiki = 1
     logo_string = u''
-   
+
     # Enable graphical charts, requires gdchart.
     #chart_options = {'width': 600, 'height': 300}
 

--- a/wiki/config/wikifarm/moinmaster.py	Sat Feb 04 17:23:14 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# -*- 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.
-"""
-
-# we import the FarmConfig class for common defaults of our wikis:
-from farmconfig import FarmConfig
-
-# 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'MoinMaster' # [Unicode]
-    interwikiname = 'MoinMaster'
-
-    # name of entry page / front page [Unicode], choose one of those:
-    
-    # a) if most wiki content is in a single language
-    #page_front_page = u"MyStartingPage"
-    
-    # b) if wiki content is maintained in many languages
-    page_front_page = u"FrontPage"
-
-    data_dir = '/org/de.wikiwikiweb.moinmaster/data/'
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/config/wikifarm/mywiki.py	Sat Feb 04 20:21:16 2006 +0000
@@ -0,0 +1,34 @@
+# -*- 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.
+"""
+
+# we import the FarmConfig class for common defaults of our wikis:
+from farmconfig import FarmConfig
+
+# 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'MyWiki' # [Unicode]
+    interwikiname = 'MyWiki'
+
+    # name of entry page / front page [Unicode], choose one of those:
+
+    # a) if most wiki content is in a single language
+    #page_front_page = u"MyStartingPage"
+
+    # b) if wiki content is maintained in many languages
+    page_front_page = u"FrontPage"
+
+    data_dir = '/org/mywiki/data/'
+