Merge branch 'master' of https://github.com/owagner/knx2mqtt.git

owagner · Mar 2, 2015 · 5ec5fb6 · 5ec5fb6
2 parents d1fae6f + bec3daa
commit 5ec5fb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ deploy:
   file: "build/libs/knx2mqtt.jar"
   skip_cleanup: true
   on:
-    repo: mqtt-smarthome/knx2mqtt
+    repo: owagner/knx2mqtt
     tags: true
     all_branches: true
 
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Dependencies
 * Eclipse Paho: https://www.eclipse.org/paho/clients/java/ (used for MQTT communication)
 * Minimal-JSON: https://github.com/ralfstx/minimal-json (used for JSON creation and parsing)
 
-[![Build Status](https://travis-ci.org/mqtt-smarthome/knx2mqtt.svg)](https://travis-ci.org/mqtt-smarthome/knx2mqtt) Automatically built jars can be downloaded from the release page on GitHub at https://github.com/mqtt-smarthome/knx2mqtt/releases
+[![Build Status](https://travis-ci.org/owagner/knx2mqtt.svg)](https://travis-ci.org/owagner/knx2mqtt) Automatically built jars can be downloaded from the release page on GitHub at https://github.com/owagner/knx2mqtt/releases
 
 
 EIBD
@@ -98,7 +98,7 @@ Examples:
   A ETS4 exported projectfile. No default. Will be used to determine group address names
   and DPTs. 
 
-- mqtt.broker
+- mqtt.server
 
   ServerURI of the MQTT broker to connect to. Defaults to "tcp://localhost:1883".