From: Guillem Jover <guillem@debian.org>
Date: Fri, 16 Jun 2006 06:31:45 +0000 (+0000)
Subject: Clarify the legend in update-alternatives '--help' (Andrew Ferrier).
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6da688023c4214d46771390c69c2072451411189;p=dpkg

Clarify the legend in update-alternatives '--help' (Andrew Ferrier).
Closes: #305318
---

diff --git a/ChangeLog b/ChangeLog
index 73f46e78..dbbb5020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-16  Andrew Ferrier  <andrew@new-destiny.co.uk>
+	    Guillem Jover  <guillem@debian.org>
+
+	* scripts/update-alternatives.pl (usage): Clarify the legend for the
+	help text.
+
 2006-06-16  Guillem Jover  <guillem@debian.org>
 
 	* scripts/update-alternatives.pl (config_message): Print '--config'
diff --git a/debian/changelog b/debian/changelog
index 2dab6b65..c8961d1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dpkg (1.13.22~) UNRELEASED; urgency=low
     Suggested by Adeodato Simó. Closes: #370392
   * Print update-alternatives '--config' listing layout evenly spaced.
     Closes: #325895
+  * Clarify the legend in update-alternatives '--help' (Andrew Ferrier).
+    Closes: #305318
 
   [ Updated dpkg Translations ]
   * Romanian (Eddy Petrişor).
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index b482526f..f6f35007 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -64,10 +64,14 @@ Commands:
   --set <name> <path>      set <path> as alternative for <name>.
   --all                    call --config on all alternatives.
 
-<name> is the name in /etc/alternatives.
-<path> is the name referred to.
-<link> is the link pointing to /etc/alternatives/<name>.
-<priority> is an integer; options with higher numbers are chosen.
+<link> is the symlink pointing to /etc/alternatives/<name>.
+  (e.g. /usr/bin/pager)
+<name> is the master name for this link group.
+  (e.g. pager)
+<path> is the location of one of the alternative target files.
+  (e.g. /usr/bin/less)
+<priority> is an integer; options with higher numbers have higher priority in
+  automatic mode.
 
 Options:
   --altdir <directory>     change the alternatives directory.