merge from volker

diff --git a/common/system_linux.c b/common/system_linux.c
index 2b054cd446051a8d33136331b0c27e7746e3b996..ba2c4dfc83f67e89c9c61e4679b6b4b6339302b1 100644 (file)
--- a/common/system_linux.c
+++ b/common/system_linux.c
@@ -161,8 +161,10 @@ static uint16_t tcp_checksum(uint16_t *data, size_t n, struct iphdr *ip)
 {
        uint32_t sum = uint16_checksum(data, n);
        uint16_t sum2;
-       sum += uint16_checksum((uint16_t *)&ip->saddr, sizeof(ip->saddr));
-       sum += uint16_checksum((uint16_t *)&ip->daddr, sizeof(ip->daddr));
+       sum += uint16_checksum((uint16_t *)(void *)&ip->saddr,
+                              sizeof(ip->saddr));
+       sum += uint16_checksum((uint16_t *)(void *)&ip->daddr,
+                              sizeof(ip->daddr));
        sum += ip->protocol + n;
        sum = (sum & 0xFFFF) + (sum >> 16);
        sum = (sum & 0xFFFF) + (sum >> 16);

diff --git a/doc/ctdb.1.xml b/doc/ctdb.1.xml
index 7fb620de865b8fdb78fa40b25fdfb9fff071941b..3f92f510957b4b96a4f2b1be699b0e4aff9bdbc4 100644 (file)
--- a/doc/ctdb.1.xml
+++ b/doc/ctdb.1.xml
@@ -59,7 +59,7 @@
       <varlistentry><term>-Y</term>
         <listitem>
           <para>
-            Produce output in machinereadable form for easier parsing by scripts. Not all commands support this option.
+            Produce output in machine readable form for easier parsing by scripts. Not all commands support this option.
           </para>
         </listitem>
       </varlistentry>
@@ -132,7 +132,7 @@
           OK - This node is fully functional.
         </para>
         <para>
-          DISCONNECTED - This node could not be connected through the network and is currently not parcipitating in the cluster. If there is a public IP address associated with this node it should have been taken over by a different node. No services are running on this node.
+          DISCONNECTED - This node could not be connected through the network and is currently not participating in the cluster. If there is a public IP address associated with this node it should have been taken over by a different node. No services are running on this node.
         </para>
         <para>
           DISABLED - This node has been administratively disabled. This node is still functional and participates in the CTDB cluster but its IP addresses have been taken over by a different node and no services are currently being hosted.
@@ -156,7 +156,7 @@
       <refsect3><title>VNNMAP</title>
         <para>
           The list of Virtual Node Numbers. This is a list of all nodes that actively participates in the cluster and that share the workload of hosting the Clustered TDB database records.
-          Only nodes that are parcipitating in the vnnmap can become lmaster or dmaster for a database record.
+          Only nodes that are participating in the vnnmap can become lmaster or dmaster for a database record.
         </para>
       </refsect3>
 

diff --git a/doc/ctdbd.1.xml b/doc/ctdbd.1.xml
index cbff8d8b5bb44953f6dada15372d8bf6c5d0bf87..a1352af47d803ae15a49fa922e6d07e388111729 100644 (file)
--- a/doc/ctdbd.1.xml
+++ b/doc/ctdbd.1.xml
@@ -319,7 +319,7 @@
     
     <para>
       DISCONNECTED - This node could not be connected through the network 
-      and is currently not parcipitating in the cluster. If there is a 
+      and is currently not particpating in the cluster. If there is a 
       public IP address associated with this node it should have been taken 
       over by a different node. No services are running on this node.
     </para>