From: Joey Hess <joey@kitenet.net>
Date: Sun, 27 Nov 2011 17:20:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=9412876ffdc8bb868b310d9e07bd90867e3ca36b;hp=c360815f200bd67812d288d23cc8a51e547e3660

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a5c29a352..54051c58c 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -231,7 +231,7 @@ sub cgi_editpage ($$) {
 					if ! $form->submitted && lc($page) ne $page;
 			}
 			elsif (lc $page eq lc $config{discussionpage}) {
-				@page_locs=$best_loc=$page="$from/".lc($page);
+				@page_locs=$best_loc="$from/".lc($page);
 			}
 			else {
 				my $dir=$from."/";
diff --git a/debian/changelog b/debian/changelog
index 7f6564d7f..52d9ddf3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low
 
   * img: Bugfix to width/height tags for scaled down image when only
     one dimension was provided. Thanks, Per Carlson.
+  * editpage: Fix FormattingHelp link on Discussion pages.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 17 Nov 2011 18:52:23 -0400
 
diff --git a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
index 0eadc5809..8f87329ae 100644
--- a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
+++ b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
@@ -1 +1,3 @@
 For an example of what I mean, go to [[TourBusStop]]. Click the Discussion link. Click the <code>FormattingHelp</code> link. You'll be sent to [TourBusStop/ikiwiki/formatting](/TourBusStop/ikiwiki/formatting/) which of course doesn't exist.
+
+> A bug introduced in the last release. [[fixed|done]] --[[Joey]] 
diff --git a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn
index f6e5a9a4d..2f00e9b13 100644
--- a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn
+++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn
@@ -46,3 +46,6 @@ via a symlink attack. So I don't think we need keywords
 for those.
 
 --[[smcv]]
+
+> I support this change, but your git repository does not seem to have
+> that branch (or anything) in it today. --[[Joey]]
diff --git a/doc/todo/wmd_editor_live_preview.mdwn b/doc/todo/wmd_editor_live_preview.mdwn
index fb7f04c09..891b8199f 100644
--- a/doc/todo/wmd_editor_live_preview.mdwn
+++ b/doc/todo/wmd_editor_live_preview.mdwn
@@ -3,3 +3,7 @@ Some time ago there was [[a question|http://ikiwiki.info/forum/wmd_editor_double
 I use the wmd editor in my ikiwiki. However live preview seems not to be a fully correct preview so nevertheless I have to hit the preview button to get a correct preview. However then I have two previews so that I have to scroll down to see the correct one.
 
 Is it possible to disable the live preview or to replace the live preview with the correct one after pressing the preview button?
+
+> There's another page already tracking this UI problem: [[mdwn_preview]]
+> There is a patch there, but AFAIK nobody has done any more work on
+> WMD integration with ikiwiki. --[[Joey]]