# HG changeset patch # User Thomas Waldmann # Date 1473210327 -7200 # Node ID cefd695e7572b8ac865880aba2aa88f21d5cc16d # Parent 01e4a21a5d1d9b06074cb488da8ebbf07e7ec415# Parent d811122349fbb1d67dd661b24dfe02783e5d4286 merged Roger's changes diff -r 01e4a21a5d1d -r cefd695e7572 MoinMoin/theme/__init__.py --- a/MoinMoin/theme/__init__.py Thu Mar 19 18:34:51 2015 +0100 +++ b/MoinMoin/theme/__init__.py Wed Sep 07 03:05:27 2016 +0200 @@ -1701,6 +1701,8 @@ + + %s %s %s diff -r 01e4a21a5d1d -r cefd695e7572 wiki/server/moin --- a/wiki/server/moin Thu Mar 19 18:34:51 2015 +0100 +++ b/wiki/server/moin Wed Sep 07 03:05:27 2016 +0200 @@ -15,7 +15,7 @@ # a1) Path of the directory where the MoinMoin code package is located. # Needed if you installed with --prefix=PREFIX or you didn't use setup.py. -#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages') +#sys.path.insert(0, 'PREFIX/lib/python2.7/site-packages') # a2) Path of the directory where wikiconfig.py / farmconfig.py is located. # See wiki/config/... for some sample config files. diff -r 01e4a21a5d1d -r cefd695e7572 wiki/server/moin.ajp --- a/wiki/server/moin.ajp Thu Mar 19 18:34:51 2015 +0100 +++ b/wiki/server/moin.ajp Wed Sep 07 03:05:27 2016 +0200 @@ -15,7 +15,7 @@ # a1) Path of the directory where the MoinMoin code package is located. # Needed if you installed with --prefix=PREFIX or you didn't use setup.py. -#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages') +#sys.path.insert(0, 'PREFIX/lib/python2.7/site-packages') # a2) Path of the directory where wikiconfig.py / farmconfig.py is located. # See wiki/config/... for some sample config files. diff -r 01e4a21a5d1d -r cefd695e7572 wiki/server/moin.cgi --- a/wiki/server/moin.cgi Thu Mar 19 18:34:51 2015 +0100 +++ b/wiki/server/moin.cgi Wed Sep 07 03:05:27 2016 +0200 @@ -17,7 +17,7 @@ # a1) Path of the directory where the MoinMoin code package is located. # Needed if you installed with --prefix=PREFIX or you didn't use setup.py. -#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages') +#sys.path.insert(0, 'PREFIX/lib/python2.7/site-packages') # a2) Path of the directory where wikiconfig.py / farmconfig.py is located. # See wiki/config/... for some sample config files. diff -r 01e4a21a5d1d -r cefd695e7572 wiki/server/moin.fcgi --- a/wiki/server/moin.fcgi Thu Mar 19 18:34:51 2015 +0100 +++ b/wiki/server/moin.fcgi Wed Sep 07 03:05:27 2016 +0200 @@ -18,7 +18,7 @@ # a1) Path of the directory where the MoinMoin code package is located. # Needed if you installed with --prefix=PREFIX or you didn't use setup.py. -#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages') +#sys.path.insert(0, 'PREFIX/lib/python2.7/site-packages') # a2) Path of the directory where wikiconfig.py / farmconfig.py is located. # See wiki/config/... for some sample config files. diff -r 01e4a21a5d1d -r cefd695e7572 wiki/server/moin.scgi --- a/wiki/server/moin.scgi Thu Mar 19 18:34:51 2015 +0100 +++ b/wiki/server/moin.scgi Wed Sep 07 03:05:27 2016 +0200 @@ -15,7 +15,7 @@ # a1) Path of the directory where the MoinMoin code package is located. # Needed if you installed with --prefix=PREFIX or you didn't use setup.py. -#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages') +#sys.path.insert(0, 'PREFIX/lib/python2.7/site-packages') # a2) Path of the directory where wikiconfig.py / farmconfig.py is located. # See wiki/config/... for some sample config files. diff -r 01e4a21a5d1d -r cefd695e7572 wiki/server/moin.wsgi --- a/wiki/server/moin.wsgi Thu Mar 19 18:34:51 2015 +0100 +++ b/wiki/server/moin.wsgi Wed Sep 07 03:05:27 2016 +0200 @@ -3,7 +3,7 @@ MoinMoin - mod_wsgi driver script To use this, add those statements to your Apache's VirtualHost definition: - + # you will invoke your moin wiki at the root url, like http://servername/FrontPage: WSGIScriptAlias / /some/path/moin.wsgi @@ -25,7 +25,7 @@ # a1) Path of the directory where the MoinMoin code package is located. # Needed if you installed with --prefix=PREFIX or you didn't use setup.py. -#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages') +#sys.path.insert(0, 'PREFIX/lib/python2.7/site-packages') # a2) Path of the directory where wikiconfig.py / farmconfig.py is located. # See wiki/config/... for some sample config files. diff -r 01e4a21a5d1d -r cefd695e7572 wiki/server/test.wsgi --- a/wiki/server/test.wsgi Thu Mar 19 18:34:51 2015 +0100 +++ b/wiki/server/test.wsgi Wed Sep 07 03:05:27 2016 +0200 @@ -11,11 +11,10 @@ The main use of this script will be using the WSGI "application" defined below within your production WSGI environment. You will use some code similar to what you see at the end of this script to use the application from that -environment. For the special case of apache2/mod_wsgi, it shoud be possible +environment. For the special case of apache2/mod_wsgi, it should be possible to directly use this file. -If you start this script from the commandline either with python2.5 or with -and older python + wsgiref module installed, it will serve the content on +If you start this script from the commandline, it will serve the content on http://localhost:8000/ - this is mainly for debugging THIS script. @copyright: 2008 by MoinMoin:ThomasWaldmann diff -r 01e4a21a5d1d -r cefd695e7572 wikiserver.py --- a/wikiserver.py Thu Mar 19 18:34:51 2015 +0100 +++ b/wikiserver.py Wed Sep 07 03:05:27 2016 +0200 @@ -14,7 +14,7 @@ # a1) Path of the directory where the MoinMoin code package is located. # Needed if you installed with --prefix=PREFIX or you didn't use setup.py. -#sys.path.insert(0, 'PREFIX/lib/python2.4/site-packages') +#sys.path.insert(0, 'PREFIX/lib/python2.7/site-packages') # a2) Path of the directory where wikiconfig.py / farmconfig.py is located. moinpath = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))