[ovs-dev] [PATCH 3/4] doc-windows: Consolidate the name of physical adapters

[Alin Serdean]

At the beginning of the document we talk about the NIC 'Ethernet 1'
after 'Ethernet0', followed by 'Ethernet0 2'.

Although just names it seems better to have a single way of defining them:
'Ethernet(*)'

Signed-off-by: Alin Gabriel Serdean <aserdean at cloudbasesolutions.com>
---
 Documentation/intro/install/windows.rst | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst
index 341b975..ece207d 100644
--- a/Documentation/intro/install/windows.rst
+++ b/Documentation/intro/install/windows.rst
@@ -275,11 +275,11 @@ In the Virtual Switch Manager configuration you can enable the Open vSwitch
 Extension on an existing switch or create a new switch.
 
 The command to create a new switch named 'OVS-Extended-Switch' using a physical
-NIC named 'Ethernet 1' is:
+NIC named 'Ethernet0' is:
 
 .. code-block:: ps1con
 
-   PS > New-VMSwitch "OVS-Extended-Switch" -NetAdapterName "Ethernet 1" `
+   PS > New-VMSwitch "OVS-Extended-Switch" -NetAdapterName "Ethernet0" `
           -AllowManagementOS $false
 
 .. note::
@@ -556,8 +556,8 @@ found at technet_.
 
 .. _technet: https://technet.microsoft.com/en-us/library/jj553812%28v=wps.630%29.aspx
 
-For example, to set up a switch team combined from ``Ethernet0 2`` and
-``Ethernet1 2`` named ``external``:
+For example, to set up a switch team combined from ``Ethernet0`` and
+``Ethernet1`` named ``external``:
 
 .. code-block:: ps1con
 
@@ -566,16 +566,16 @@ For example, to set up a switch team combined from ``Ethernet0 2`` and
    ----                      --------------------
    br-int                    Hyper-V Virtual Ethernet Adapter #3
    br-pif                    Hyper-V Virtual Ethernet Adapter #2
-   Ethernet3 2               Intel(R) 82574L Gigabit Network Co...#3
-   Ethernet2 2               Intel(R) 82574L Gigabit Network Co...#4
-   Ethernet1 2               Intel(R) 82574L Gigabit Network Co...#2
-   Ethernet0 2               Intel(R) 82574L Gigabit Network Conn...
+   Ethernet3               Intel(R) 82574L Gigabit Network Co...#3
+   Ethernet2               Intel(R) 82574L Gigabit Network Co...#4
+   Ethernet1               Intel(R) 82574L Gigabit Network Co...#2
+   Ethernet0               Intel(R) 82574L Gigabit Network Conn...
 
-   PS > New-NetSwitchTeam -Name external -TeamMembers "Ethernet0 2","Ethernet1 2"
+   PS > New-NetSwitchTeam -Name external -TeamMembers "Ethernet0","Ethernet1"
 
    PS > Get-NetSwitchTeam
    Name    : external
-   Members : {Ethernet1 2, Ethernet0 2}
+   Members : {Ethernet1, Ethernet0}
 
 This will result in a new adapter bound to the host called ``external``:
 
@@ -587,10 +587,10 @@ This will result in a new adapter bound to the host called ``external``:
    br-test                   Hyper-V Virtual Ethernet Adapter #4
    br-pif                    Hyper-V Virtual Ethernet Adapter #2
    external                  Microsoft Network Adapter Multiplexo...
-   Ethernet3 2               Intel(R) 82574L Gigabit Network Co...#3
-   Ethernet2 2               Intel(R) 82574L Gigabit Network Co...#4
-   Ethernet1 2               Intel(R) 82574L Gigabit Network Co...#2
-   Ethernet0 2               Intel(R) 82574L Gigabit Network Conn...
+   Ethernet3               Intel(R) 82574L Gigabit Network Co...#3
+   Ethernet2               Intel(R) 82574L Gigabit Network Co...#4
+   Ethernet1               Intel(R) 82574L Gigabit Network Co...#2
+   Ethernet0               Intel(R) 82574L Gigabit Network Conn...
 
 Next we will set up the Hyper-V VMSwitch on the new adapter ``external``:
 
@@ -599,8 +599,8 @@ Next we will set up the Hyper-V VMSwitch on the new adapter ``external``:
    PS > New-VMSwitch -Name external -NetAdapterName external \
         -AllowManagementOS $false
 
-Under OVS the adapters under the team ``external``, ``Ethernet0 2`` and
-``Ethernet1 2``, can be added either under a bond device or separately.
+Under OVS the adapters under the team ``external``, ``Ethernet0`` and
+``Ethernet1``, can be added either under a bond device or separately.
 
 The following example shows how the bridges look with the NICs being
 separated:
@@ -613,11 +613,11 @@ separated:
            Port br-test
                Interface br-test
                    type: internal
-           Port "Ethernet1 2"
-               Interface "Ethernet1 2"
+           Port "Ethernet1"
+               Interface "Ethernet1"
        Bridge br-pif
-           Port "Ethernet0 2"
-               Interface "Ethernet0 2"
+           Port "Ethernet0"
+               Interface "Ethernet0"
            Port br-pif
                Interface br-pif
                    type: internal
-- 
2.10.2.windows.1