diff --git a/ChangeLog b/ChangeLog index 8cf9d89ff2..6e92bd6d2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 14 11:01:00 BST 2008 Richard W.M. Jones + + Fix typo "informations" -> "information" (Atsushi SAKAI and + Saori FUKUTA). + Thu Mar 13 10:24:45 CET 2008 Daniel Veillard * src/libvirt.c: virDomainSetSchedulerParameters need to be diff --git a/docs/apibuild.py b/docs/apibuild.py index 44d5e64308..5f6424c3c2 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -752,7 +752,7 @@ class CParser: return((args, desc)) # - # Parse a comment block and merge the informations found in the + # Parse a comment block and merge the information found in the # parameters descriptions, finally returns a block as complete # as possible # diff --git a/docs/architecture.html b/docs/architecture.html index 7a8ca26512..89df869aea 100644 --- a/docs/architecture.html +++ b/docs/architecture.html @@ -8,7 +8,7 @@ engines:

Libvirt Xen support

When running in a Xen environment, programs using libvirt have to execute in "Domain 0", which is the primary Linux OS loaded on the machine. That OS kernel provides most if not all of the actual drivers used by the set of -domains. It also runs the Xen Store, a database of informations shared by the +domains. It also runs the Xen Store, a database of information shared by the hypervisor, the kernels, the drivers and the xen daemon. Xend. The xen daemon supervise the control and execution of the sets of domains. The hypervisor, drivers, kernels and daemons communicate though a shared system bus @@ -23,7 +23,7 @@ the Xen infrastructure:

The library will usually interact with the Xen daemon for any operation changing the state of the system, but for performance and accuracy reasons -may talk directly to the hypervisor when gathering state informations at +may talk directly to the hypervisor when gathering state information at least when possible (i.e. when the running program using libvirt has root priviledge access).

If it runs without root access virConnectOpenReadOnly() should be used to connect to initialize the library. It will then fork a libvirt_proxy diff --git a/docs/devhelp/libvirt-libvirt.html b/docs/devhelp/libvirt-libvirt.html index c713056da1..62d027f967 100644 --- a/docs/devhelp/libvirt-libvirt.html +++ b/docs/devhelp/libvirt-libvirt.html @@ -404,8 +404,8 @@ The content of this structure is not made public by the API.

Enum virDomainXMLFlags

enum virDomainXMLFlags {
-    VIR_DOMAIN_XML_SECURE = 1 /* dump security sensitive informations too */
-    VIR_DOMAIN_XML_INACTIVE = 2 /*  dump inactive domain informations */
+    VIR_DOMAIN_XML_SECURE = 1 /* dump security sensitive information too */
+    VIR_DOMAIN_XML_INACTIVE = 2 /*  dump inactive domain information */
 };

diff --git a/docs/errors.html b/docs/errors.html index 110c1e9980..70c2490e81 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -1,7 +1,7 @@ Handling of errors

Handling of errors

The main goals of libvirt when it comes to error handling are:

  • provide as much detail as possible
    • -
  • provide the informations as soon as possible
    • +
  • provide the information as soon as possible
  • dont force the library user into one style of error handling

As result the library provide both synchronous, callback based and asynchronous error reporting. When an error happens in the library code the @@ -15,7 +15,7 @@ dynamic structure which can be made thread specific. Error callback can be set specifically to a connection with

So error handling in the code is the following:

  1. if the error can be associated to a connection for example when failing to look up a domain
    1. if there is a callback associated to the connection set with virConnSetErrorFunc, - call it with the error informations
      2. + call it with the error information
    2. otherwise if there is a global callback set with virSetErrorFunc, call it with the error information
    3. otherwise call virDefaultErrorFunc @@ -31,7 +31,7 @@ set specifically to a connection with

      So error handling in the code is the on stderr

    4. save the error in the connection for later retrieval with virGetLastError
    2. -

In all cases the error informations are provided as a virErrorPtr pointer to +

