Merge branch 'master' into gcc4

7 files changed, 18 insertions, 18 deletions

diff --git a/usr/src/man/man7d/bge.7d b/usr/src/man/man7d/bge.7d
index 055831aa51..d9be2c667f 100644
--- a/usr/src/man/man7d/bge.7d
+++ b/usr/src/man/man7d/bge.7d
@@ -181,11 +181,11 @@ selected by the first non-zero parameter in priority order as  listed below:
 .nf
     (highest priority/greatest throughput)
           en_1000fdx_cap        1000Mbps full duplex
-          en_1000hdx_cap        1000Mpbs half duplex
-          en_100fdx_cap         100Mpbs full duplex
-          en_100hdx_cap         100Mpbs half duplex
-          en_10fdx_cap          10Mpbs full duplex
-          en_10hdx_cap          10Mpbs half duplex
+          en_1000hdx_cap        1000Mbps half duplex
+          en_100fdx_cap         100Mbps full duplex
+          en_100hdx_cap         100Mbps half duplex
+          en_10fdx_cap          10Mbps full duplex
+          en_10hdx_cap          10Mbps half duplex
                            (lowest priority/least throughput)
 .fi
 .in -2
diff --git a/usr/src/man/man7d/eri.7d b/usr/src/man/man7d/eri.7d
index 7ac04e3112..58b5b9aa35 100644
--- a/usr/src/man/man7d/eri.7d
+++ b/usr/src/man/man7d/eri.7d
@@ -298,7 +298,7 @@ mode of the link and the common mode of operation with the link partner.
 For users who want to select the speed and mode of  the link, the \fBeri\fR
 device supports programmable \fBIPG\fR (Inter-Packet Gap) parameters \fBipg1\fR
 and  \fBipg2\fR. Sometimes, the user may want to alter these values depending
-on whether the driver supports 10 Mbps or 100 Mpbs and accordingly, \fBIPG\fR
+on whether the driver supports 10 Mbps or 100 Mbps and accordingly, \fBIPG\fR
 will be set to 9.6 or 0.96 microseconds.
 .SS "eri Parameter List"
 .sp
diff --git a/usr/src/man/man7d/hme.7d b/usr/src/man/man7d/hme.7d
index 94465348d6..79944244a2 100644
--- a/usr/src/man/man7d/hme.7d
+++ b/usr/src/man/man7d/hme.7d
@@ -337,7 +337,7 @@ Sometimes, the user may want to select the speed and mode of  the link. The
 parameters \fBipg1\fR and  \fBipg2\fR. By default, the driver sets \fBipg1\fR
 to 8  \fBbyte-times\fR and \fBipg2\fR to 4 \fBbyte-times\fR (which are the
 standard values). Sometimes, the user may want to alter these values depending
-on whether the driver supports 10 Mbps or 100 Mpbs and accordingly, \fBIPG\fR
+on whether the driver supports 10 Mbps or 100 Mbps and accordingly, \fBIPG\fR
 will be set to 9.6 or 0.96 microseconds.
 .SS "hme Parameter List"
 .sp
diff --git a/usr/src/man/man7d/igb.7d b/usr/src/man/man7d/igb.7d
index 9eaab07a06..81a0e0dfac 100644
--- a/usr/src/man/man7d/igb.7d
+++ b/usr/src/man/man7d/igb.7d
@@ -140,10 +140,10 @@ parameter in priority order as shown below:
 .nf
                         (highest priority/greatest throughput)
         adv_1000fdx_cap         1000Mbps full duplex
-        adv_100fdx_cap          100Mpbs full duplex
+        adv_100fdx_cap          100Mbps full duplex
         adv_100hdx_cap          100Mbps half duplex
-        adv_10fdx_cap           10Mpbs full duplex
-        adv_10hdx_cap           10Mpbs half duplex
+        adv_10fdx_cap           10Mbps full duplex
+        adv_10hdx_cap           10Mbps half duplex
                                 (lowest priority/least throughput)
 .fi
 .in -2
diff --git a/usr/src/man/man7d/nxge.7d b/usr/src/man/man7d/nxge.7d
index 10f2a26337..b940e85cae 100644
--- a/usr/src/man/man7d/nxge.7d
+++ b/usr/src/man/man7d/nxge.7d
@@ -147,8 +147,8 @@ shown below:
 .nf
                             (highest priority/greatest throughput)
         en_1000fdx_cap          1000Mbps full duplex
-        en_100fdx_cap           100Mpbs full duplex
-        en_10fdx_cap            10Mpbs full duplex
+        en_100fdx_cap           100Mbps full duplex
+        en_10fdx_cap            10Mbps full duplex
                          (lowest priority/least throughput)
 .fi
 .in -2
diff --git a/usr/src/man/man7d/pcn.7d b/usr/src/man/man7d/pcn.7d
index a09a1835b8..2ae5d00638 100644
--- a/usr/src/man/man7d/pcn.7d
+++ b/usr/src/man/man7d/pcn.7d
@@ -112,8 +112,8 @@ parameter in priority order as shown below:
 .in +2
 .nf
                             (highest priority/greatest throughput)
-        en_100fdx_cap           100Mpbs full duplex
-        en_10fdx_cap            10Mpbs full duplex
+        en_100fdx_cap           100Mbps full duplex
+        en_10fdx_cap            10Mbps full duplex
                          (lowest priority/least throughput)
 .fi
 .in -2
diff --git a/usr/src/man/man7d/vr.7d b/usr/src/man/man7d/vr.7d
index 94fa6228c9..b6f98c46a1 100644
--- a/usr/src/man/man7d/vr.7d
+++ b/usr/src/man/man7d/vr.7d
@@ -46,10 +46,10 @@ combination from the first non-zero parameter from this list:
 .sp
 .in +2
 .nf
-en_100fdx_cap     100Mpbs full duplex
-en_100hdx_cap     100Mpbs half duplex
-en_10fdx_cap      10Mpbs full duplex
-en_10hdx_cap      10Mpbs half duplex
+en_100fdx_cap     100Mbps full duplex
+en_100hdx_cap     100Mbps half duplex
+en_10fdx_cap      10Mbps full duplex
+en_10hdx_cap      10Mbps half duplex
 .fi
 .in -2
 .sp