changeset 842:4bd5f5f8f95a

merge with main (something's wrong?!)
author Franz Pletz <fpletz AT franz-pletz DOT org>
date Wed, 14 Jun 2006 20:33:15 +0200
parents 3157ddeb3667 (current diff) 0710dd481945 (diff)
children 11a9d77e92d3
files
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/converter/text_html_text_moin_wiki.py	Tue Jun 13 17:46:57 2006 +0200
+++ b/MoinMoin/converter/text_html_text_moin_wiki.py	Wed Jun 14 20:33:15 2006 +0200
@@ -1113,7 +1113,7 @@
                 self.text.append("%s" % interwikiname)
                 return
             elif title == 'Self':
-                self.text.append("[:%s:%s]" % (href, text))
+                self.text.append('["%s" %s]' % (href, text))
                 return
             elif interwikiname:
                 self.text.append("[wiki:%s %s]" % (interwikiname, text))
@@ -1129,9 +1129,9 @@
             if title and title.startswith("attachment:"):
                 url = wikiutil.url_unquote(title[len("attachment:"):])
                 if url != text:
-                    self.text.append("[%s %s]" % (title, text))
+                    self.text.append('[attachment:"%s" %s]' % (url, text))
                 else:
-                    self.text.extend([self.white_space, title, self.white_space])
+                    self.text.extend([self.white_space, 'attachment:"%s"' % url, self.white_space])
             # wiki link
             elif href.startswith(scriptname):
                 pagename = href[len(scriptname):]
@@ -1149,7 +1149,7 @@
                     self.text.append(wikiutil.pagelinkmarkup(text))
                 # labeled link
                 else:
-                    self.text.append("[:%s:%s]" % (pagename, text))
+                    self.text.append('["%s" %s]' % (pagename, text))
             # mailto link
             elif href.startswith("mailto:"):
                 if href[len("mailto:"):] == text:
--- a/wiki/config/more_samples/ldap_smb_farmconfig.py	Tue Jun 13 17:46:57 2006 +0200
+++ b/wiki/config/more_samples/ldap_smb_farmconfig.py	Wed Jun 14 20:33:15 2006 +0200
@@ -87,7 +87,8 @@
     #ldap_bindpw = 'secret'
     
     #or we can use the username and password we got from the user:
-    ldap_binddn = '%(username)s@example.org' # DN we use for first bind
+    ldap_binddn = '%(username)s@example.org' # DN we use for first bind (AD)
+    #ldap_binddn = 'cn=admin,dc=example,dc=org' # DN we use for first bind (OpenLDAP)
     ldap_bindpw = '%(password)s' # password we use for first bind
     
     ldap_base = 'ou=SOMEUNIT,dc=example,dc=org' # base DN we use for searching