LGTM, thanks

On Sat, Feb 2, 2013 at 12:39 PM, Guido Trotter <[email protected]> wrote:

> For consistency, let's make sure NICs are capitalized always in the same
> way.
>
> Signed-off-by: Guido Trotter <[email protected]>
> ---
>  man/gnt-backup.rst   |    4 ++--
>  man/gnt-instance.rst |   12 ++++++------
>  man/gnt-network.rst  |    6 +++---
>  man/htools.rst       |    2 +-
>  4 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/man/gnt-backup.rst b/man/gnt-backup.rst
> index b5d5e6e..bb9851f 100644
> --- a/man/gnt-backup.rst
> +++ b/man/gnt-backup.rst
> @@ -121,7 +121,7 @@ ip
>      the node expects the instance to use)
>
>  mode
> -    specifies the connection mode for this nic: ``routed``,
> +    specifies the connection mode for this NIC: ``routed``,
>      ``bridged`` or ``openvswitch``
>
>  link
> @@ -131,7 +131,7 @@ link
>      dependent on the network script in use, see **gnt-cluster**\(8) for
>      more details)
>
> -Of these ``mode`` and ``link`` are nic parameters, and inherit their
> +Of these ``mode`` and ``link`` are NIC parameters, and inherit their
>  default at cluster level.
>
>  If no network is desired for the instance, you should create a single
> diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
> index 1ac094b..1cb945d 100644
> --- a/man/gnt-instance.rst
> +++ b/man/gnt-instance.rst
> @@ -91,7 +91,7 @@ command.
>
>  The NICs of the instances can be specified via the ``--net``
>  option. By default, one NIC is created for the instance, with a
> -random MAC, and set up according the the cluster level nic
> +random MAC, and set up according the the cluster level NIC
>  parameters. Each NIC can take these parameters (all optional):
>
>  mac
> @@ -103,7 +103,7 @@ ip
>      the node expects the instance to use)
>
>  mode
> -    specifies the connection mode for this nic: routed, bridged or
> +    specifies the connection mode for this NIC: routed, bridged or
>      openvswitch.
>
>  link
> @@ -123,7 +123,7 @@ network
>      different ways.
>
>
> -Of these "mode" and "link" are nic parameters, and inherit their
> +Of these "mode" and "link" are NIC parameters, and inherit their
>  default at cluster level.  Alternatively, if no network is desired for
>  the instance, you can prevent the default of one NIC with the
>  ``--no-nics`` option.
> @@ -816,10 +816,10 @@ mac, ip, mode, link
>      key.
>
>  nics
> -    List of nics that will be created for the instance. Each entry
> +    List of NICs that will be created for the instance. Each entry
>      should be a dict, with mac, ip, mode and link as possible keys.
>      Please don't provide the "mac, ip, mode, link" parent keys if you
> -    use this method for specifying nics.
> +    use this method for specifying NICs.
>
>  primary\_node, secondary\_node
>      The primary and optionally the secondary node to use for the
> @@ -1005,7 +1005,7 @@ MODIFY
>  | {*instance*}
>
>  Modifies the memory size, number of vcpus, ip address, MAC address
> -and/or nic parameters for an instance. It can also add and remove
> +and/or NIC parameters for an instance. It can also add and remove
>  disks and NICs to/from the instance. Note that you need to give at
>  least one of the arguments, otherwise the command complains.
>
> diff --git a/man/gnt-network.rst b/man/gnt-network.rst
> index 21ca20b..3e4a551 100644
> --- a/man/gnt-network.rst
> +++ b/man/gnt-network.rst
> @@ -15,8 +15,8 @@ DESCRIPTION
>  -----------
>
>  The **gnt-network** command is used for network definition and
> -administration in the Ganeti system. Each instance nic can be connected
> -to a network via the ``network`` nic parameter. See **gnt-instance**\(8)
> +administration in the Ganeti system. Each instance NIC can be connected
> +to a network via the ``network`` NIC parameter. See **gnt-instance**\(8)
>  for more details.
>
>  COMMANDS
> @@ -53,7 +53,7 @@ IPv6 semantics can be assigned to the network via the
> ``--network6`` and
>  values can be used for EUI64 generation from a NIC's MAC address.
>
>  Note that a when connecting a network to a node group (see below) you
> -can specify also the nic mode and link that will be used by instances on
> +can specify also the NIC mode and link that will be used by instances on
>  that group to physically connect to this network. This allows the system
>  to work even if the parameters (eg. the VLAN number) change between
>  groups.
> diff --git a/man/htools.rst b/man/htools.rst
> index fbfbc12..85e8f52 100644
> --- a/man/htools.rst
> +++ b/man/htools.rst
> @@ -200,7 +200,7 @@ support all options. Some common options are:
>      - cpu count
>      - disk size
>      - disk count
> -    - nic count
> +    - NIC count
>    - disk templates
>    - vcpu ratio
>    - spindle ratio
> --
> 1.7.10.4
>
>

Reply via email to