diff options
| author | Joey Hess <joey@kitenet.net> | 2011-10-30 12:23:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-30 12:23:30 -0400 |
| commit | 3aa41021ad4aa4361b44663fd8dbb1a7dbea72e0 (patch) | |
| tree | 6e1706dd80652e992858bb3c20efd4722a3f17d8 | |
| parent | d564efac5d8b2aa6b1214db58c43ea51095a586f (diff) | |
| parent | 2ac52e16435acc15cc164902b97d50f97b9247e9 (diff) | |
| download | ikiwiki-3aa41021ad4aa4361b44663fd8dbb1a7dbea72e0.tar ikiwiki-3aa41021ad4aa4361b44663fd8dbb1a7dbea72e0.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
5 files changed, 14 insertions, 0 deletions
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 index 000000000..56b33d457 --- /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 index 000000000..c7cf8e320 --- /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 index 000000000..8da9f4f6b --- /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 index 000000000..58134ab6d --- /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 3f9214deb..3aaf6d885 100644 --- 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 |