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

2011-10-30 12:23:30 -04:00 · 2011-10-30 12:23:30 -04:00 · 3aa41021ad
parent d564efac5d 2ac52e1643
commit 3aa41021ad
5 changed files with 14 additions and 0 deletions
--- a/doc/bugs/htmlscrubber_still_scrubbing_HTML_from_mdwn_pages.mdwn
+++ 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?
--- a/doc/bugs/several_entries_in_docs47bugs_contain_colons_in_the_filename.mdwn
+++ b/doc/bugs/several_entries_in_docs47bugs_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?
--- a/doc/bugs/wiki_rebuild_should_throw_errors_if_the_configured_underlaydir_or_templatedir_don39t_exist.mdwn
+++ b/doc/bugs/wiki_rebuild_should_throw_errors_if_the_configured_underlaydir_or_templatedir_don39t_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.
--- a/doc/forum/Can_I_change_the_default_menu_items63.mdwn
+++ b/doc/forum/Can_I_change_the_default_menu_items63.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
+
--- 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
				`@ -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?`
				`@ -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.`