u-a(8): Update --query format and examples to match implementation

Missed in commit 27e75257edb3bf98b83b421f4f5d03e8d8da9856.

debian/changelog

@@ -49,6 +49,8 @@ dpkg (1.16.9) UNRELEASED; urgency=low
   * Only satisfy a dependency on a “Multi-Arch: foreign” if arch-unqualified.
   * Take architecture into account in virtual packages on remove and
     configure dpkg actions. Closes: #683411
+  * Update update-alternatives --query format and examples in man page to
+    match the implementation.
 
   [ Updated programs translations ]
   * Czech (Miroslav Kure).

man/update-alternatives.8

@@ -5,7 +5,7 @@
 .\" Copyright © 2000 Wichert Akkerman <wakkerma@debian.org>
 .\" Copyright © 2003 Adam Heath <doogie@debian.org>
 .\" Copyright © 2005 Scott James Remnant <scott@netsplit.com>
-.\" Copyright © 2006-2011 Guillem Jover <guillem@debian.org>
+.\" Copyright © 2006-2012 Guillem Jover <guillem@debian.org>
 .\" Copyright © 2008 Pierre Habouzit <madcoder@debian.org>
 .\" Copyright © 2009-2011 Raphaël Hertzog <hertzog@debian.org>
 .\"
@@ -22,7 +22,7 @@
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
-.TH update\-alternatives 8 "2011-08-14" "Debian Project" "dpkg utilities"
+.TH update\-alternatives 8 "2012-07-31" "Debian Project" "dpkg utilities"
 .SH NAME
 update\-alternatives \- maintain symbolic links determining default commands
 .
@@ -403,9 +403,18 @@ RFC822-like flat format. It's made of \fIn\fP + 1 blocks where \fIn\fP is
 the number of alternatives available in the queried link group. The first
 block contains the following fields:
 .TP
+.BI Name: " name"
+The alternative name in the alternative directory.
+.TP
 .BI Link: " link"
 The generic name of the alternative.
 .TP
+.BI Slaves: " list-of-slaves"
+When this field is present, the \fBnext\fR lines hold all slave links
+associated to the master link of the alternative. There is one slave per
+line. Each line contains one space, the generic name of the slave
+alternative, another space, and the path to the slave link.
+.TP
 .BI Status: " status"
 The status of the alternative (\fBauto\fR or \fBmanual\fR).
 .TP
@@ -436,30 +445,31 @@ alternative, another space, and the path to the slave alternative.
 .BR Example
 .nf
 $ update\-alternatives \-\-query editor
-Link: editor
+Name: editor
+Link: /usr/bin/editor
+Slaves:
+ editor.1.gz /usr/share/man/man1/editor.1.gz
+ editor.fr.1.gz /usr/share/man/fr/man1/editor.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/editor.1.gz
+ editor.pl.1.gz /usr/share/man/pl/man1/editor.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/editor.1.gz
 Status: auto
-Best: /usr/bin/vim.gtk
-Value: /usr/bin/vim.gtk
+Best: /usr/bin/vim.basic
+Value: /usr/bin/vim.basic
 
 Alternative: /bin/ed
 Priority: \-100
 Slaves:
  editor.1.gz /usr/share/man/man1/ed.1.gz
 
-Alternative: /usr/bin/vim.gtk
+Alternative: /usr/bin/vim.basic
 Priority: 50
 Slaves:
  editor.1.gz /usr/share/man/man1/vim.1.gz
- editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
- editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz
- editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz
- editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz
- editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
- editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz
  editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz
- editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz
+ editor.it.1.gz /usr/share/man/it/man1/vim.1.gz
  editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz
- editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz
+ editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz
 .fi
 .
 .SH DIAGNOSTICS