Merge branch 'development' into 'master'

Development See merge request !4

Merge branch 'development' into 'master'
Development See merge request !4
Peter M. Groen
2 parents 497f1abf 7d129bb1
Showing 2 changed files with 24 additions and 2 deletions
COPYING.MIT
README.md
+/* ****************************************************************************
+ * Copyright 2019 Open Systems Development BV                                 *
+ *                                                                            *
+ * Permission is hereby granted, free of charge, to any person obtaining a    *
+ * copy of this software and associated documentation files (the "Software"), *
+ * to deal in the Software without restriction, including without limitation  *
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,   *
+ * and/or sell copies of the Software, and to permit persons to whom the      *
+ * Software is furnished to do so, subject to the following conditions:       *
+ *                                                                            *
+ * The above copyright notice and this permission notice shall be included in *
+ * all copies or substantial portions of the Software.                        *
+ *                                                                            *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   *
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    *
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER *
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    *
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        *
+ * DEALINGS IN THE SOFTWARE.                                                  *
+ * ***************************************************************************/
+
@@ -28,7 +28,7 @@ Just check your package manager for the correct package-name.
    $ mkdir build
    $ cd build
    $ cmake ../
-   $ gmake
+   $ gmake ( or make, depending on your platform )
    ```
 And you're all set. In build/bin there are two examples, test_mqtt_pu and test_mqtt_sub. Have a broker running, 
 like mosquitto or flashmq capable of accepting anonymous connections. Start the "sub" part and couple of moments
@@ -152,4 +152,4 @@ void Subscriber::receive_data( const std::string &amp;message_topic, const std::stri
 }
 ```
  
 -Now it will be very easy to send and receive messages from a broker without the hassle of administration.
+Now it will be very easy to send and receive messages from a broker without the hassle of administration.
 \ No newline at end of file