diff --git a/ChangeLog b/ChangeLog
index edd59e89b9f5b0202914f2de1c16aa5158513b75..40b8a84bcf2c80a5519c7ab6a7bb1f919560172b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 24 18:00:21 JST 2008 Atsushi SAKAI <sakaia@jp.fujitsu.com>
+
+	* proxy/libvirt_proxy.c docs/* fixing typos
+
 Thu Apr 24 09:54:19 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* AUTHORS: indicate that the Logo is by Diana Fong
diff --git a/docs/bindings.html b/docs/bindings.html
index 4b0512e75d7be8ef8b195dcd1eb6fe2339b2adb5..ad4ccfbd89f5ef2ffbfdefd388feb094f4bb12c9 100644
--- a/docs/bindings.html
+++ b/docs/bindings.html
@@ -27,7 +27,7 @@
         <h1>Bindings for other languages</h1>
         <p>Libvirt comes with bindings to support other languages than
 pure C. First the headers embeds the necessary declarations to
-allow direct acces from C++ code, but also we have bindings for
+allow direct access from C++ code, but also we have bindings for
 higher level kind of languages:</p>
         <ul><li>Python: Libvirt comes with direct support for the Python language
      (just make sure you installed the libvirt-python package if not
diff --git a/docs/deployment.html b/docs/deployment.html
index e3601e82676ab5068f6036ffc10fb8aabbc45405..e9f1de2d4d3d9e8c61ea4db1d2743eca1f86f9d5 100644
--- a/docs/deployment.html
+++ b/docs/deployment.html
@@ -45,7 +45,7 @@
     </pre>
         <h2>Built from CVS / GIT</h2>
         <p>
-      When building from CVS it is neccessary to generate the autotools
+      When building from CVS it is necessary to generate the autotools
       support files. This requires having <code>autoconf</code>,
       <code>automake</code>, <code>libtool</code> and <code>intltool</code>
       installed. The process can be automated with the <code>autogen.sh</code>
diff --git a/docs/downloads.html b/docs/downloads.html
index 23c9240f3f6f87f4c809bda4f1a51634e46fae91..8bffb84cf1bff30a2195f7ccd2a6d6f8df15fe29 100644
--- a/docs/downloads.html
+++ b/docs/downloads.html
@@ -33,14 +33,14 @@
         <h2>Hourly development snapshots</h2>
         <p>
       Once an hour, an automated snapshot is made from the latest CVS server
-      source tree. These snapshots should be usable, but we make no guarentees
+      source tree. These snapshots should be usable, but we make no guarantees
       about their stability:
     </p>
         <ul><li><a href="ftp://libvirt.org/libvirt/libvirt-cvs-snapshot.tar.gz">libvirt.org FTP server</a></li><li><a href="http://libvirt.org/sources/libvirt-cvs-snapshot.tar.gz">libvirt.org HTTP server</a></li></ul>
         <h2>CVS repository access</h2>
         <p>
       The master source repository uses <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a>
-      and anonymous access is provided. Prior to accessing the server is it neccessary
+      and anonymous access is provided. Prior to accessing the server is it necessary
       to authenticate using the password <code>anoncvs</code>. This can be accomplished with the
       <code>cvs login</code> command:
     </p>
@@ -57,7 +57,7 @@
     </pre>
         <p>
       The libvirt build process uses GNU autotools, so after obtaining a checkout
-      it is neccessary to generate the configure script and Makefile.in templates
+      it is necessary to generate the configure script and Makefile.in templates
       using the <code>autogen.sh</code> command. As an example, to do a complete
       build and install it into your home directory run:
     </p>
diff --git a/docs/downloads.html.in b/docs/downloads.html.in
index e1aae438dc5fb56e2b57f66dfeabdbf524bc93ae..a1d301ae448c1a75312e44ae963ac7917284676e 100644
--- a/docs/downloads.html.in
+++ b/docs/downloads.html.in
@@ -18,7 +18,7 @@
 
     <p>
       Once an hour, an automated snapshot is made from the latest CVS server
-      source tree. These snapshots should be usable, but we make no guarentees
+      source tree. These snapshots should be usable, but we make no guarantees
       about their stability:
     </p>
 
@@ -31,7 +31,7 @@
 
     <p>
       The master source repository uses <a href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a>
-      and anonymous access is provided. Prior to accessing the server is it neccessary
+      and anonymous access is provided. Prior to accessing the server is it necessary
       to authenticate using the password <code>anoncvs</code>. This can be accomplished with the
       <code>cvs login</code> command:
     </p>
@@ -52,7 +52,7 @@
 
     <p>
       The libvirt build process uses GNU autotools, so after obtaining a checkout
-      it is neccessary to generate the configure script and Makefile.in templates
+      it is necessary to generate the configure script and Makefile.in templates
       using the <code>autogen.sh</code> command. As an example, to do a complete
       build and install it into your home directory run:
     </p>
diff --git a/docs/drivers.html b/docs/drivers.html
index 564a063abb2f009c8f3ff5ee0123902b65a1bcbf..6481183b2edffc5c1332043122f3b3bd0e4a23d5 100644
--- a/docs/drivers.html
+++ b/docs/drivers.html
@@ -34,7 +34,7 @@
     </p>
         <h2>Hypervisor drivers</h2>
         <p>
-      The hypervisor drivers currently supported by livirt are:
+      The hypervisor drivers currently supported by libvirt are:
     </p>
         <ul><li><strong><a href="drvxen.html">Xen</a></strong></li><li><strong><a href="drvqemu.html">QEMU</a></strong></li><li><strong><a href="drvlxc.html">LXC</a></strong></li><li><strong><a href="drvtest.html">Test</a></strong></li><li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li></ul>
       </div>
diff --git a/docs/drivers.html.in b/docs/drivers.html.in
index a8298ca55e1c2c65f1bd01aa08dde18d8926f762..344a89aebfd1263cd97bd43260e13368ba08bdee 100644
--- a/docs/drivers.html.in
+++ b/docs/drivers.html.in
@@ -13,7 +13,7 @@
     <h2>Hypervisor drivers</h2>
 
     <p>
-      The hypervisor drivers currently supported by livirt are:
+      The hypervisor drivers currently supported by libvirt are:
     </p>
 
     <ul>
diff --git a/docs/formatstorage.html b/docs/formatstorage.html
index d9aaf3a09b8117c78faa4ec4551dd50e9e95d336..b03053e7bd96a14959ea21d03d16e9c82e69fa4c 100644
--- a/docs/formatstorage.html
+++ b/docs/formatstorage.html
@@ -173,7 +173,7 @@ be created. For device based pools it will be the name of the directory in which
 devices nodes exist. For the latter <code>/dev/</code> may seem
 like the logical choice, however, devices nodes there are not
 guaranteed stable across reboots, since they are allocated on
-demand. It is preferrable to use a stable location such as one
+demand. It is preferable to use a stable location such as one
 of the <code>/dev/disk/by-{path,id,uuid,label</code> locations.
 </dd><dt>format</dt><dd>Provides information about the pool specific volume format.
 For disk pools it will provide the partition type. For filesystem
diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index 107d8abb64bb5ac07bed311fb542590d53d27643..d2a48f416d83e4cf34c7605c7036ea3dc7154f67 100644
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -209,7 +209,7 @@ be created. For device based pools it will be the name of the directory in which
 devices nodes exist. For the latter <code>/dev/</code> may seem
 like the logical choice, however, devices nodes there are not
 guaranteed stable across reboots, since they are allocated on
-demand. It is preferrable to use a stable location such as one
+demand. It is preferable to use a stable location such as one
 of the <code>/dev/disk/by-{path,id,uuid,label</code> locations.
 </dd>
           <dt>format</dt>
diff --git a/docs/index.html b/docs/index.html
index 607408ea00232ad1532da4e3efc803fc1ba10461..8778238c4de3c8b906de69f0b14ad812b7e5c9e3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -56,7 +56,7 @@
 	Storage on IDE/SCSI/USB disks, FibreChannel, LVM, iSCSI, NFS and filesystems
       </li></ul>
         <h2>libvirt provides:</h2>
-        <ul><li>Remote management using TLS encryption and x509 certificates</li><li>Remote management authenticating with Kerberos and SASL</li><li>Local access control using PolicyKit</li><li>Zero-conf discovery using Avahi mulicast-DNS</li><li>Management of virtual machines, virtual networks and storage</li></ul>
+        <ul><li>Remote management using TLS encryption and x509 certificates</li><li>Remote management authenticating with Kerberos and SASL</li><li>Local access control using PolicyKit</li><li>Zero-conf discovery using Avahi multicast-DNS</li><li>Management of virtual machines, virtual networks and storage</li></ul>
         <p class="image">
       <img src="libvirtLogo.png" alt="libvirt Logo" /></p>
       </div>
diff --git a/docs/index.html.in b/docs/index.html.in
index 9decc38905506aed5e0135e432bd031b2c768c76..db3700363d1112d39cd3569a7f7487fa45c5b06c 100644
--- a/docs/index.html.in
+++ b/docs/index.html.in
@@ -57,7 +57,7 @@
       <li>Remote management using TLS encryption and x509 certificates</li>
       <li>Remote management authenticating with Kerberos and SASL</li>
       <li>Local access control using PolicyKit</li>
-      <li>Zero-conf discovery using Avahi mulicast-DNS</li>
+      <li>Zero-conf discovery using Avahi multicast-DNS</li>
       <li>Management of virtual machines, virtual networks and storage</li>
     </ul>
 
diff --git a/docs/sitemap.html b/docs/sitemap.html
index 523f4e981ee0d202657109abec39fb1ef592dc85..95c09baaaff442e903008ef8976ce3de5a361f1a 100644
--- a/docs/sitemap.html
+++ b/docs/sitemap.html
@@ -103,7 +103,7 @@
                 <span>Driver for the Linux native container API</span>
               </li><li>
                 <a href="drvtest.html">Test</a>
-                <span>Psuedo-driver simulating APIs in memory for test suites</span>
+                <span>Pseudo-driver simulating APIs in memory for test suites</span>
               </li><li>
                 <a href="drvremote.html">Remote</a>
                 <span>Driver providing secure remote to the libvirt APIs</span>
diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c
index 93b74ab350e1d9f2a107d6f403bd9a488b1864e3..87cff97189099225939c8a64e21ca2ada1dd183c 100644
--- a/proxy/libvirt_proxy.c
+++ b/proxy/libvirt_proxy.c
@@ -151,7 +151,7 @@ proxyCloseUnixSocket(void) {
 
 /**
  * proxyListenUnixSocket:
- * @path: the fileame for the socket
+ * @path: the filename for the socket
  *
  * create a new abstract socket based on that path and listen on it
  *
@@ -700,7 +700,7 @@ proxyProcessRequests(void) {
                 if (exit_timeout == 0) {
                     done = 1;
                     if (debug > 0) {
-                        fprintf(stderr, "Exitting after 30s without clients\n");
+                        fprintf(stderr, "Exiting after 30s without clients\n");
                     }
                 }
             } else