--- orig/wiki/cgi-bin/moin.fcg
+++ mod/wiki/cgi-bin/moin.fcg
@@ -8,8 +8,7 @@
 """
 
 #import sys
-#sys.path[0:0]=['/var/www/moin-main/lib/python',
-#			   '/var/www/moin-main/wiki']
+#sys.path[0:0]=['/path/to/moin/lib/python', '/path/to/moin/config']
 
 from MoinMoin.request import RequestFastCGI
 from MoinMoin.support import thfcgi
@@ -19,6 +18,7 @@
     request.run()
 
 if __name__ == '__main__':
+    # this is a multi-threaded FastCGI
+    # use thfcgi.unTHFCGI for a single-threaded instance
     fcg = thfcgi.THFCGI(handle_request)
     fcg.run()
-


--- orig/wiki/cgi-bin/moin_modpy.htaccess
+++ mod/wiki/cgi-bin/moin_modpy.htaccess
@@ -1,21 +1,44 @@
-#
-# (c) 2004 by Oliver Graf <ograf@bitart.de>
-#
-# .htaccess file for using mod_python with MoinMoin
-#
-# install as described in INSTALL.html
-#
-# copy this file to the document root and edit the paths to
-# match your configuration.
-#
-# Under wich path should the wiki be accessible?
+##
+## (c) 2004 by Oliver Graf <ograf@bitart.de>
+##
+## .htaccess file for using mod_python with MoinMoin
+##
+## copy this file to the path below which you want to have your wiki
+## instance and edit the paths to match your configuration.
+##
+# With which name should the wiki be accessible? (wiki)
 <Files wiki>
-# Use mod_python as handler
+
+  # Use mod_python as handler
   SetHandler mod_python
-# set the path to the MoinMoin package and to the moin_config.py
-  PythonPath "['/var/www/moin-main/lib/python','/var/www/moin-main/wikimodpy']+sys.path"
-# choose the ModPy Request class as handler
-  PythonHandler MoinMoin.request::RequestModPy.run
+
+  # add the path where the moin_modpy.py wrapper can be found
+  PythonPath "['/path/to/moin/share/moin/cgi-bin']+sys.path"
+
+  # use the moin_modpy wrapper to handle requests
+  PythonHandler moin_modpy
+
 </Files>
 # voila.
 
+##
+## NOTE: due to a bug in mod_python 2.7.10, 3.0.4 and 3.1.2b you 
+##       need to use the wrapper above.
+##
+##       If you fix this bug, you can use MoinMoin without the
+##       wrapper. See MoinMoin INSTALL.html how to fix the bug.
+##       Use the following htaccess with a fixed mod_python:
+##
+# With which name should the wiki be accessible? (wiki)
+#<Files wiki>
+#
+#  # Use mod_python as handler
+#  SetHandler mod_python
+#
+#  # set the path to the MoinMoin package and to the moin_config.py
+#  PythonPath "['/path/to/moin/lib/python','/path/to/moin/config']+sys.path"
+#
+#  # choose the ModPy Request class as handler
+#  PythonHandler MoinMoin.request::RequestModPy.run
+#
+#</Files>


--- orig/wiki/cgi-bin/moin_modpy.py
+++ mod/wiki/cgi-bin/moin_modpy.py
@@ -1,29 +1,29 @@
 # -*- coding: iso-8859-1 -*-
 """
     MoinMoin - mod_python wrapper for broken mod_python versions
-    (this affects up to 3.1.2b)
 
     @copyright: 2004 by Oliver Graf <ograf@bitart.de>
     @license: GNU GPL, see COPYING for details.
 """
 ##
-## put script into some path. add .htaccess:
-## <Files wikiname>
+## add a .htaccess to the path below which you want to have your
+## wiki instance:
+##
+## <Files wiki>
 ##   SetHandler mod_python
-##   PythonPath "['/path/to/this/path']+sys.path"
+##   PythonPath "['/path/to/moin/share/moin/cgi-bin']+sys.path"
 ##   PythonHandler moin_modpy
 ## </Files>
 ##
-## Note: this is a wrapper needed beause in a bug in mod_python < 3.1.2b
-## mod_python.apache.resolve_object failing to parse object with dots.
+## Note: this is a wrapper needed because of a bug in mod_python
+## 2.7.10, 3.0.4 and 3.1.2b.
 ##
-## Version without bug (see also htaccess example in this path)
+## mod_python.apache.resolve_object fails to parse a object with dots.
 ##
-## <Files wikiname>
-##   SetHandler mod_python
-##   PythonPath "['/path/to/moin/lib/python', '/path/to/moin/config']+sys.path"
-##   PythonHandler MoinMoin.request::RequestModPy.run
-## </Files>
+## If you have a newer version, take a look at moin_modpy.htaccess
+## to see how to use MoinMoin without this wrapper. You can also
+## look into INSTALL.html to see how you can fix the bug on your own
+## (a simple one line change).
 ##
 
 #import sys
@@ -34,4 +34,3 @@
 def handler(request):
     moinreq = RequestModPy(request)
     return moinreq.run(request)
-