changeset 1423:25be55af8b8b

Merge with main.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Sat, 26 Aug 2006 16:22:16 +0200
parents 16a334acdd40 (current diff) fcadd1faee76 (diff)
children 3955bc311bb2 fe417a0903fd
files
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Fri Aug 25 13:10:52 2006 +0200
+++ b/MoinMoin/config/multiconfig.py	Sat Aug 26 16:22:16 2006 +0200
@@ -419,8 +419,9 @@
     # immediately and we have no problem with stale caches.
     url_prefix_static = '/moin_static160'
 
-    # we need to prefix actions to be able to exclude them by robots.txt:
-    url_prefix_action = 'action' # no leading or trailing '/'
+    # we could prefix actions to be able to exclude them by robots.txt:
+    #url_prefix_action = 'action' # no leading or trailing '/'
+    url_prefix_action = None # compatiblity
 
     logo_string = None
     interwikiname = None
--- a/docs/CHANGES	Fri Aug 25 13:10:52 2006 +0200
+++ b/docs/CHANGES	Sat Aug 26 16:22:16 2006 +0200
@@ -249,12 +249,13 @@
       braindead robots.txt standard. You can only disallow pathes there, but
       moin's actions were querystring based, not path based (this would need
       regex support in robots.txt, but there is no such thing).
-      This changed now. Moin will now generate action URLs you can handle in
+      This changed now. Moin is able to generate action URLs you can handle in
       robots.txt, like /action/info/PageName?action=info. So if you don't want
       bots triggering actions, just disallow /action/ there. Keep in mind that
       attachments are handled by /action/AttachFile, so if you want attached
       files and pictures indexed by search engine, don't disallow
-      /action/AttachFile/ in your robots.txt.
+      /action/AttachFile/ in your robots.txt. In order to use this feature,
+      set url_prefix_action in your wikiconfig to e.g. "action".
     * We don't use ...?action=show any more for the "Clear message" links shown
       in the message boxes, but directly link to the page.
 
--- a/wiki/htdocs/robots.txt	Fri Aug 25 13:10:52 2006 +0200
+++ b/wiki/htdocs/robots.txt	Sat Aug 26 16:22:16 2006 +0200
@@ -4,6 +4,10 @@
 Crawl-delay: 20
 # This has to match script url + cfg.url_prefix_action - it
 # saves lots of search engine load and traffic by disallowing crawlers
-# to request action related URLs:
+# to request action related URLs.
+#
+# NOTE - in order to make this have any effect, you have to set
+#        url_prefix_action to "action", cf. HelpOnConfiguration
+
 Disallow: /action/