In all cases the error information is provided as a virErrorPtr pointer to read-only structure virError containing the following fields:

  • code: an error number from the virErrorNumber enum
    • @@ -44,10 +44,10 @@ following fields:

    • code: an error number from the virDomainPtr domain targetted in the operation
      • -

    and then extra raw informations about the error which may be initialized -to 0 or NULL if unused

    • str1, str2, str3: string informations, usually str1 is the error +

    and then extra raw information about the error which may be initialized +to 0 or NULL if unused

    • str1, str2, str3: string information, usually str1 is the error message format
      • -
    • int1, int2: integer informations
      • +
    • int1, int2: integer information

    So usually, setting up specific error handling with libvirt consist of registering an handler with with virSetErrorFunc or with virConnSetErrorFunc, diff --git a/docs/examples/examples.xml b/docs/examples/examples.xml index 5e54567843..24c5a48a59 100644 --- a/docs/examples/examples.xml +++ b/docs/examples/examples.xml @@ -1,7 +1,7 @@ - Extract informations about Xen domain 0 - Demonstrate the basic use of the library to connect to the hypervisor and extract domain informations. + Extract information about Xen domain 0 + Demonstrate the basic use of the library to connect to the hypervisor and extract domain information. info1 info1 Daniel Veillard diff --git a/docs/examples/index.html b/docs/examples/index.html index 793a391079..6709b351d1 100644 --- a/docs/examples/index.html +++ b/docs/examples/index.html @@ -1,7 +1,7 @@ Libvirt set of C code examples

    Libvirt set of C code examples

    The examples are stored per section depending on the main focus - of the example:

    Getting the compilation options and libraries dependancies needed + of the example:

    Getting the compilation options and libraries dependancies needed to generate binaries from the examples is best done on Linux/Unix by using the pkg-config data which should have been installed as part of make -install step or when installing the libvirt development package:

    gcc -o example example.c `pkg-config libvirt --libs`

    Informations Examples

    info1.c: Extract informations about Xen domain 0

    Demonstrate the basic use of the library to connect to the hypervisor and extract domain informations.

    Uses:

    Usage:

    info1

    Author: Daniel Veillard

    Scheduling Examples

    suspend.c: Suspend a domain and then resume its execution

    Demonstrate the basic use of the library to suspend and resume a domain. If no id is given on the command line this script will suspend and resume the first domain found which is not Domain 0.

    Uses:

    Usage:

    suspend [id]

    Author: Daniel Veillard

    main menu

    related links

    Graphics and design by Diana Fong

    +install step or when installing the libvirt development package:

    gcc -o example example.c `pkg-config libvirt --libs`

    Informations Examples

    info1.c: Extract information about Xen domain 0

    Demonstrate the basic use of the library to connect to the hypervisor and extract domain information.

    Uses:

    Usage:

    info1

    Author: Daniel Veillard

    Scheduling Examples

    suspend.c: Suspend a domain and then resume its execution

    Demonstrate the basic use of the library to suspend and resume a domain. If no id is given on the command line this script will suspend and resume the first domain found which is not Domain 0.

    Uses:

    Usage:

    suspend [id]

    Author: Daniel Veillard

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/examples/info1.c b/docs/examples/info1.c index f17bde8a02..c5b89062b0 100644 --- a/docs/examples/info1.c +++ b/docs/examples/info1.c @@ -1,8 +1,8 @@ /** * section: Informations - * synopsis: Extract informations about Xen domain 0 + * synopsis: Extract information about Xen domain 0 * purpose: Demonstrate the basic use of the library to connect to the - * hypervisor and extract domain informations. + * hypervisor and extract domain information. * usage: info1 * test: info1 * author: Daniel Veillard @@ -16,13 +16,13 @@ * getDomainInfo: * @id: the id of the domain * - * extract the domain 0 informations + * extract the domain 0 information */ static void getDomainInfo(int id) { virConnectPtr conn = NULL; /* the hypervisor connection */ virDomainPtr dom = NULL; /* the domain being checked */ - virDomainInfo info; /* the informations being fetched */ + virDomainInfo info; /* the information being fetched */ int ret; /* NULL means connect to local Xen hypervisor */ @@ -39,10 +39,10 @@ getDomainInfo(int id) { goto error; } - /* Get the informations */ + /* Get the information */ ret = virDomainGetInfo(dom, &info); if (ret < 0) { - fprintf(stderr, "Failed to get informations for Domain %d\n", id); + fprintf(stderr, "Failed to get information for Domain %d\n", id); goto error; } diff --git a/docs/examples/suspend.c b/docs/examples/suspend.c index d079acadfa..dc069454e5 100644 --- a/docs/examples/suspend.c +++ b/docs/examples/suspend.c @@ -25,7 +25,7 @@ static virConnectPtr conn = NULL; /* the hypervisor connection */ */ static int checkDomainState(virDomainPtr dom) { - virDomainInfo info; /* the informations being fetched */ + virDomainInfo info; /* the information being fetched */ int ret; ret = virDomainGetInfo(dom, &info); @@ -39,7 +39,7 @@ checkDomainState(virDomainPtr dom) { * SuspendAndResumeDomain: * @id: the id of the domain * - * extract the domain 0 informations + * extract the domain 0 information */ static void SuspendAndResumeDomain(int id) { diff --git a/docs/format.html b/docs/format.html index 716c589c1b..af03d1c8da 100644 --- a/docs/format.html +++ b/docs/format.html @@ -157,7 +157,7 @@ systems:

<domain type='xen' id='3'>
   
  • the <os> block description is very different, first
     it indicates that the type is 'hvm' for hardware virtualization, then
     instead of a kernel, boot and command line arguments, it points to an os
-    boot loader which will extract the boot informations from the boot device
+    boot loader which will extract the boot information from the boot device
     specified in a separate boot element. The dev attribute on
     the boot tag can be one of:

    • Enum virDomainXMLFlags

    Enum virDomainXMLFlags {
-    VIR_DOMAIN_XML_SECURE = 1 : dump security sensitive informations too
-    VIR_DOMAIN_XML_INACTIVE = 2 : dump inactive domain informations
+    VIR_DOMAIN_XML_SECURE = 1 : dump security sensitive information too
+    VIR_DOMAIN_XML_INACTIVE = 2 : dump inactive domain information
 }

    Structure virNetwork

    Structure virNetwork
    struct _virNetwork {
 The content of this structure is not made public by the API.
diff --git a/docs/index.py b/docs/index.py
index 20047b965a..e9d0a43f6d 100755
--- a/docs/index.py
+++ b/docs/index.py
@@ -34,7 +34,7 @@
 #    Bye
 #
 # Then run the script in the doc subdir, it will create the symbols and
-# word tables and populate them with informations extracted from
+# word tables and populate them with information extracted from
 # the libvirt-api.xml API description, and make then accessible read-only
 # by nobody@loaclhost the user expected to be Apache's one
 #
diff --git a/docs/libvir.html b/docs/libvir.html
index d4c229ca34..ac29255477 100644
--- a/docs/libvir.html
+++ b/docs/libvir.html
@@ -254,7 +254,7 @@ and check the ChangeLog to gauge progress.
    
   
  • Documentation: remote support (Richard Jones), description of
       the URI connection strings (Richard Jones), update of virsh man
       page, matrix of libvirt API/hypervisor support with version
-      informations (Richard Jones)
    • 
+      information (Richard Jones)
   
  • Bug fixes: examples Makefile.am generation (Richard Jones),
       SetMem fix (Mark Johnson), URI handling and ordering of
       drivers (Daniel Berrange), fix virsh help without hypervisor (Richard
@@ -424,7 +424,7 @@ and check the ChangeLog to gauge progress.
    
 
    0.1.9: Nov 29 2006
    
 
      
   
    • python bindings: release interpeter lock when calling C (Daniel Berrange)
      • 
-  
    • don't raise HTTP error when looking informations for a domain
      • 
+  
    • don't raise HTTP error when looking information for a domain
      • 
   
    • some refactoring to use the driver for all entry points
      • 
   
    • better error reporting (Daniel Berrange)
      • 
   
    • fix OS reporting when running as non-root
      • 
@@ -442,7 +442,7 @@ and check the ChangeLog to gauge progress.
      
   
    • added support for inactive domains, new APIs, various associated cleanup (Daniel Berrange)
      • 
   
    • special device model for HVM guests (Daniel Berrange)
      • 
   
    • add API to dump core of domains (but requires a patched xend)
      • 
-  
    • pygrub bootloader informations take over <os> informations
      • 
+  
    • pygrub bootloader information take over <os> information
      • 
   
    • updated the localization strings
      • 
 
    
 
    0.1.8: Oct 16 2006
    
@@ -459,9 +459,9 @@ and check the ChangeLog to gauge progress.
    
 
 
    0.1.7: Sep 29 2006
    
 
      
-  
    •  fix a memory bug on getting vcpu informations from xend (Daniel Berrange)
      • 
+  
    •  fix a memory bug on getting vcpu information from xend (Daniel Berrange)
      • 
   
    •  fix another problem in the hypercalls change in Xen changeset
-       86d26e6ec89b when getting domain informations (Daniel Berrange)
      • 
+       86d26e6ec89b when getting domain information (Daniel Berrange)
 
    
 
    0.1.6: Sep 22 2006
    
 
      
@@ -497,7 +497,7 @@ and check the ChangeLog to gauge progress.
      
     initialization errors (Daniel Berrange)
   
    • improvements: UUID in XML description (Peter Vetere), proxy code
     cleanup, virtual CPU and affinity support + virsh support (Michel
-    Ponceau, Philippe Berthault, Daniel Berrange), port and tty informations
+    Ponceau, Philippe Berthault, Daniel Berrange), port and tty information
     for console in XML (Daniel Berrange), added XML dump to driver and proxy
     support (Daniel Berrange), extention of boot options with support for
     floppy and cdrom (Daniel Berrange), features block in XML to report/ask
@@ -678,7 +678,7 @@ engines:
      
 
      When running in a Xen environment, programs using libvirt have to execute
 in "Domain 0", which is the primary Linux OS loaded on the machine. That OS
 kernel provides most if not all of the actual drivers used by the set of
-domains. It also runs the Xen Store, a database of informations shared by the
+domains. It also runs the Xen Store, a database of information shared by the
 hypervisor, the kernels, the drivers and the xen daemon. Xend. The xen daemon
 supervise the control and execution of the sets of domains. The hypervisor,
 drivers, kernels and daemons communicate though a shared system bus
@@ -700,7 +700,7 @@ the Xen infrastructure:
      
 
 
      The library will usually interact with the Xen daemon for any operation
 changing the state of the system, but for performance and accuracy reasons
-may talk directly to the hypervisor when gathering state informations at
+may talk directly to the hypervisor when gathering state information at
 least when possible (i.e. when the running program using libvirt has root
 priviledge access).
      
 
@@ -995,7 +995,7 @@ systems:
      
   
    • the <os> block description is very different, first
     it indicates that the type is 'hvm' for hardware virtualization, then
     instead of a kernel, boot and command line arguments, it points to an os
-    boot loader which will extract the boot informations from the boot device
+    boot loader which will extract the boot information from the boot device
     specified in a separate boot element. The dev attribute on
     the boot tag can be one of:
     
        
@@ -1300,9 +1300,9 @@ description).
        
 
 
        The second block (in blue) indicates the paravirtualization support of the
 Xen support, you will see the os_type of xen to indicate a paravirtual
-kernel, then architecture informations and potential features.
        
+kernel, then architecture information and potential features.
        
 
-
        The third block (in green) gives similar informations but when running a
+
        The third block (in green) gives similar information but when running a
 32 bit OS fully virtualized with Xen using the hvm support.
        
 
 
        This section is likely to be updated and augmented in the future, see 
 
        
 
-
        and then extra raw informations about the error which may be initialized
+
        and then extra raw information about the error which may be initialized
 to 0 or NULL if unused
        
 
          
-  
        • str1, str2, str3: string informations, usually str1 is the error
+  
        • str1, str2, str3: string information, usually str1 is the error
     message format
          • 
-  
        • int1, int2: integer informations
          • 
+  
        • int1, int2: integer information
          • 
 
        
 
 
        So usually, setting up specific error handling with libvirt consist of
diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml
index 464e5d15dc..fb2fa7ddf7 100644
--- a/docs/libvirt-api.xml
+++ b/docs/libvirt-api.xml
@@ -406,8 +406,8 @@
     
     
     
-    
-    
+    
+    
     
     
     
diff --git a/docs/libvirt.rng b/docs/libvirt.rng
index eb67824c4f..6e4863c23d 100644
--- a/docs/libvirt.rng
+++ b/docs/libvirt.rng
@@ -25,8 +25,8 @@
 
   
   
@@ -60,7 +60,7 @@
 
   
   
diff --git a/docs/news.html b/docs/news.html
index 744464a4e6..83d55bf0b3 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -199,7 +199,7 @@ and check the ChangeLog to gauge progress.
        0
   
      • Documentation: remote support (Richard Jones), description of
       the URI connection strings (Richard Jones), update of virsh man
       page, matrix of libvirt API/hypervisor support with version
-      informations (Richard Jones)
        • 
+      information (Richard Jones)
   
      • Bug fixes: examples Makefile.am generation (Richard Jones),
       SetMem fix (Mark Johnson), URI handling and ordering of
       drivers (Daniel Berrange), fix virsh help without hypervisor (Richard
@@ -344,7 +344,7 @@ and check the ChangeLog to gauge progress.
        0
   
      • bug fixes: VCPU info breakages on xen 3.0.3, xenDaemonListDomains buffer overflow (Daniel Berrange), reference count bug when creating Xen domains (Daniel Berrange).
        • 
   
      • improvements: support graphic framebuffer for Xen paravirt (Daniel Berrange), VNC listen IP range support (Daniel Berrange), support for default Xen config files and inactive domains of 3.0.4 (Daniel Berrange).
        • 
 
      0.1.9: Nov 29 2006
      • python bindings: release interpeter lock when calling C (Daniel Berrange)
        • 
-  
      • don't raise HTTP error when looking informations for a domain
        • 
+  
      • don't raise HTTP error when looking information for a domain
        • 
   
      • some refactoring to use the driver for all entry points
        • 
   
      • better error reporting (Daniel Berrange)
        • 
   
      • fix OS reporting when running as non-root
        • 
@@ -362,7 +362,7 @@ and check the ChangeLog to gauge progress.
        0
   
      • added support for inactive domains, new APIs, various associated cleanup (Daniel Berrange)
        • 
   
      • special device model for HVM guests (Daniel Berrange)
        • 
   
      • add API to dump core of domains (but requires a patched xend)
        • 
-  
      • pygrub bootloader informations take over <os> informations
        • 
+  
      • pygrub bootloader information take over <os> information
        • 
   
      • updated the localization strings
        • 
 
      0.1.8: Oct 16 2006
      •  Bug for system with page size != 4k
        • 
   
      •  vcpu number initialization (Philippe Berthault)
        • 
@@ -373,9 +373,9 @@ and check the ChangeLog to gauge progress.
        0
   
      •  compile fix
        • 
   
      •  mlock/munlock size fixes (Daniel Berrange)
        • 
   
      •  improve error reporting
        • 
-
      0.1.7: Sep 29 2006
      •  fix a memory bug on getting vcpu informations from xend (Daniel Berrange)
        • 
+
      0.1.7: Sep 29 2006
      •  fix a memory bug on getting vcpu information from xend (Daniel Berrange)
        • 
   
      •  fix another problem in the hypercalls change in Xen changeset
-       86d26e6ec89b when getting domain informations (Daniel Berrange)
        • 
+       86d26e6ec89b when getting domain information (Daniel Berrange)
 
      0.1.6: Sep 22 2006
      • Support for localization of strings using gettext (Daniel Berrange)
        • 
   
      • Support for new Xen-3.0.3 cdrom and disk configuration (Daniel Berrange)
        • 
   
      • Support for setting VNC port when creating domains with new
@@ -401,7 +401,7 @@ and check the ChangeLog to gauge progress.
        0
     initialization errors (Daniel Berrange)
        • 
   
      • improvements: UUID in XML description (Peter Vetere), proxy code
     cleanup, virtual CPU and affinity support + virsh support (Michel
-    Ponceau, Philippe Berthault, Daniel Berrange), port and tty informations
+    Ponceau, Philippe Berthault, Daniel Berrange), port and tty information
     for console in XML (Daniel Berrange), added XML dump to driver and proxy
     support (Daniel Berrange), extention of boot options with support for
     floppy and cdrom (Daniel Berrange), features block in XML to report/ask
diff --git a/docs/python.html b/docs/python.html
index 884c35f449..a8969bd65b 100644
--- a/docs/python.html
+++ b/docs/python.html
@@ -5,7 +5,7 @@ pure C. First the headers embeds the necessary declarations to
 allow direct acces from C++ code, but also we have bindings for
 higher level kind of languages:
        • Python: Libvirt comes with direct support for the Python language
      (just make sure you installed the libvirt-python package if not
-     compiling from sources). See below for more informations about
+     compiling from sources). See below for more information about
      using libvirt with python
          • 
   
        • Perl: Daniel Berrange provides bindings for
      Perl.
          • 
@@ -13,7 +13,7 @@ higher level kind of languages:
          • Python: Libvirt comes with direct sup
   
          • Ruby: David Lutterkork provides bindings for Ruby.
            • 
 
          Support, requests or help for libvirt bindings are welcome on
 the mailing
-list, as usual try to provide enough background informations
+list, as usual try to provide enough background information
 and make sure you use recent version, see the help
 page.
          The remaining of this page focuses on the Python bindings.
          The Python binding should be complete and are mostly automatically
 generated from the formal description of the API in xml. The bindings are
@@ -59,7 +59,7 @@ from the C API, the only points to notice are:
          • the import of the modu
     openReadOnly function allows the code to execute as a normal user.
            • 
   
          • getting an object representing the Domain 0 using lookupByName
            • 
   
          • if the domain is not found a libvirtError exception will be raised
            • 
-  
          • extracting and printing some informations about the domain using
+  
          • extracting and printing some information about the domain using
     various methods
     associated to the virDomain class.
            • 
 
          main menu
          related links
          Graphics and design by Diana Fong
          
diff --git a/docs/virsh.pod b/docs/virsh.pod
index d99ebb0335..25cc2421cc 100644
--- a/docs/virsh.pod
+++ b/docs/virsh.pod
@@ -121,7 +121,7 @@ capabilities in terms of CPU and features, and a set of description
 for each kind of guest which can be virtualized. For a more complete
 description see:
   L
-The XML also show the NUMA topology informations if available.
+The XML also show the NUMA topology information if available.
 
 =item B
 
@@ -255,7 +255,7 @@ Returns state about a running domain.
 
 =item B I
 
-Output the domain informations as an XML dump to stdout, this format can be used by the B command.
+Output the domain information as an XML dump to stdout, this format can be used by the B command.
 
 
 =item B I
@@ -413,7 +413,7 @@ if more than one are present on the domain.
 
 The following commands manipulate networks. Libvirt has the capability to
 define virtual networks which can then be used by domains and linked to
-actual network devices. For more detailed informations about this feature
+actual network devices. For more detailed information about this feature
 see the documentation at L . A lot
 of the command for virtual networks are similar to the one used for domains,
 but the way to name a virtual network is either by its name or UUID.
diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h
index 54f1fce126..d254495ba2 100644
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@@ -71,7 +71,7 @@ typedef enum {
  * virDomainInfoPtr:
  *
  * a virDomainInfo is a structure filled by virDomainGetInfo() and extracting
- * runtime informations for a given active Domain
+ * runtime information for a given active Domain
  */
 
 typedef struct _virDomainInfo virDomainInfo;
@@ -106,7 +106,7 @@ typedef enum {
  * virNodeInfoPtr:
  *
  * a virNodeInfo is a structure filled by virNodeGetInfo() and providing
- * the informations for the Node.
+ * the information for the Node.
  */
 
 typedef struct _virNodeInfo virNodeInfo;
@@ -469,7 +469,7 @@ int			virDomainCoreDump	(virDomainPtr domain,
 						 int flags);
 
 /*
- * Domain runtime informations
+ * Domain runtime information
  */
 int			virDomainGetInfo	(virDomainPtr domain,
 						 virDomainInfoPtr info);
@@ -507,8 +507,8 @@ int			virDomainGetMaxVcpus	(virDomainPtr domain);
  */
 
 typedef enum {
-    VIR_DOMAIN_XML_SECURE = 1, /* dump security sensitive informations too */
-    VIR_DOMAIN_XML_INACTIVE = 2/* dump inactive domain informations */
+    VIR_DOMAIN_XML_SECURE = 1, /* dump security sensitive information too */
+    VIR_DOMAIN_XML_INACTIVE = 2/* dump inactive domain information */
 } virDomainXMLFlags;
 
 char *			virDomainGetXMLDesc	(virDomainPtr domain,
@@ -744,7 +744,7 @@ int			virNetworkDestroy	(virNetworkPtr network);
 int			virNetworkFree		(virNetworkPtr network);
 
 /*
- * Network informations
+ * Network information
  */
 const char*		virNetworkGetName	(virNetworkPtr network);
 int			virNetworkGetUUID	(virNetworkPtr network,
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 1202ee9ed3..de6acd807d 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -71,7 +71,7 @@ typedef enum {
  * virDomainInfoPtr:
  *
  * a virDomainInfo is a structure filled by virDomainGetInfo() and extracting
- * runtime informations for a given active Domain
+ * runtime information for a given active Domain
  */
 
 typedef struct _virDomainInfo virDomainInfo;
@@ -106,7 +106,7 @@ typedef enum {
  * virNodeInfoPtr:
  *
  * a virNodeInfo is a structure filled by virNodeGetInfo() and providing
- * the informations for the Node.
+ * the information for the Node.
  */
 
 typedef struct _virNodeInfo virNodeInfo;
@@ -469,7 +469,7 @@ int			virDomainCoreDump	(virDomainPtr domain,
 						 int flags);
 
 /*
- * Domain runtime informations
+ * Domain runtime information
  */
 int			virDomainGetInfo	(virDomainPtr domain,
 						 virDomainInfoPtr info);
@@ -507,8 +507,8 @@ int			virDomainGetMaxVcpus	(virDomainPtr domain);
  */
 
 typedef enum {
-    VIR_DOMAIN_XML_SECURE = 1, /* dump security sensitive informations too */
-    VIR_DOMAIN_XML_INACTIVE = 2/* dump inactive domain informations */
+    VIR_DOMAIN_XML_SECURE = 1, /* dump security sensitive information too */
+    VIR_DOMAIN_XML_INACTIVE = 2/* dump inactive domain information */
 } virDomainXMLFlags;
 
 char *			virDomainGetXMLDesc	(virDomainPtr domain,
@@ -744,7 +744,7 @@ int			virNetworkDestroy	(virNetworkPtr network);
 int			virNetworkFree		(virNetworkPtr network);
 
 /*
- * Network informations
+ * Network information
  */
 const char*		virNetworkGetName	(virNetworkPtr network);
 int			virNetworkGetUUID	(virNetworkPtr network,
diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c
index a22ba6cf6d..eca539645a 100644
--- a/proxy/libvirt_proxy.c
+++ b/proxy/libvirt_proxy.c
@@ -571,7 +571,7 @@ retry2:
 	        goto comm_error;
 
 	    /*
-	     * Hum, could we expect those informations to be unmutable and
+	     * Hum, could we expect those information to be unmutable and
 	     * cache them ? Since it's probably an unfrequent call better
 	     * not make assumption and do the xend RPC each call.
 	     */
@@ -763,7 +763,7 @@ proxyMainLoop(void) {
 /**
  * usage:
  *
- * dump on stdout informations about the program
+ * dump on stdout information about the program
  */
 static void
 usage(const char *progname) {
diff --git a/python/libvir.py b/python/libvir.py
index 34fe8f3de0..3a3889874a 100644
--- a/python/libvir.py
+++ b/python/libvir.py
@@ -85,7 +85,7 @@ class libvirtError(Exception):
 def registerErrorHandler(f, ctx):
     """Register a Python written function to for error reporting.
        The function is called back as f(ctx, error), with error
-       being a list of informations about the error being raised.
+       being a list of information about the error being raised.
        Returns 1 in case of success."""
     return libvirtmod.virRegisterErrorHandler(f,ctx)
 
diff --git a/python/libvirt-python-api.xml b/python/libvirt-python-api.xml
index 6f64b655b6..3e59398752 100644
--- a/python/libvirt-python-api.xml
+++ b/python/libvirt-python-api.xml
@@ -34,13 +34,13 @@
       
     
     
-      Extract informations about a domain. Note that if the connection used to get the domain is limited only a partial set of the informations can be extracted.
-      
+      Extract information about a domain. Note that if the connection used to get the domain is limited only a partial set of the information can be extracted.
+      
       
     
     
-      Extract hardware informations about the Node.
-      
+      Extract hardware information about the Node.
+      
       
     
     
diff --git a/python/tests/node.py b/python/tests/node.py
index 2e33fb70cc..f199fc3c93 100755
--- a/python/tests/node.py
+++ b/python/tests/node.py
@@ -15,14 +15,14 @@ if conn == None:
 try:
     (model, memory, cpus, mhz, nodes, socket, cores, threads) = conn.getInfo()
 except:
-    print 'Failed to extract the current node informations'
+    print 'Failed to extract the current node information'
     sys.exit(1)
 
 print "Xen running on %d %s processors at %d MHz, %d MBytes of memory" % (
        cpus, model, mhz, memory)
 
 if cpus > nodes * socket * cores * threads:
-    print "Erroneous CPU informations"
+    print "Erroneous CPU information"
     sys.exit(1)
 
 if cpus < nodes * socket * cores * threads:
diff --git a/src/xen_internal.c b/src/xen_internal.c
index 8e64bdbe10..94185ccb9e 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -397,28 +397,28 @@ struct xen_v0_domainop {
 typedef struct xen_v0_domainop xen_v0_domainop;
 
 /*
- * The informations for a destroydomain system hypercall
+ * The information for a destroydomain system hypercall
  */
 #define XEN_V0_OP_DESTROYDOMAIN	9
 #define XEN_V1_OP_DESTROYDOMAIN	9
 #define XEN_V2_OP_DESTROYDOMAIN	2
 
 /*
- * The informations for a pausedomain system hypercall
+ * The information for a pausedomain system hypercall
  */
 #define XEN_V0_OP_PAUSEDOMAIN	10
 #define XEN_V1_OP_PAUSEDOMAIN	10
 #define XEN_V2_OP_PAUSEDOMAIN	3
 
 /*
- * The informations for an unpausedomain system hypercall
+ * The information for an unpausedomain system hypercall
  */
 #define XEN_V0_OP_UNPAUSEDOMAIN	11
 #define XEN_V1_OP_UNPAUSEDOMAIN	11
 #define XEN_V2_OP_UNPAUSEDOMAIN	4
 
 /*
- * The informations for an setmaxmem system hypercall
+ * The information for an setmaxmem system hypercall
  */
 #define XEN_V0_OP_SETMAXMEM	28
 #define XEN_V1_OP_SETMAXMEM	28
@@ -442,7 +442,7 @@ struct xen_v2d5_setmaxmem {
 typedef struct xen_v2d5_setmaxmem xen_v2d5_setmaxmem;
 
 /*
- * The informations for an setmaxvcpu system hypercall
+ * The information for an setmaxvcpu system hypercall
  */
 #define XEN_V0_OP_SETMAXVCPU	41
 #define XEN_V1_OP_SETMAXVCPU	41
@@ -461,7 +461,7 @@ struct xen_v2_setmaxvcpu {
 typedef struct xen_v2_setmaxvcpu xen_v2_setmaxvcpu;
 
 /*
- * The informations for an setvcpumap system hypercall
+ * The information for an setvcpumap system hypercall
  * Note that between 1 and 2 the limitation to 64 physical CPU was lifted
  * hence the difference in structures
  */
@@ -509,7 +509,7 @@ struct xen_v2d5_setvcpumap {
 typedef struct xen_v2d5_setvcpumap xen_v2d5_setvcpumap;
 
 /*
- * The informations for an vcpuinfo system hypercall
+ * The information for an vcpuinfo system hypercall
  */
 #define XEN_V0_OP_GETVCPUINFO   43
 #define XEN_V1_OP_GETVCPUINFO	43
@@ -980,7 +980,7 @@ xenHypervisorDoV2Dom(int handle, xen_op_v2_dom* op)
  * @maxids: maximum number of domains to list
  * @dominfos: output structures
  *
- * Do a low level hypercall to list existing domains informations
+ * Do a low level hypercall to list existing domains information
  *
  * Returns the number of domains or -1 in case of failure
  */
diff --git a/virsh.1 b/virsh.1
index 13509deaf6..88eb9bfcc6 100644
--- a/virsh.1
+++ b/virsh.1
@@ -241,7 +241,7 @@ capabilities in terms of \s-1CPU\s0 and features, and a set of description
 for each kind of guest which can be virtualized. For a more complete
 description see:
   
-The \s-1XML\s0 also show the \s-1NUMA\s0 topology informations if available.
+The \s-1XML\s0 also show the \s-1NUMA\s0 topology information if available.
 .IP "\fBlist\fR" 4
 .IX Item "list"
 Prints information about one or more domains.  If no domains are
@@ -353,7 +353,7 @@ convert a domain Id to domain name
 Returns state about a running domain.
 .IP "\fBdumpxml\fR \fIdomain-id\fR" 4
 .IX Item "dumpxml domain-id"
-Output the domain informations as an \s-1XML\s0 dump to stdout, this format can be used by the \fBcreate\fR command.
+Output the domain information as an \s-1XML\s0 dump to stdout, this format can be used by the \fBcreate\fR command.
 .IP "\fBreboot\fR \fIdomain-id\fR" 4
 .IX Item "reboot domain-id"
 Reboot a domain.  This acts just as if the domain had the \fBreboot\fR
@@ -480,7 +480,7 @@ if more than one are present on the domain.
 .IX Header "VIRTUAL NETWORKS COMMANDS"
 The following commands manipulate networks. Libvirt has the capability to
 define virtual networks which can then be used by domains and linked to
-actual network devices. For more detailed informations about this feature
+actual network devices. For more detailed information about this feature
 see the documentation at  . A lot
 of the command for virtual networks are similar to the one used for domains,
 but the way to name a virtual network is either by its name or \s-1UUID\s0.