Default to using MQTT v3.1.1.

ChangeLog.txt

@@ -25,6 +25,7 @@ Broker:
 - Minimum supported libwebsockets version is now 1.3.
 - Support for Windows XP has been dropped.
 - Miscellaneous fixes on Windows.
+- Bridge connections now default to using MQTT v3.1.1.
 
 Client library:
 - Outgoing messages with QoS>1 are no longer retried after a timeout period.
@@ -36,12 +37,14 @@ Client library:
 - Add mosquitto_subscribe_callback() This is a helper function to make
   processing messages from a broker very straightforward. An example of its use
   is in examples/subscribe_simple.
+- Connections now default to using MQTT v3.1.1.
 
 Client:
 - Add -x to mosquitto_sub for printing the payload in hexadecimal format.
 - Add -U to mosquitto_sub for unsubscribing from topics.
 - Add --retained-only to mosquitto_sub to exit after receiving all retained
   messages.
+- Connections now default to using MQTT v3.1.1.
 
 
 1.4.7 - 20151221

lib/mosquitto.c

@@ -140,7 +140,7 @@ int mosquitto_reinitialise(struct mosquitto *mosq, const char *id, bool clean_se
 	}else{
 		mosq->userdata = mosq;
 	}
-	mosq->protocol = mosq_p_mqtt31;
+	mosq->protocol = mosq_p_mqtt311;
 	mosq->sock = INVALID_SOCKET;
 	mosq->sockpairR = INVALID_SOCKET;
 	mosq->sockpairW = INVALID_SOCKET;

man/mosquitto_pub.1.xml

@@ -383,8 +383,8 @@
 				<listitem>
 					<para>Specify which version of the MQTT protocol should be
 						used when connecting to the rmeote broker. Can be
-						<option>mqttv31</option> or <option>mqttv311</option>.
+						<option>mqttv311</option> or <option>mqttv31</option>.
-						Defaults to <option>mqttv31</option>.</para>
+						Defaults to <option>mqttv311</option>.</para>
 				</listitem>
 			</varlistentry>
 			<varlistentry>

man/mosquitto_sub.1.xml

@@ -479,8 +479,8 @@
 				<listitem>
 					<para>Specify which version of the MQTT protocol should be
 						used when connecting to the rmeote broker. Can be
-						<option>mqttv31</option> or <option>mqttv311</option>.
+						<option>mqttv311</option> or <option>mqttv31</option>.
-						Defaults to <option>mqttv31</option>.</para>
+						Defaults to <option>mqttv311</option>.</para>
 				</listitem>
 			</varlistentry>
 			<varlistentry>

mosquitto.conf

@@ -650,8 +650,8 @@
 #topic <topic> [[[out | in | both] qos-level] local-prefix remote-prefix]
 
 # Set the version of the MQTT protocol to use with for this bridge. Can be one
-# of mqttv31 or mqttv311. Defaults to mqttv31.
+# of mqttv311 or mqttv11. Defaults to mqttv311.
-#bridge_protocol_version mqttv31
+#bridge_protocol_version mqttv311
 
 # If a bridge has topics that have "out" direction, the default behaviour is to
 # send an unsubscribe request to the remote broker on that topic. This means