From: Michael Jeanson <mjeanson@ubuntu.com>
Date: Fri, 4 Apr 2014 14:23:36 +0000 (-0400)
Subject: Fix: misc spelling errors
X-Git-Tag: v2.5.0-rc1~77
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=5368d366c6c7f80ad941172a6bc9c6a5174cbdf0;p=lttng-tools.git

Fix: misc spelling errors

Signed-off-by: Michael Jeanson <mjeanson@ubuntu.com>
---

diff --git a/doc/man/lttng.1 b/doc/man/lttng.1
index e59a8706d..972f71c3a 100644
--- a/doc/man/lttng.1
+++ b/doc/man/lttng.1
@@ -598,7 +598,7 @@ names match any of the items in LIST.
 Disable tracing channel
 
 Disabling a channel disables the tracing of all of the channel's events. A channel
-can be reenabled by calling \fBlttng enable-channel NAME\fP again.
+can be re-enabled by calling \fBlttng enable-channel NAME\fP again.
 
 If \fB\-s, \-\-session\fP is omitted, the session name is taken from the .lttngrc
 file.
diff --git a/src/bin/lttng-sessiond/jul-thread.c b/src/bin/lttng-sessiond/jul-thread.c
index d8748f2a5..cc694df81 100644
--- a/src/bin/lttng-sessiond/jul-thread.c
+++ b/src/bin/lttng-sessiond/jul-thread.c
@@ -142,8 +142,8 @@ static struct lttcomm_sock *init_tcp_socket(void)
 
 	ret = sock->ops->bind(sock);
 	if (ret < 0) {
-		WARN("An other session daemon is using this JUL port. JUL support "
-				"will be deactivated not interfering with the tracing.");
+		WARN("Another session daemon is using this JUL port. JUL support "
+				"will be deactivated to prevent interfering with the tracing.");
 		goto error;
 	}
 
diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 7f27eae07..e029b42d8 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2953,9 +2953,9 @@ int ust_app_version(struct ust_app *app)
 	ret = ustctl_tracer_version(app->sock, &app->version);
 	if (ret < 0) {
 		if (ret != -LTTNG_UST_ERR_EXITING && ret != -EPIPE) {
-			ERR("UST app %d verson failed with ret %d", app->sock, ret);
+			ERR("UST app %d version failed with ret %d", app->sock, ret);
 		} else {
-			DBG3("UST app %d verion failed. Application is dead", app->sock);
+			DBG3("UST app %d version failed. Application is dead", app->sock);
 		}
 	}
 
diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index a8a11dcee..4b52d5992 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -308,7 +308,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 		cds_list_add_tail(&stream->list, &ua_chan->streams.head);
 		ua_chan->streams.count++;
 
-		DBG2("UST app stream %d received succesfully", ua_chan->streams.count);
+		DBG2("UST app stream %d received successfully", ua_chan->streams.count);
 	}
 
 	/* This MUST match or else we have a synchronization problem. */