diff options
| -rw-r--r-- | docbook/ug-src/EUG_app_files.xml | 30 | ||||
| -rw-r--r-- | docbook/ug-src/EUG_app_tools.xml | 20 | ||||
| -rw-r--r-- | docbook/ug-src/EUG_chapter_advanced.xml | 16 | ||||
| -rw-r--r-- | docbook/ug-src/EUG_chapter_customize.xml | 16 | ||||
| -rw-r--r-- | docbook/ug-src/EUG_chapter_statistics.xml | 21 | ||||
| -rw-r--r-- | docbook/ug-src/EUG_preface.xml | 10 | ||||
| -rw-r--r-- | docbook/user-guide.xml | 2 |
7 files changed, 63 insertions, 52 deletions
diff --git a/docbook/ug-src/EUG_app_files.xml b/docbook/ug-src/EUG_app_files.xml index 7916fc7392..485b2d0942 100644 --- a/docbook/ug-src/EUG_app_files.xml +++ b/docbook/ug-src/EUG_app_files.xml @@ -215,21 +215,22 @@ udp <listitem>
<para>
When Ethereal is trying to translate Ethernet hardware
- addresses to names, it consults the files listed above in the
- order listed. If an address is not found in /etc/ethers,
- Etherereal looks in $HOME/.ethereal/etheres
+ addresses to names, it consults the files listed in
+ <xref linkend="AppFilesTabFolders"/>.
+ If an address is not found in /etc/ethers,
+ Ethereal looks in $HOME/.ethereal/ethers
</para>
<para>
Each line in these files consists of one hardware address and
name separated by whitespace. The digits of hardware
- addressses are spearated by colons (:), dashes (-) or
+ addressses are separated by colons (:), dashes (-) or
periods(.). The following are some examples:
<programlisting>
ff-ff-ff-ff-ff-ff Broadcast
c0-00-ff-ff-ff-ff TR_broadcast
00.2b.08.93.4b.a1 Freds_machine
</programlisting>
- The settings from this file are read in at program start and never be
+ The settings from this file are read in at program start and never
written by Ethereal.
</para>
</listitem>
@@ -238,13 +239,13 @@ c0-00-ff-ff-ff-ff TR_broadcast <term><command>manuf</command></term>
<listitem>
<para>
- Ethereal uses the file listed above to translate the first
- three bytes of an Ethernet address into a manufacturers
- name. This file has the same format as the ethers file,
- except addresses are three bytes long.
+ Ethereal uses the files listed in <xref linkend="AppFilesTabFolders"/>
+ to translate the first three bytes of an Ethernet address into a
+ manufacturers name. This file has the same format as the ethers
+ file, except addresses are three bytes long.
</para>
<para>
- The settings from this file are read in at program start and never be
+ The settings from this file are read in at program start and never
written by Ethereal.
</para>
</listitem>
@@ -253,8 +254,8 @@ c0-00-ff-ff-ff-ff TR_broadcast <term><command>ipxnets</command></term>
<listitem>
<para>
- Ethereal uses the above file to translate IPX network numbers
- into names.
+ Ethereal uses the files listed in <xref linkend="AppFilesTabFolders"/>
+ to translate IPX network numbers into names.
</para>
<para>
An example is:
@@ -266,7 +267,7 @@ c0-a8-1c-00 CEO </programlisting>
</para>
<para>
- The settings from this file are read in at program start and never be
+ The settings from this file are read in at program start and never
written by Ethereal.
</para>
</listitem>
@@ -275,7 +276,8 @@ c0-a8-1c-00 CEO <term><command>plugins</command></term>
<listitem>
<para>
- Ethereal searches for plugins in the directories listed above.
+ Ethereal searches for plugins in the directories listed in
+ <xref linkend="AppFilesTabFolders"/>.
They are searched in the order listed.
</para>
</listitem>
diff --git a/docbook/ug-src/EUG_app_tools.xml b/docbook/ug-src/EUG_app_tools.xml index eff1a5e393..694e362904 100644 --- a/docbook/ug-src/EUG_app_tools.xml +++ b/docbook/ug-src/EUG_app_tools.xml @@ -6,7 +6,7 @@ <title>Introduction</title>
<para>
Beside the Ethereal GUI application, there are some command line tools,
- which can be helpful for some more specialized things to do. These tools
+ which can be helpful for doing some more specialized things. These tools
will be described in this chapter.
</para>
</section>
@@ -64,7 +64,7 @@ tcpdump -i <interface> -s 1500 -w <some-file> Included with Ethereal is a small utility called
<command>editcap</command>, which is a command-line utility for
working with capture files. Its main function is to remove
- packets from capture file, but it can also be used to convert
+ packets from capture files, but it can also be used to convert
capture files from one format to another, as well as print
information about capture files.
</para>
@@ -711,7 +711,7 @@ where <input-filename> specifies input filename (use - for standard input) "C" code, that should compile okay as an ethereal dissector.
</para>
<para>
- <command>idl2eth</command>basically parses the data struct given to
+ <command>idl2eth</command> basically parses the data struct given to
it by the omniidl compiler, and using the GIOP API available in
packet-giop.[ch], generates get_CDR_xxx calls to decode the
CORBA traffic on the wire.
@@ -744,7 +744,7 @@ where <input-filename> specifies input filename (use - for standard input) <section>
<title>Why do this?</title>
<para>
- It is important to understand how CORBA traffic looks
+ It is important to understand what CORBA traffic looks
like over GIOP/IIOP, and to help build a tool that can assist
in troubleshooting CORBA interworking. This was especially the
case after seeing a lot of discussions about how particular
@@ -752,7 +752,7 @@ where <input-filename> specifies input filename (use - for standard input) </para>
<para>
I have also had comments/feedback that this tool would be good for say
- a CORBA class when teaching students how CORBA traffic looks like
+ a CORBA class when teaching students what CORBA traffic looks like
"on the wire".
</para>
<para>
@@ -772,21 +772,19 @@ where <input-filename> specifies input filename (use - for standard input) <listitem>
<para>
Python must be installed. See
- <ulink url="http://python.org/">http://python.org/</ulink>
+ <ulink url="http://python.org/"/>
</para>
</listitem>
<listitem>
<para>
- omniidl from the the omniORB package must be available.
- <ulink url="http://www.uk.research.att.com/omniORB/omniORB.html">
- http://www.uk.research.att.com/omniORB/omniORB.html
- </ulink>
+ omniidl from the the omniORB package must be available. See
+ <ulink url="http://omniorb.sourceforge.net/"/>
</para>
</listitem>
<listitem>
<para>
Of course you need ethereal installed to compile the
- code an tweak it if required. idl2eth is part of the
+ code and tweak it if required. idl2eth is part of the
standard Ethereal distribution
</para>
</listitem>
diff --git a/docbook/ug-src/EUG_chapter_advanced.xml b/docbook/ug-src/EUG_chapter_advanced.xml index 7c68d87cb9..47b4d571c4 100644 --- a/docbook/ug-src/EUG_chapter_advanced.xml +++ b/docbook/ug-src/EUG_chapter_advanced.xml @@ -11,16 +11,16 @@ <section id="ChAdvFollowTCPSection"><title>Following TCP streams</title>
<para>
There will be occasions when you would like to see the data from a TCP
- session in the order that the application layer would see it. Perhaps
+ session in the order that the application layer sees it. Perhaps
you are looking for passwords in a Telnet stream, or you are
trying to make sense of a data stream. If so, Ethereal's ability to
follow a TCP stream will be useful to you.
</para>
<para>
- Simply select a TCP packet on the stream/connection you are interested
+ Simply select a TCP packet in the stream/connection you are interested
in and then select the Follow TCP Stream menu item from the Ethereal
Tools menu. Ethereal will pop up a separate window with all the data
- from the TCP stream layed out in order, as shown in
+ from the TCP stream laid out in order, as shown in
<xref linkend="ChAdvFollowStream"/>.
</para>
<section><title>The "Follow TCP stream" dialog box </title>
@@ -64,7 +64,7 @@ </orderedlist>
</para>
<para>
- You can then select to view the data in one of four formats:
+ You can then choose to view the data in one of four formats:
<orderedlist>
<listitem>
<para>
@@ -97,7 +97,7 @@ <title>Note!</title>
<para>
It is worthwhile noting that Follow TCP Stream installs a filter
- to select all the packets on the TCP stream you have selected.
+ to select all the packets in the TCP stream you have selected.
</para>
</note>
</section>
@@ -212,7 +212,7 @@ <para>
Name resolution tries to resolve some of the address values to human
readable names. This conversion might fail, e.g. if the specific name is
- just unknown. Some of the resolvings are done with data from your local
+ just unknown. Some of the lookups are done with data from your local
machine, while others asking network services like DNS.
</para>
<para>
@@ -268,9 +268,9 @@ </section>
<section><title>ADNS</title>
<para>
- As noted, DNS resolvings can significantly slow down Ethereal and make it
+ As noted, DNS lookups can significantly slow down Ethereal and make it
appear frozen, which can be very annoying. To solve this, Ethereal can use
- the ADNS library, which handles DNS calls asynchronous.
+ the ADNS library, which handles DNS calls asynchronously.
</para>
</section>
</section>
diff --git a/docbook/ug-src/EUG_chapter_customize.xml b/docbook/ug-src/EUG_chapter_customize.xml index 0d752f7603..3e6a7ab5bf 100644 --- a/docbook/ug-src/EUG_chapter_customize.xml +++ b/docbook/ug-src/EUG_chapter_customize.xml @@ -444,7 +444,7 @@ ethereal [ -vh ] [ -klLnpQS ] [ -a <capture autostop condition> ] ... </para>
</note>
<para>
- If this is the first time you use Coloring Rules, click on the New
+ If this is the first time you have used Coloring Rules, click on the New
button which will bring up the Edit color filter dialog box as shown in
<xref linkend="ChCustEditColorDialog"/>.
</para>
@@ -553,17 +553,17 @@ ethereal [ -vh ] [ -klLnpQS ] [ -a <capture autostop condition> ] ... <orderedlist>
<listitem>
<para>
- <command>Enable All</command> Enables all protocols in the list.
+ <command>Enable All</command> Enable all protocols in the list.
</para>
</listitem>
<listitem>
<para>
- <command>Disable All</command> Disables all protocols in the list.
+ <command>Disable All</command> Disable all protocols in the list.
</para>
</listitem>
<listitem>
<para>
- <command>Invert</command> Toggles the state of all protocols in the
+ <command>Invert</command> Toggle the state of all protocols in the
list.
</para>
</listitem>
@@ -604,12 +604,12 @@ ethereal [ -vh ] [ -klLnpQS ] [ -a <capture autostop condition> ] ... <title>The "Decode As" dialog box</title>
<graphic scale="100" entityref="EtherealDecodeAs" format="PNG"/>
</figure>
- The content of this dialog box depends on the selected packet while it
+ The content of this dialog box depends on the selected packet when it
was opened.
<warning><title>Warning!</title>
<para>
The user specified decodes can not be saved. If you quit Ethereal,
- these settings will be gone.
+ these settings will be lost.
</para>
</warning>
<orderedlist>
@@ -717,7 +717,7 @@ ethereal [ -vh ] [ -klLnpQS ] [ -a <capture autostop condition> ] ... </listitem>
<listitem>
<para>
- The <command>Cancel</command> button will revert all preferences
+ The <command>Cancel</command> button will restore all preferences
settings to the last saved state.
</para>
</listitem>
@@ -754,7 +754,7 @@ ethereal [ -vh ] [ -klLnpQS ] [ -a <capture autostop condition> ] ... <note><title>Note!</title>
<para>
Unlike all other preference changes, you will have to save the
- preferences and restart Ethereal in order to take column changes to
+ preferences and restart Ethereal in order for column changes to
take effect!
</para>
</note>
diff --git a/docbook/ug-src/EUG_chapter_statistics.xml b/docbook/ug-src/EUG_chapter_statistics.xml index 99215b37da..7bf05f70c3 100644 --- a/docbook/ug-src/EUG_chapter_statistics.xml +++ b/docbook/ug-src/EUG_chapter_statistics.xml @@ -172,7 +172,7 @@ <tip><title>Tip!</title>
<para>
If you are looking for a feature other network tools call a <command>
- hostlist</command>, here is the right place to look at. The list of
+ hostlist</command>, here is the right place to look. The list of
Ethernet or IP endpoints is usually what you're looking for.
</para>
</tip>
@@ -234,7 +234,7 @@ </itemizedlist>
<note><title>Broadcast / multicast endpoints</title>
<para>
- Broadcast / multicast traffic will be separately accounted as additional
+ Broadcast / multicast traffic will be shown separately as additional
endpoints. Of course, as these endpoints are virtual endpoints, the real
traffic will be received by all (multicast: some) of the listed unicast
endpoints.
@@ -244,16 +244,17 @@ <section id="ChStatEndpointsWindow">
<title>The "Endpoints" window</title>
<para>
- This window will show statistics about the endpoints captured.
+ This window shows statistics about the endpoints captured.
</para>
<figure><title>The "Endpoints" window</title>
<graphic entityref="EtherealStatsEndpoints" format="PNG"/>
</figure>
<para>
For each supported protocol, a tab is shown in this window.
- The tab labels will show the number of endpoints captured (e.g. the
- tab label "Ethernet: 5" tells you that 5 ethernet endpoints are captured).
- If no endpoints of a specific protocol was captured, the tab label will be
+ The tab labels shows the number of endpoints captured (e.g. the
+ tab label "Ethernet: 5" tells you that five ethernet endpoints have been
+ captured). If no endpoints of a specific protocol were captured, the tab
+ label will be
grayed out (although the related page can still be selected).
</para>
<para>
@@ -264,8 +265,8 @@ and if it is active for the specific protocol layer (MAC layer for the
selected Ethernet endpoints page). As you might have noticed, the first
row has a name
- resolution of the first three bytes "Netgear", the second row's address were
- completely resolved to an IP address (using ARP) and the third is resolved
+ resolution of the first three bytes "Netgear", the second row's address was
+ resolved to an IP address (using ARP) and the third was resolved
to a broadcast (unresolved this would still be: ff:ff:ff:ff:ff:ff), the last two
Ethernet addresses remain unresolved.
</para>
@@ -280,7 +281,7 @@ <title>The protocol specific "Endpoint List" windows</title>
<para>
Before the combined window described above was available, each of its
- pages were shown as separate windows. Even as the combined window is
+ pages were shown as separate windows. Even though the combined window is
much more convenient to use, these separate windows are still
available. The main reason is, they might process faster for
very large capture files. However, as the functionality is exactly the
@@ -316,7 +317,7 @@ <title>The protocol specific "Conversation List" windows</title>
<para>
Before the combined window described above was available, each of its
- pages were shown as separate windows. Even as the combined window is
+ pages were shown as separate windows. Even though the combined window is
much more convenient to use, these separate windows are still
available. The main reason is, they might process faster for
very large capture files. However, as the functionality is exactly the
diff --git a/docbook/ug-src/EUG_preface.xml b/docbook/ug-src/EUG_preface.xml index 85ab480868..6bc1613f46 100644 --- a/docbook/ug-src/EUG_preface.xml +++ b/docbook/ug-src/EUG_preface.xml @@ -78,6 +78,16 @@ generating a backtrace.
</para>
</listitem>
+ <listitem>
+ <para>
+ Martin Regner, for his various suggestions and corrections.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Graeme Hewson, for a lot of grammatical corrections.
+ </para>
+ </listitem>
</itemizedlist>
</para>
<para>
diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml index b90c8572f8..eec8cc91a2 100644 --- a/docbook/user-guide.xml +++ b/docbook/user-guide.xml @@ -60,7 +60,7 @@ DOCUMENT SECTION <!ENTITY DocumentCopyrightYear "2004">
<!ENTITY DocumentEdition "Third ">
- <!ENTITY DocumentVersion "V1.93">
+ <!ENTITY DocumentVersion "V1.94">
<!ENTITY DocumentPubDate "2004">
<!ENTITY DocumentLegalNotice "<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts.</para><para>All logos and trademarks in this document are property of their respective owner.</para>">
|