From 333ec74962a34a3fcc5a1f233012dba86a1cf72b Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 10 Jun 2010 14:04:26 +0200 Subject: [PATCH] uuidd: spell the plural of "UUID" consistently as "UUIDs" Signed-off-by: Benno Schulenberg --- misc-utils/uuidd.8 | 6 +++--- misc-utils/uuidd.c | 6 +++--- misc-utils/uuidgen.1 | 4 ++-- shlibs/uuid/man/uuid_generate.3 | 2 +- shlibs/uuid/src/compare.c | 4 ++-- shlibs/uuid/src/pack.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8 index 33e650fe..9c3b54d6 100644 --- a/misc-utils/uuidd.8 +++ b/misc-utils/uuidd.8 @@ -27,9 +27,9 @@ uuidd \- UUID generation daemon The .B uuidd daemon is used by the UUID library to generate -universally unique identifiers (UUIDs), especially time-based UUID's +universally unique identifiers (UUIDs), especially time-based UUIDs in a secure and guaranteed-unique fashion, even in the face of large -numbers of threads trying to grab UUID's running on different CPU's. +numbers of threads trying to grab UUIDs running on different CPUs. .SH OPTIONS .TP .B \-d @@ -44,7 +44,7 @@ If a currently uuidd daemon is running, kill it. When issuing a test request to a running uuidd, request a bulk response of .I number -UUID's. +UUIDs. .TP .BI \-p " pidfile" Specify the pathname where the pid file should be written. By default, diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c index 74bab693..a6d2f696 100644 --- a/misc-utils/uuidd.c +++ b/misc-utils/uuidd.c @@ -412,7 +412,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path, uuid__generate_random((unsigned char *) reply_buf + sizeof(num), &num); if (debug) { - printf(_("Generated %d UUID's:\n"), num); + printf(_("Generated %d UUIDs:\n"), num); for (i=0, cp=reply_buf+sizeof(num); i < num; i++, cp+=16) { uuid_unparse((unsigned char *)cp, str); @@ -531,9 +531,9 @@ int main(int argc, char **argv) uuid_unparse((unsigned char *) buf, str); - printf(_("%s and subsequent %d UUID's\n"), str, num); + printf(_("%s and subsequent %d UUIDs\n"), str, num); } else { - printf(_("List of UUID's:\n")); + printf(_("List of UUIDs:\n")); cp = buf + 4; if (ret != (int) (sizeof(num) + num*sizeof(uu))) goto unexpected_size; diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1 index 18e33de7..32c98f1d 100644 --- a/misc-utils/uuidgen.1 +++ b/misc-utils/uuidgen.1 @@ -22,9 +22,9 @@ all UUIDs created on the local system, and among UUIDs created on other systems in the past and in the future. .PP -There are two types of UUID's which +There are two types of UUIDs which .B uuidgen -can generate: time-based UUID's and random-based UUID's. By +can generate: time-based UUIDs and random-based UUIDs. By default .B uuidgen will generate a random-based UUID if a high-quality random number diff --git a/shlibs/uuid/man/uuid_generate.3 b/shlibs/uuid/man/uuid_generate.3 index 11f48ffd..e1b8143f 100644 --- a/shlibs/uuid/man/uuid_generate.3 +++ b/shlibs/uuid/man/uuid_generate.3 @@ -59,7 +59,7 @@ a high-quality random number generator (i.e., .IR /dev/urandom ) is not available, in which case a pseudo-random generator will be subsituted. Note that the use of a pseudo-random -generator may compromise the uniqueness of UUID's +generator may compromise the uniqueness of UUIDs generated in this fashion. .sp The diff --git a/shlibs/uuid/src/compare.c b/shlibs/uuid/src/compare.c index f28a7267..8f3437a2 100644 --- a/shlibs/uuid/src/compare.c +++ b/shlibs/uuid/src/compare.c @@ -1,7 +1,7 @@ /* - * compare.c --- compare whether or not two UUID's are the same + * compare.c --- compare whether or not two UUIDs are the same * - * Returns 0 if the two UUID's are different, and 1 if they are the same. + * Returns 0 if the two UUIDs are different, and 1 if they are the same. * * Copyright (C) 1996, 1997 Theodore Ts'o. * diff --git a/shlibs/uuid/src/pack.c b/shlibs/uuid/src/pack.c index 097516d2..6e124766 100644 --- a/shlibs/uuid/src/pack.c +++ b/shlibs/uuid/src/pack.c @@ -1,5 +1,5 @@ /* - * Internal routine for packing UUID's + * Internal routine for packing UUIDs * * Copyright (C) 1996, 1997 Theodore Ts'o. * -- 2.39.5