From: Ben Hutchings <bhutchings@solarflare.com>
To: netdev@vger.kernel.org
Cc: linux-net-drivers@solarflare.com
Subject: [PATCH ethtool 7/7] ethtool.8: Fix capitalisation
Date: Wed, 12 Jan 2011 16:23:21 +0000 [thread overview]
Message-ID: <1294849401.3946.7.camel@bwh-desktop> (raw)
In-Reply-To: <1294849266.3946.0.camel@bwh-desktop>
Write 'Ethernet' and 'PHY' thus.
Use the proper macro for the trademark symbol.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
diff --git a/ethtool.8.in b/ethtool.8.in
index 203d33d..0ee91a0 100644
--- a/ethtool.8.in
+++ b/ethtool.8.in
@@ -337,10 +337,10 @@ settings of the specified device.
Shows a short help message.
.TP
.B \-a \-\-show\-pause
-Queries the specified ethernet device for pause parameter information.
+Queries the specified Ethernet device for pause parameter information.
.TP
.B \-A \-\-pause
-Changes the pause parameters of the specified ethernet device.
+Changes the pause parameters of the specified Ethernet device.
.TP
.A2 autoneg on off
Specifies whether pause autonegotiation should be enabled.
@@ -456,7 +456,7 @@ Length of time to perform phys-id, in seconds.
Queries the specified network device for permanent hardware address.
.TP
.B \-r \-\-negotiate
-Restarts auto-negotiation on the specified ethernet device, if
+Restarts auto-negotiation on the specified Ethernet device, if
auto-negotiation is enabled.
.TP
.B \-S \-\-statistics
@@ -535,7 +535,7 @@ this option is a string of characters specifying which options to enable.
.PD 0
.TP 3
.B p
-Wake on phy activity
+Wake on PHY activity
.TP 3
.B u
Wake on unicast messages
@@ -550,10 +550,10 @@ Wake on broadcast messages
Wake on ARP
.TP 3
.B g
-Wake on MagicPacket(tm)
+Wake on MagicPacket\[tm]
.TP 3
.B s
-Enable SecureOn(tm) password for MagicPacket(tm)
+Enable SecureOn\[tm] password for MagicPacket\[tm]
.TP 3
.B d
Disable (wake on nothing). This option clears all previous options.
@@ -561,8 +561,8 @@ Disable (wake on nothing). This option clears all previous options.
.RE
.TP
.B sopass \*(MA\c
-Sets the SecureOn(tm) password. The argument to this option must be 6
-bytes in ethernet MAC hex format (\*(MA).
+Sets the SecureOn\[tm] password. The argument to this option must be 6
+bytes in Ethernet MAC hex format (\*(MA).
.PP
.BI msglvl \ N
.br
--
1.7.3.4
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
prev parent reply other threads:[~2011-01-12 16:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-12 16:21 [PATCH ethtool 0/7] Documentation fixes Ben Hutchings
2011-01-12 16:22 ` [PATCH ethtool 1/7] ethtool: Fix spelling and spacing in online help Ben Hutchings
2011-01-12 16:22 ` [PATCH ethtool 2/7] ethtool.8: Update date, version, web site reference Ben Hutchings
2011-01-12 16:22 ` [PATCH ethtool 3/7] ethtool.8: Substitute version at configure time Ben Hutchings
2011-01-12 16:22 ` [PATCH ethtool 4/7] ethtool.8: Fix obvious spelling errors Ben Hutchings
2011-01-12 16:23 ` [PATCH ethtool 5/7] ethtool.8: Generalise references to network devices, not Ethernet Ben Hutchings
2011-01-12 16:23 ` [PATCH ethtool 6/7] ethtool.8: Reword synopses for consistency and style Ben Hutchings
2011-01-12 16:23 ` Ben Hutchings [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294849401.3946.7.camel@bwh-desktop \
--to=bhutchings@solarflare.com \
--cc=linux-net-drivers@solarflare.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.