From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 3 Jun 2016 05:37:01 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20160728~42
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/04f17b382f644c35d93928f48f6b79564fa1344c?hp=43785417d06e098ebc4f48acc458ad151563e937

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 130257f71..e8ed627a4 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -350,7 +350,7 @@ sub find_src_files (;$$$) {
 		else {
 			push @files, $f;
 			if ($pages{$page}) {
-				debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+				debug(sprintf(gettext("%s has multiple possible source files; one will be chosen at random"), $page));
 			}
 			$pages{$page}=1;
 		}
@@ -399,7 +399,7 @@ sub process_changed_files ($$) {
 		}
 		push @files, $f;
 		if ($pages{$page}) {
-			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+			debug(sprintf(gettext("%s has multiple possible source files; one will be chosen at random"), $page));
 		}
 		$pages{$page}=1;
 	}
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 2ce5f885f..0decaa38a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -14,10 +14,11 @@ Ikiwiki Hosting
 ===============
 
 [[!table data="""
-Name                                         | Ikiwiki Configuration                                                             | Costs
-[Branchable](http://branchable.com/)         | Open configuration with [ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/) | Free for free software, otherwise involves fees
-[Piny.be](http://piny.be/)                   | Restricted configuration with [Piny](http://piny.be/piny-code/)                   | Free for non-profit purposes (including open source projects); commercial activity disallowed.
-[FairlyStable.org](http://fairlystable.org/) | Restricted configuration with [Piny](http://piny.be/piny-code/)                   | Free for small projects, otherwise involves fees
+Name                                              | Ikiwiki Configuration                                                             | Costs
+[Branchable](http://branchable.com/)              | Open configuration with [ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/) | Free for free software, otherwise involves fees
+[Piny.be](http://piny.be/)                        | Restricted configuration with [Piny](http://piny.be/piny-code/)                   | Free for non-profit purposes (including open source projects); commercial activity disallowed.
+[FairlyStable.org](http://fairlystable.org/)      | Restricted configuration with [Piny](http://piny.be/piny-code/)                   | Free for small projects, otherwise involves fees
+[FreedomBox](https://wiki.debian.org/FreedomBox/) | Web configuration with Plinth                                                     | Runs on your home's private cloud server
 """]]
 
 Projects & Organizations