From: Russ Allbery <rra@debian.org>
Date: Tue, 29 Jun 2010 18:14:48 +0000 (-0700)
Subject: Merge branch 'master' into bug104373-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=96b4b014f126df57d6599ab9b0e5db4495f28bd0;hp=30daa4aab845a7972bff3f0e33994176bc912dc6;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug104373-rra
---

diff --git a/policy.sgml b/policy.sgml
index 9fe7158..57ac14c 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -8356,11 +8356,13 @@ done
 		<example compact="compact">
 /usr/lib/cgi-bin/<var>cgi-bin-name</var>
 		</example>
-		and should be referred to as
+		or a subdirectory of that directory, and should be
+		referred to as
 		<example compact="compact">
 http://localhost/cgi-bin/<var>cgi-bin-name</var>
 		</example>
-
+		(possibly with a subdirectory name
+		before <var>cgi-bin-name</var>).
 	    </item>
 
 	    <item>