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

diff --git a/doc/bugs/htmlscrubber_still_scrubbing_HTML_from_mdwn_pages.mdwn b/doc/bugs/htmlscrubber_still_scrubbing_HTML_from_mdwn_pages.mdwn
new file mode 100644 (file)
index 0000000..56b33d4
--- /dev/null
+++ b/doc/bugs/htmlscrubber_still_scrubbing_HTML_from_mdwn_pages.mdwn
@@ -0,0 +1,5 @@
+Though [[htmlscrubber|plugins/htmlscrubber]] is disabled on the Branchable site <http://geekout.org.uk/> , [HTML embedded](http://source.geekout-org-uk.branchable.com/?p=source.git;a=blob_plain;f=actual_route.mdwn;hb=HEAD) (Flickr badge thing) in a markdown page is scrubbed.
+
+<http://geekout.org.uk/actual_route/>
+
+I assumed one can mix and match HTML in markdown?

diff --git a/doc/bugs/several_entries_in_docs__47__bugs_contain_colons_in_the_filename.mdwn b/doc/bugs/several_entries_in_docs__47__bugs_contain_colons_in_the_filename.mdwn
new file mode 100644 (file)
index 0000000..c7cf8e3
--- /dev/null
+++ b/doc/bugs/several_entries_in_docs__47__bugs_contain_colons_in_the_filename.mdwn
@@ -0,0 +1 @@
+I just tried to clone the git repo onto a windows machine to test things out a bit and it turns out i cannot even successfully checkout the code because of those colons. Would a patch changing those to underscores be accepted?

diff --git a/doc/bugs/wiki_rebuild_should_throw_errors_if_the_configured_underlaydir_or_templatedir_don__39__t_exist.mdwn b/doc/bugs/wiki_rebuild_should_throw_errors_if_the_configured_underlaydir_or_templatedir_don__39__t_exist.mdwn
new file mode 100644 (file)
index 0000000..8da9f4f
--- /dev/null
+++ b/doc/bugs/wiki_rebuild_should_throw_errors_if_the_configured_underlaydir_or_templatedir_don__39__t_exist.mdwn
@@ -0,0 +1 @@
+I originally set up ikiwiki by using the debian package, but had some odd issues, so i figured i'd try installing from git. To do that i uninstalled the debian package and then did the Makefile dance from the git dir. In that process the original dirs configured in templatedir underlaydir in my wiki were deleted; HOWEVER when rebuilding the script just went ahead and did not even note the lack of those dirs. It would be nice if it threw errors if the dirs were configured, but non-existant.

diff --git a/doc/forum/Can_I_change_the_default_menu_items__63__.mdwn b/doc/forum/Can_I_change_the_default_menu_items__63__.mdwn
new file mode 100644 (file)
index 0000000..58134ab
--- /dev/null
+++ b/doc/forum/Can_I_change_the_default_menu_items__63__.mdwn
@@ -0,0 +1,6 @@
+I'm looking for a way to change the RecentChanges, Preferences, Branchable, Comment menu items from my wiki page.  I can see that the value for these items are set in template variables. Is there a way I can change these variables?  If so can you tell me how?
+
+Thanks,
+
+Maria
+

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 3f9214deb6ce1f43afd912f3759a3cda3d5d79ba..3aaf6d885cd44e0893e015cd661242e1e590af30 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -96,6 +96,7 @@ Bulleted list
 _italic_
 
 
+Umcacaumca
 
 ### this shows a problem with the list and the verbatim