From 901f4b6b863887a7632312e50c752b2a16e3cfac Mon Sep 17 00:00:00 2001
From: Martin Kletzander
The <rule>
element is where all the interesting stuff
happens. It has three attributes, an action, a traffic direction and an
- optional priority. eg:
+ optional priority. E.g.:
<rule action='drop' direction='out' priority='500'>
Within the rule there are a wide variety of elements allowed, which
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 7ad8aea790..c01f564eb3 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1492,8 +1492,8 @@
attribute specifies the type of disk device to emulate;
possible values are driver specific, with typical values being
"ide", "scsi", "virtio", "xen", "usb" or "sata". If omitted, the bus
- type is inferred from the style of the device name. eg, a device named
- 'sda' will typically be exported using a SCSI bus. The optional
+ type is inferred from the style of the device name (e.g. a device named
+ 'sda' will typically be exported using a SCSI bus). The optional
attribute tray
indicates the tray status of the
removable disks (i.e. CDROM or Floppy disk), the value can be either
"open" or "closed", defaults to "closed". NB, the value of
diff --git a/docs/hacking.html.in b/docs/hacking.html.in
index caec01a42d..78620fce67 100644
--- a/docs/hacking.html.in
+++ b/docs/hacking.html.in
@@ -241,7 +241,7 @@
The keywords if
, for
, while
,
and switch
must have a single space following them
- before the opening bracket. eg
+ before the opening bracket. e.g.
if(foo) // Bad @@ -250,7 +250,7 @@Function implementations must not have any whitespace - between the function name and the opening bracket. eg + between the function name and the opening bracket. e.g.
int foo (int wizz) // Bad @@ -259,7 +259,7 @@Function calls must not have any whitespace - between the function name and the opening bracket. eg + between the function name and the opening bracket. e.g.
bar = foo (wizz); // Bad @@ -269,7 +269,7 @@Function typedefs must not have any whitespace between the closing bracket of the function name and opening - bracket of the arg list. eg + bracket of the arg list. e.g.
typedef int (*foo) (int wizz); // Bad @@ -278,7 +278,7 @@There must not be any whitespace immediately following any - opening bracket, or immediately prior to any closing bracket + opening bracket, or immediately prior to any closing bracket. e.g.
int foo( int wizz ); // Bad diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ac4b2c2b6f..abf2b6bcd9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3769,7 +3769,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, /* People sometimes pass a bogus '' source path when they mean to omit the source element - completely. eg CDROM without media. This is + completely (e.g. CDROM without media). This is just a little compatibility check to help those broken apps */ if (source && STREQ(source, "")) diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index e8ee226c54..c4b162c749 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -1,7 +1,7 @@ /* * lock_driver.h: Defines the lock driver plugin API * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2011, 2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -186,8 +186,8 @@ typedef void (*virLockDriverFree)(virLockManagerPtr man); * * Assign a resource to a managed object. This will * only be called prior to the object is being locked - * when it is inactive. eg, to set the initial boot - * time disk assignments on a VM + * when it is inactive (e.g. to set the initial boot + * time disk assignments on a VM). * The format of @name varies according to * the resource @type. A VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK * will have the fully qualified file path, while a resource