Revision c8b96be4

b/man/gnt-backup.rst
121 121
    the node expects the instance to use)
122 122

  
123 123
mode
124
    specifies the connection mode for this nic: ``routed``,
124
    specifies the connection mode for this NIC: ``routed``,
125 125
    ``bridged`` or ``openvswitch``
126 126

  
127 127
link
......
131 131
    dependent on the network script in use, see **gnt-cluster**\(8) for
132 132
    more details)
133 133

  
134
Of these ``mode`` and ``link`` are nic parameters, and inherit their
134
Of these ``mode`` and ``link`` are NIC parameters, and inherit their
135 135
default at cluster level.
136 136

  
137 137
If no network is desired for the instance, you should create a single
b/man/gnt-instance.rst
91 91

  
92 92
The NICs of the instances can be specified via the ``--net``
93 93
option. By default, one NIC is created for the instance, with a
94
random MAC, and set up according the the cluster level nic
94
random MAC, and set up according the the cluster level NIC
95 95
parameters. Each NIC can take these parameters (all optional):
96 96

  
97 97
mac
......
103 103
    the node expects the instance to use)
104 104

  
105 105
mode
106
    specifies the connection mode for this nic: routed, bridged or
106
    specifies the connection mode for this NIC: routed, bridged or
107 107
    openvswitch.
108 108

  
109 109
link
......
123 123
    different ways.
124 124

  
125 125

  
126
Of these "mode" and "link" are nic parameters, and inherit their
126
Of these "mode" and "link" are NIC parameters, and inherit their
127 127
default at cluster level.  Alternatively, if no network is desired for
128 128
the instance, you can prevent the default of one NIC with the
129 129
``--no-nics`` option.
......
816 816
    key.
817 817

  
818 818
nics
819
    List of nics that will be created for the instance. Each entry
819
    List of NICs that will be created for the instance. Each entry
820 820
    should be a dict, with mac, ip, mode and link as possible keys.
821 821
    Please don't provide the "mac, ip, mode, link" parent keys if you
822
    use this method for specifying nics.
822
    use this method for specifying NICs.
823 823

  
824 824
primary\_node, secondary\_node
825 825
    The primary and optionally the secondary node to use for the
......
1005 1005
| {*instance*}
1006 1006

  
1007 1007
Modifies the memory size, number of vcpus, ip address, MAC address
1008
and/or nic parameters for an instance. It can also add and remove
1008
and/or NIC parameters for an instance. It can also add and remove
1009 1009
disks and NICs to/from the instance. Note that you need to give at
1010 1010
least one of the arguments, otherwise the command complains.
1011 1011

  
b/man/gnt-network.rst
15 15
-----------
16 16

  
17 17
The **gnt-network** command is used for network definition and
18
administration in the Ganeti system. Each instance nic can be connected
19
to a network via the ``network`` nic parameter. See **gnt-instance**\(8)
18
administration in the Ganeti system. Each instance NIC can be connected
19
to a network via the ``network`` NIC parameter. See **gnt-instance**\(8)
20 20
for more details.
21 21

  
22 22
COMMANDS
......
53 53
values can be used for EUI64 generation from a NIC's MAC address.
54 54

  
55 55
Note that a when connecting a network to a node group (see below) you
56
can specify also the nic mode and link that will be used by instances on
56
can specify also the NIC mode and link that will be used by instances on
57 57
that group to physically connect to this network. This allows the system
58 58
to work even if the parameters (eg. the VLAN number) change between
59 59
groups.
b/man/htools.rst
200 200
    - cpu count
201 201
    - disk size
202 202
    - disk count
203
    - nic count
203
    - NIC count
204 204
  - disk templates
205 205
  - vcpu ratio
206 206
  - spindle ratio

Also available in: Unified diff