From 4b9b792d16f1695fceb89db438f97523ffaa04d9 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Sat, 24 Oct 2015 21:50:19 +0100 Subject: [PATCH] Update all mqtt 3.1 references to 3.1.1 where appropriate. --- man/libmosquitto.3.xml | 2 +- man/mosquitto.8.xml | 2 +- man/mosquitto.conf.5.xml | 2 +- man/mosquitto_pub.1.xml | 16 +++++++++------- man/mosquitto_sub.1.xml | 18 +++++++++--------- man/mqtt.7.xml | 2 +- src/conf.c | 2 +- src/service.c | 2 +- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/man/libmosquitto.3.xml b/man/libmosquitto.3.xml index 7ef873be..b34683c5 100644 --- a/man/libmosquitto.3.xml +++ b/man/libmosquitto.3.xml @@ -11,7 +11,7 @@ libmosquitto - MQTT version 3.1 client library + MQTT version 3.1.1 client library diff --git a/man/mosquitto.8.xml b/man/mosquitto.8.xml index fb87ab70..3cb72a04 100644 --- a/man/mosquitto.8.xml +++ b/man/mosquitto.8.xml @@ -29,7 +29,7 @@ Description - mosquitto is a broker for the MQTT protocol version 3.1. + mosquitto is a broker for the MQTT protocol version 3.1.1/3.1. diff --git a/man/mosquitto.conf.5.xml b/man/mosquitto.conf.5.xml index f796b663..d3a8d54b 100644 --- a/man/mosquitto.conf.5.xml +++ b/man/mosquitto.conf.5.xml @@ -521,7 +521,7 @@ disconnected. These messages are included in the limit imposed by max_queued_messages. Defaults to false. - Note that the MQTT v3.1 spec states that only QoS 1 + Note that the MQTT v3.1.1 spec states that only QoS 1 and 2 messages should be saved in this situation so this is a non-standard option. Reloaded on reload signal. diff --git a/man/mosquitto_pub.1.xml b/man/mosquitto_pub.1.xml index 171415c9..5b5795fc 100644 --- a/man/mosquitto_pub.1.xml +++ b/man/mosquitto_pub.1.xml @@ -11,7 +11,7 @@ mosquitto_pub - an MQTT version 3.1/3.1.1 client for publishing simple messages + an MQTT version 3.1.1/3.1 client for publishing simple messages @@ -79,7 +79,9 @@ Description - mosquitto_pub is a simple MQTT version 3.1 client that will publish a single message on a topic and exit. + mosquitto_pub is a simple MQTT version 3.1.1 + client that will publish a single message on a topic and + exit. @@ -260,9 +262,9 @@ Provide a password to be used for authenticating with - the broker. Using this argument without also specifying a - username is invalid. This requires a broker that supports - MQTT v3.1. See also the option. + the broker. Using this argument without also specifying + a username is invalid. See also the + option. @@ -371,8 +373,8 @@ Provide a username to be used for authenticating with - the broker. This requires a broker that supports MQTT v3.1. - See also the argument. + the broker. See also the + argument. diff --git a/man/mosquitto_sub.1.xml b/man/mosquitto_sub.1.xml index 6dcf3290..22d08eeb 100644 --- a/man/mosquitto_sub.1.xml +++ b/man/mosquitto_sub.1.xml @@ -11,7 +11,7 @@ mosquitto_sub - an MQTT version 3.1 client for subscribing to topics + an MQTT version 3.1.1/3.1 client for subscribing to topics @@ -75,9 +75,9 @@ Description - mosquitto_sub is a simple MQTT version 3.1 - client that will subscribe to a topic and print the messages that it - receives. + mosquitto_sub is a simple MQTT version 3.1.1 + client that will subscribe to a topic and print the messages that + it receives. @@ -267,9 +267,9 @@ Provide a password to be used for authenticating with - the broker. Using this argument without also specifying a - username is invalid. This requires a broker that supports - MQTT v3.1. See also the option. + the broker. Using this argument without also specifying + a username is invalid. See also the + option. @@ -402,8 +402,8 @@ Provide a username to be used for authenticating with - the broker. This requires a broker that supports MQTT v3.1. - See also the argument. + the broker. See also the + argument. diff --git a/man/mqtt.7.xml b/man/mqtt.7.xml index eebc85c0..b6473471 100644 --- a/man/mqtt.7.xml +++ b/man/mqtt.7.xml @@ -25,7 +25,7 @@ MQTT is a lightweight publish/subscribe messaging protocol. It is useful for use with low power sensors, but is applicable to many scenarios. This manual describes - some of the features of MQTT version 3.1, to assist end users in + some of the features of MQTT version 3.1.1/3.1, to assist end users in getting the most out of the protocol. For more complete information on MQTT, see http://mqtt.org/. diff --git a/src/conf.c b/src/conf.c index 2540f97b..efc10444 100644 --- a/src/conf.c +++ b/src/conf.c @@ -329,7 +329,7 @@ void config__cleanup(struct mosquitto__config *config) static void print_usage(void) { printf("mosquitto version %s (build date %s)\n\n", VERSION, TIMESTAMP); - printf("mosquitto is an MQTT v3.1 broker.\n\n"); + printf("mosquitto is an MQTT v3.1.1 broker.\n\n"); printf("Usage: mosquitto [-c config_file] [-d] [-h] [-p port]\n\n"); printf(" -c : specify the broker config file.\n"); printf(" -d : put the broker into the background after starting.\n"); diff --git a/src/service.c b/src/service.c index 96147f22..54135bc6 100644 --- a/src/service.c +++ b/src/service.c @@ -107,7 +107,7 @@ void service_install(void) exe_path, NULL, NULL, NULL, NULL, NULL); if(svc_handle){ - svc_desc.lpDescription = "MQTT v3.1 broker"; + svc_desc.lpDescription = "MQTT v3.1.1 broker"; ChangeServiceConfig2(svc_handle, SERVICE_CONFIG_DESCRIPTION, &svc_desc); CloseServiceHandle(svc_handle); }