Merge branch '5.x' into critic_markup_styling

2018-11-12 16:39:45 +01:00
parent 6d0b42b18f b5c4fdcc83
commit 5de2442540
14 changed files with 103 additions and 59 deletions
@@ -127,7 +127,7 @@ MSG
  end
  opts.on("--allow-uploads [MODE]", [:dir, :page], "Enable file uploads.",
    "If set to 'dir', Gollum will store all uploads in the '<git-repo>/uploads/' directory.",
-    "If set to 'page', Gollum will store each upload at the currently edited page.") do |mode|
+    "If set to 'page', Gollum will store uploads per page in '<git-repo>/uploads/[pagename]'.") do |mode|
    wiki_options[:allow_uploads]    = true
    wiki_options[:per_page_uploads] = true if mode == :page
  end