Merge remote-tracking branch 'smcv/umask-keywords'

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a5c29a352788b37c70a6a56614e95152d36f069d..54051c58c2cf836e258c110d0ec4a47d6ff1e0a2 100644 (file)
--- 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 7f6564d7ffdb0544c38f2732918c2109665f123d..52d9ddf3e6aed7ae78b873407d911970d3e9f23c 100644 (file)
--- 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 0eadc5809241d3ac33458be7e8edb8294cc8faa5..8f87329ae50c19da2d5021da738c617cf064999d 100644 (file)
--- 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 0a63940cef6b018fd9435bc4267f3422d03f73e8..15bea3132c4fb68a8ce72bd52e7042bf6964811f 100644 (file)
--- a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn
+++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn
@@ -28,6 +28,9 @@ you have to use one of
 
 and if you try to say 022 you'll get 22 decimal = 026 octal.
 
+[[!tag patch]]
+[[!template id=gitbranch branch=smcv/umask-keywords author="[[smcv]]"]]
+
 Perhaps the best way to solve this would be to have keywords
 for the few values of `umask` that are actually useful?
 
@@ -43,3 +46,8 @@ 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]]
+
+>> git pushes have a restrictive umask, ironically... fixed. --[[smcv]]

diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment
new file mode 100644 (file)
index 0000000..6ed9550
--- /dev/null
+++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="ikiwikert"
+ ip="134.99.22.236"
+ subject="comment 3"
+ date="2011-11-27T16:54:05Z"
+ content="""
+thank you for your enlighting post! i set the umask option to 022 (octal) and the wrapper to 0755 and it worked. However i guess it is not a good thing to mix modes and i would appreciate it, if you implemented the \"keyword-approach\" you mentioned.
+
+Or at least one way of defining modes would be okay for average joes like me.
+"""]]

diff --git a/doc/todo/wmd_editor_live_preview.mdwn b/doc/todo/wmd_editor_live_preview.mdwn
index fb7f04c092c40f81b33b7ec487ede1c224c13b8c..891b8199f08bfe2f84c75b00ce9933af7db39699 100644 (file)
--- 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]]