tags 369633 + patch fixed-upstream pending
thanks

Andreas Bombe <[EMAIL PROTECTED]> writes:

[documentation suggestions]

Thanks for the suggestion and the patch.  I have committed the
following patch into SVN.  This is mostly the same as your patch, but
I renamed "UUID" to "Session ID", because this is a bit more
user-friendly.


Regards,
Roger

-- 
Roger Leigh
                Printing on GNU/Linux?  http://gutenprint.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.
Index: schroot/schroot.1.in
===================================================================
--- schroot/schroot.1.in	(revision 581)
+++ schroot/schroot.1.in	(working copy)
@@ -1,4 +1,5 @@
 .\" Copyright © 2005-2006  Roger Leigh <[EMAIL PROTECTED]>
+.\" Copyright © 2006       Andreas Bombe <[EMAIL PROTECTED]>
 .\"
 .\" schroot is free software; you can redistribute it and/or modify it
 .\" under the terms of the GNU General Public License as published by
@@ -55,8 +56,9 @@
 considered.
 .TP
 .B \-c, \-\-chroot=\fIchroot\fP
-Specify a chroot to use.  This option may be used multiple times to specify
-more than one chroot, in which case its effect is similar to \fB\-\-all\fP.
+Specify a chroot or active session to use.  This option may be used multiple
+times to specify more than one chroot, in which case its effect is similar to
+\fB\-\-all\fP.
 .TP
 .B \-u, \-\-user=\fIuser\fP
 Run as a different user.  The default is to run as the current user.  If
@@ -95,19 +97,20 @@
 .SS Session options
 .TP
 .B \-b, \-\-begin\-session
-Begin a session.  A unique session identifier (UUID) is returned on standard
-output.  The UUID is required to use the other session options.
+Begin a session.  A unique session identifier (session ID) is returned on
+standard output.  The session ID is required to use the other session options.
 .TP
-.TP
 .B \-\-recover\-session
 Recover an existing session.  If an existing session has become unavailable,
 for example becoming unmounted due to a reboot, this option will make the
 session available for use again, for example by remounting it.
-.B \-r, \-\-run\-session=\fIUUID\fP
-Run an existing session.
+.B \-r, \-\-run\-session
+Run an existing session.  The session ID is specified with the
++\fB\-\-chroot\fP option.
 .TP
-.B \-e, \-\-end\-session=\fIUUID\fP
-End an existing session.
+.B \-e, \-\-end\-session
+End an existing session.  The session ID is specified with the
++\fB\-\-chroot\fP option.
 .TP
 .B \-f, \-\-force
 Force a session operation, even if it would otherwise fail.  This may be used
Index: schroot/schroot.conf.5.in
===================================================================
--- schroot/schroot.conf.5.in	(revision 581)
+++ schroot/schroot.conf.5.in	(working copy)
@@ -86,8 +86,8 @@
 your chroots are exclusively controlled by schroot, set to \[lq]true\[rq].
 .TP
 .B run\-exec\-scripts=\fItrue\fP|\fIfalse\fP
-Set whether chroot execution scripts will be run.  The default is are the same
-as for the \fIrun-setup-scripts\fP key.  This option was called
+Set whether chroot execution scripts will be run.  The default is the same as
+the default for the \fIrun-setup-scripts\fP key.  This option was called
 \fIrun-setup-scripts\fP in releases up to version 0.2.5.
 .TP
 .B command\-prefix=\fIcommand,option1,option2,...\fP
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 593)
+++ debian/changelog	(working copy)
@@ -2,6 +2,9 @@
 
   * New upstream release.
   * debian/control: Upgrade to Standards-Version 3.7.2.
+  * schroot/schroot.1.in, schroot/schroot.conf.5.in: Correct ambiguity and
+    mistakes in the documentation (Closes: #369633).  Thanks to Andreas
+    Bombe.
 
  --
 
Index: AUTHORS
===================================================================
--- AUTHORS	(revision 581)
+++ AUTHORS	(working copy)
@@ -3,3 +3,6 @@
 
 Roger Leigh		<[EMAIL PROTECTED]>
 	Architecture, Coding, Documentation.
+
+Andreas Bombe		<[EMAIL PROTECTED]>
+	Documentation improvements.

Attachment: pgpzbuOujDXJu.pgp
Description: PGP signature

Reply via email to