dbus/tools dbus-uuidgen.1,1.2,1.2.2.1

[Havoc Pennington]

Update of /cvs/dbus/dbus/tools
In directory kemper:/tmp/cvs-serv8172/tools

Modified Files:
      Tag: DBUS_1_0
	dbus-uuidgen.1 
Log Message:
2006-11-14  Havoc Pennington  <hp at redhat.com>

	* dbus/dbus-internals.c (_dbus_generate_uuid): The spec said the
	UUID had the timestamp last, but the implementation had it first;
	move it to last since I think it's a tiny bit nicer (easier to
	compare at a glance, faster to sort, less code), and will not
	cause any practical compatibility problems. Also, always convert
	the timestamp to big endian.

	* doc/dbus-specification.xml: Clean up the docs on the UUID.

	* tools/dbus-uuidgen.1: more prominently say it is not suitable
	as a replacement for regular uuidgen/RFC4122.



Index: dbus-uuidgen.1
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-uuidgen.1,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- dbus-uuidgen.1	25 Oct 2006 16:42:37 -0000	1.2
+++ dbus-uuidgen.1	15 Nov 2006 01:51:19 -0000	1.2.2.1
@@ -14,6 +14,11 @@
 The \fIdbus-uuidgen\fP command generates or reads a universally unique ID.
 
 .PP
+Note that the D-Bus UUID has no relationship to RFC 4122 and does not generate
+UUIDs compatible with that spec. Many systems have a separate command
+for that (often called "uuidgen").
+
+.PP
 See http://www.freedesktop.org/software/dbus/ for more information
 about D-Bus.
 
@@ -39,15 +44,11 @@
 
 .PP
 If you run \fIdbus-uuidgen\fP with no options it just prints a new uuid made
-up out of thin air. This is similar to the regular "uuidgen" command.
-
-.PP
-If you run it with --get, it prints the machine uuid by default, or
-the uuid in the specified file if you specify a file.
+up out of thin air.
 
 .PP
-The D-Bus UUID has no relationship to RFC 4122 and does not generate
-UUIDs compatible with that spec.
+If you run it with --get, it prints the machine UUID by default, or
+the UUID in the specified file if you specify a file.
 
 .PP
 If you try to change an existing machine-id on a running system, it will
@@ -55,6 +56,10 @@
 don't make it the same on two different systems; it needs to be different
 anytime there are two different kernels running.
 
+.PP
+The UUID should be different on two different virtual machines,
+because there are two different kernels.
+
 .SH OPTIONS
 The following options are supported:
 .TP