both applied
Thanks Stephen!
Fri, Nov 15, 2013 at 11:31:26AM CET, swadeley(a)redhat.com wrote:
Dear Jiri
New patches as discussed.
I have changed teamd.conf.5 to include this line:
-List of port NICs to be used in team device.
+List of ports, network devices, to be used in a team device.
You can delete previous e-mail.
Regards
Stephen
On 11/14/2013 11:37 PM, Stephen Wadeley wrote:
>Dear Jiri
>
>Are these OK?
>
>Regards
>Stephen
>
>
--
Stephen Wadeley
Content Author | Red Hat, Inc.
Purkynova 99 | Brno, Czech Republic
From f5dab4e935ab754943d7cea9630f71b17b2e40d4 Mon Sep 17 00:00:00
2001
From: Stephen Wadeley <swadeley(a)redhat.com>
Date: Fri, 15 Nov 2013 11:25:11 +0100
Subject: [PATCH 2/2] Minor improvements to style and language
Signed-off-by: Stephen Wadeley <swadeley(a)redhat.com>
---
man/teamd.conf.5 | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/man/teamd.conf.5 b/man/teamd.conf.5
index 5420e87..643354e 100644
--- a/man/teamd.conf.5
+++ b/man/teamd.conf.5
@@ -33,7 +33,7 @@ Implements 802.3ad LACP protocol. Can use same Tx port selection
possibilities a
.RE
.TP
.BR "notify_peers.count " (int)
-Number of bursts of unsolicited NAs and gratuitous ARPs sent after port is
enabled/disabled.
+Number of bursts of unsolicited NAs and gratuitous ARP packets sent after port is enabled
or disabled.
.RS 7
.PP
Default:
@@ -45,7 +45,7 @@ Default for activebackup runner:
.RE
.TP
.BR "notify_peers.interval " (int)
-Value is positive number in milliseconds. Specifies an interval between notify peers
bursts.
+Value is positive number in milliseconds. Specifies an interval between bursts of
notify-peer packets.
.RS 7
.PP
Default:
@@ -53,7 +53,7 @@ Default:
.RE
.TP
.BR "mcast_rejoin.count " (int)
-Number of bursts of multicast group rejoins sent after port is enabled/disabled.
+Number of bursts of multicast group rejoin requests sent after port is enabled or
disabled.
.RS 7
.PP
Default:
@@ -65,7 +65,7 @@ Default for activebackup runner:
.RE
.TP
.BR "mcast_rejoin.interval " (int)
-Value is positive number in milliseconds. Specifies an interval between multicast group
rejoin bursts.
+Value is positive number in milliseconds. Specifies an interval between bursts of
multicast group rejoin requests.
.RS 7
.PP
Default:
@@ -73,7 +73,7 @@ Default:
.RE
.TP
.BR "link_watch.name "| " ports.PORTIFNAME.link_watch.name "
(string)
-Name of link watcher to be used. There are the following link watchers available:
+Name of link watcher to be used. The following link watchers are available:
.RS 7
.PP
.BR "ethtool "\(em
@@ -87,7 +87,7 @@ Similar to the previous, except that it uses IPv6 Neighbor Solicitation
/ Neighb
.PP
.TP
.BR "ports " (object)
-List of port NICs to be used in team device.
+List of ports, network devices, to be used in a team device.
.PP
See examples for more information.
.RE
@@ -109,7 +109,7 @@ This defines the policy of how hardware addresses of team device and
port device
All ports will always have the same hardware address as the associated team device.
.PP
.BR "by_active "\(em
-Team device adopts the hardware address of currently active port. This is useful in case
the port device is not able to change its hardware address.
+Team device adopts the hardware address of the currently active port. This is useful when
the port device is not able to change its hardware address.
.PP
.BR "only_active "\(em
Only the active port adopts the hardware address of the team device. The others have
their own.
@@ -231,7 +231,7 @@ Default:
.RE
.TP
.BR "runner.agg_select_policy " (string)
-This selects policy on how the aggregators will be selected. Following are available:
+This selects the policy of how the aggregators will be selected. The following are
available:
.RS 7
.PP
.BR "lacp_prio "\(em
@@ -239,7 +239,7 @@ Aggregator with highest priority according to LACP standard will be
selected. Ag
.BR "lacp_prio".
.PP
.BR "lacp_prio_stable "\(em
-Same as previous one, except do not replace selected aggregator if is still usable.
+Same as previous one, except do not replace selected aggregator if it is still usable.
.PP
.BR "bandwidth "\(em
Select aggregator with highest total bandwidth.
@@ -271,7 +271,7 @@ Default:
.SH ETHTOOL LINK WATCH SPECIFIC OPTIONS
.TP
.BR "link_watch.delay_up "| " ports.PORTIFNAME.link_watch.delay_up "
(int)
-Value is positive number in milliseconds. It is the delay between the link coming up and
the runner being notified about it.
+Value is a positive number in milliseconds. It is the delay between the link coming up
and the runner being notified about it.
.RS 7
.PP
Default:
@@ -279,7 +279,7 @@ Default:
.RE
.TP
.BR "link_watch.delay_down "| " ports.PORTIFNAME.link_watch.delay_down
" (int)
-Value is positive number in milliseconds. It is the delay between the link going down and
the runner being notified about it.
+Value is a positive number in milliseconds. It is the delay between the link going down
and the runner being notified about it.
.RS 7
.PP
Default:
@@ -289,10 +289,10 @@ Default:
.SH ARP PING LINK WATCH SPECIFIC OPTIONS
.TP
.BR "link_watch.interval "| " ports.PORTIFNAME.link_watch.interval "
(int)
-Value is positive number in milliseconds. It's the interval between ARP requests
being sent.
+Value is a positive number in milliseconds. It is the interval between ARP requests being
sent.
.TP
.BR "link_watch.init_wait "| " ports.PORTIFNAME.link_watch.init_wait
" (int)
-Value is positive number in milliseconds. It's the delay between link watch
initialization and first ARP request being sent.
+Value is a positive number in milliseconds. It is the delay between link watch
initialization and the first ARP request being sent.
.RS 7
.PP
Default:
@@ -333,10 +333,10 @@ Default:
.SH NS/NA PING LINK WATCH SPECIFIC OPTIONS
.TP
.BR "link_watch.interval "| " ports.PORTIFNAME.link_watch.interval "
(int)
-Value is positive number in milliseconds. It's the interval between sending NS
packets.
+Value is a positive number in milliseconds. It is the interval between sending NS
packets.
.TP
.BR "link_watch.init_wait "| " ports.PORTIFNAME.link_watch.init_wait
" (int)
-Value is positive number in milliseconds. It's the delay between link watch
initialization and first NS packet send.
+Value is a positive number in milliseconds. It is the delay between link watch
initialization and the first NS packet being sent.
.TP
.BR "link_watch.missed_max "| " ports.PORTIFNAME.link_watch.missed_max
" (int)
Maximum number of missed NA reply packets. If this number is exceeded, link is reported
as down.
@@ -372,7 +372,7 @@ Very basic configuration.
}
.fi
.PP
-This configuration uses active-backup runner with ethtool link watcher. Port eth2 has
higher priority. But sticky flag ensures that if eth1 becomes active, it stays active
while the link remains up.
+This configuration uses active-backup runner with ethtool link watcher. Port eth2 has
higher priority, but the sticky flag ensures that if eth1 becomes active, it stays active
while the link remains up.
.PP
.nf
{
--
1.8.1.4
From 5defec51fdc98937516e3a01f3e5d5bab1767054 Mon Sep 17 00:00:00
2001
From: Stephen Wadeley <swadeley(a)redhat.com>
Date: Thu, 14 Nov 2013 23:12:26 +0100
Subject: [PATCH 1/2] Minor improvements to style and language
Signed-off-by: Stephen Wadeley <swadeley(a)redhat.com>
---
man/teamdctl.8 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/man/teamdctl.8 b/man/teamdctl.8
index 0fd5a6b..ff1fdee 100644
--- a/man/teamdctl.8
+++ b/man/teamdctl.8
@@ -52,14 +52,14 @@ Prints out state of teamd parsed from JSON state document.
Finds state item in JSON state document and returns its value.
.TP
.BI "state item set " "state_item_path value"
-Finds state item in JSON state document and sets its value by value parameter. This is
available only for limited number of paths:
+Finds state item in JSON state document and sets its value by value parameter. This is
available only for a limited number of paths:
.RS 7
.PP
.BR "ports.PORTIFNAME.runner.aggregator.selected "\(em
-This is available for lacp runner. User can manually select aggragator.
+This is available for lacp runner. User can manually select the aggregator.
.PP
.BR "runner.active_port "\(em
-This is available for activebackup runner. User can manually select active port.
+This is available for activebackup runner. User can manually select the active port.
.RE
.TP
.BI "port add " portdev
--
1.8.1.4
_______________________________________________
libteam mailing list
libteam(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/libteam