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

diff --git a/doc/bugs/edit_preview_resolves_links_differently_from_commit.mdwn b/doc/bugs/edit_preview_resolves_links_differently_from_commit.mdwn
index c83086951a1491d3a6caff17470afa8d9a41be37..eea9095780f6af7e16b2d12a2e633ab917e4f847 100644 (file)
--- a/doc/bugs/edit_preview_resolves_links_differently_from_commit.mdwn
+++ b/doc/bugs/edit_preview_resolves_links_differently_from_commit.mdwn
@@ -8,3 +8,12 @@ a bug. --liw
 > discussion link and on preview it went to the page's discussion page. I
 > don't normally have a toplevel /discussion page, but I also tried adding
 > one, and the link still doesn't link to it. Testcase? --[[Joey]] 
+
+>> I can reproduce this on <http://blog.liw.fi/posts/distributed-internet-witness-service/>:
+>> if I edit the page, then preview (no changes made), the "discussion" link at the bottom
+>> of the page points in the preview
+>> to <http://blog.liw.fi/discussion/>,
+>> whereas the saved page has it pointing to
+>> <http://blog.liw.fi/posts/distributed-internet-witness-service/discussion/>.
+>> I'll arrange so that you can edit the page to test this.
+>> --liw

diff --git a/doc/news/discussion.mdwn b/doc/news/discussion.mdwn
index c3674a92df792430ff23d8625ac04e4c403a92d2..351e39c624fb2ca184c05cf286bd54c9318dcf4d 100644 (file)
--- a/doc/news/discussion.mdwn
+++ b/doc/news/discussion.mdwn
@@ -1,3 +1,12 @@
+## Ikiwiki 3.12
+
+Joey, what about news for Ikiwiki 3.12? The changelog says is has been released
+6 days ago... :) --[[Paweł|ptecza]]
+
+---
+
+## Ikiwiki 2.14
+
 Hi Joey! Where can I find the source package for ikiwiki 2.14? I rather prefer
 `wget` than `git` to download it :) I've just checked
 [Debian page of ikiwiki source package](http://packages.debian.org/unstable/source/ikiwiki)

diff --git a/doc/plugins/toggle/discussion.mdwn b/doc/plugins/toggle/discussion.mdwn
index 5426a62fc820ae32fbae63f64b402eb832c0658a..ac22e7eb6046a1085f9d9d222e9d7354996cf30a 100644 (file)
--- a/doc/plugins/toggle/discussion.mdwn
+++ b/doc/plugins/toggle/discussion.mdwn
@@ -15,3 +15,29 @@ but no success. How can I do it?
 
 
 ## [[bugs/Bug_when_toggling_in_a_preview_page]]
+
+----
+
+## Using toggle directives in a list item##
+Take this code snippet.
+
+    * [[!toggle id="test" text="test"]]
+      [[!toggleable id="test text="""toggle"""]]
+
+In the HTML-output the `ul` and `div` overlap.
+
+    <div id="content">
+    <ul>
+    <li><a class="toggle" href="#test.test">test</a>
+    <div class="toggleable" id="test.-test"></li>
+    </ul>
+    
+    <p>toggle</p>
+    
+    </div>
+    
+    </div>
+
+Fixing this manually the Javascript seems not to be working and `toggle` is shown unconditionally.
+
+I do not know if this is due to [[shortcomming with nested preprocessor directives|todo/nested_preprocessor_directives]] you mentioned in the beginning of this page. Maybe a note could be added to the main page of the plugin. --Paul