5 files changed, 7 insertions, 8 deletions

diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 29aa5bcf..52e84315 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
 #ifdef TCP_RELAY_ENABLED
 #define NUM_PORTS 3
     uint16_t ports[NUM_PORTS] = {443, 3389, PORT};
-    TCP_Server *tcp_s = new_TCP_server(ipv6enabled, NUM_PORTS, ports, dht->self_public_key, dht->self_secret_key, onion);
+    TCP_Server *tcp_s = new_TCP_server(ipv6enabled, NUM_PORTS, ports, dht->self_secret_key, onion);
 
     if (tcp_s == NULL) {
         printf("TCP server failed to initialize.\n");
diff --git a/other/DHTnodes b/other/DHTnodes
index 0abdbbd9..d2051c7a 100644
--- a/other/DHTnodes
+++ b/other/DHTnodes
@@ -1,3 +1,3 @@
 As maintaining 2 separate lists of the same information seemed redundant, this list has been phased out.
 
-For a current DHT node list please visit http://wiki.tox.im/nodes
+For a current DHT node list please visit https://wiki.tox.chat/doku.php?id=users:nodes
diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h
index 4a0ab950..577515b1 100644
--- a/other/apidsl/tox.in.h
+++ b/other/apidsl/tox.in.h
@@ -627,7 +627,7 @@ uint8_t[size] savedata {
  * Sends a "get nodes" request to the given bootstrap node with IP, port, and
  * public key to setup connections.
  *
- * This function will attempt to connect to the node using UDP. You must use 
+ * This function will attempt to connect to the node using UDP. You must use
  * this function even if ${options.this.udp_enabled} was set to false.
  *
  * @param address The hostname or IP address (IPv4 or IPv6) of the node.
@@ -1209,7 +1209,7 @@ namespace friend {
         with error for query;
 
     /**
-     * Write the name of the friend designated by the given friend number to a byte
+     * Write the status message of the friend designated by the given friend number to a byte
      * array.
      *
      * Call $size to determine the allocation size for the `status_name`
@@ -1218,7 +1218,7 @@ namespace friend {
      * The data written to `status_message` is equal to the data received by the last
      * `${event status_message}` callback.
      *
-     * @param name A valid memory region large enough to store the friend's name.
+     * @param status_message A valid memory region large enough to store the friend's status message.
      */
     get(uint32_t friend_number)
         with error for query;
diff --git a/other/bootstrap_daemon/tox-bootstrapd.c b/other/bootstrap_daemon/tox-bootstrapd.c
index 8b5e6a4b..267e7238 100644
--- a/other/bootstrap_daemon/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/tox-bootstrapd.c
@@ -624,8 +624,7 @@ int main(int argc, char *argv[])
             return 1;
         }
 
-        tcp_server = new_TCP_server(enable_ipv6, tcp_relay_port_count, tcp_relay_ports, dht->self_public_key,
-                                    dht->self_secret_key, onion);
+        tcp_server = new_TCP_server(enable_ipv6, tcp_relay_port_count, tcp_relay_ports, dht->self_secret_key, onion);
 
         // tcp_relay_port_count != 0 at this point
         free(tcp_relay_ports);
diff --git a/other/bootstrap_daemon/tox-bootstrapd.conf b/other/bootstrap_daemon/tox-bootstrapd.conf
index d02eb3d0..a997be5f 100644
--- a/other/bootstrap_daemon/tox-bootstrapd.conf
+++ b/other/bootstrap_daemon/tox-bootstrapd.conf
@@ -39,7 +39,7 @@ motd = "tox-bootstrapd"
 //
 // Remember to replace the provided example with your own node list.
 // There is a maintained list of bootstrap nodes on Tox's wiki, if you need it
-// (http://wiki.tox.im/Nodes).
+// (https://wiki.tox.chat/doku.php?id=users:nodes).
 //
 // You may leave the list empty or remove "bootstrap_nodes" completely,
 // in both cases this will be interpreted as if you don't want to bootstrap