Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn
index 0fccd1dcb01a3c7d1a074fb814d6ce323749386c..7559e6d0a24485c1c0585791f271708dc7c1cab2 100644 (file)
--- a/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn
+++ b/doc/bugs/Filenames_with_colons_cause_problems_for_Windows_users.mdwn
@@ -68,3 +68,8 @@ Windows does not support filenames containing any of these characters: `/ \ * :
 >>> ikiwiki on windows, including its assumption that the directory
 >>> separator is "/". Windows will be supported when someone sends me a
 >>> comprehansive and not ugly or performance impacting patch. :-) --[[Joey]]
+
+> Speaking of Windows filename problems, how do I keep directories ending in a
+> period from being created? The following didn't seem to work.
+> `wiki_file_chars => "-[:alnum:]+/._",`
+> `wiki_file_regex => '[-[:alnum:]+_]$',`

diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
index 450785d608b316b8844eead7fec930f22d123094..e952263a3a46a11ef8d802161bc2b539933a8c6e 100644 (file)
--- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
+++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
@@ -15,11 +15,7 @@ This resulted in the following being added to my site
 Perhaps I have done something wrong but this fails to work when I try to log in to several sites using my sites url as my login.  
 If I edit index.html and remove the two openid2 lines all works fine.  
 **Is there a way to only add openid version 1 tags to my index.html ?  
-Or a way to make it work the way it is ?**  
-
-Cheers  
-Mick  
-\_lunix_
+Or a way to make it work the way it is ?** --[Mick](http://www.lunix.com.au)
 
 > Before I think about adding a way to not add the openid 2 tags,
 > I'd like to know what the problem is. Is there something

diff --git a/doc/plugins/highlight/discussion.mdwn b/doc/plugins/highlight/discussion.mdwn
new file mode 100644 (file)
index 0000000..612fb0f
--- /dev/null
+++ b/doc/plugins/highlight/discussion.mdwn
@@ -0,0 +1,3 @@
+It would be nice to be able to set a few options for the highlighter object. In particular, today I noticed my tabs were not being expanded correctly, which could 
+be fixed the command line with --replace-tabs but programmatically needs a call to setPreformatting.  I could probably play with this, but what is your preferred way to support 
+options? something like 'highlight_options=>{replace_tabs=>8,line_numbers=>0}' ?  Of course, if you want to implement it I won't complain :-). [[DavidBremner]]