aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
Diffstat (limited to 'docbook')
-rw-r--r--docbook/developer-guide.xml4
-rw-r--r--docbook/edg_src/EDG_chapter_env_intro.xml20
-rw-r--r--docbook/edg_src/EDG_chapter_sources.xml46
-rw-r--r--docbook/edg_src/EDG_chapter_tools.xml22
-rw-r--r--docbook/edg_src/EDG_chapter_userinterface.xml4
-rw-r--r--docbook/edg_src/EDG_chapter_works.xml2
-rw-r--r--docbook/edg_src/EDG_preface.xml4
-rw-r--r--docbook/eug_src/EUG_app_files.xml2
-rw-r--r--docbook/eug_src/EUG_app_tools.xml4
-rw-r--r--docbook/eug_src/EUG_chapter_advanced.xml4
-rw-r--r--docbook/eug_src/EUG_chapter_build_install.xml22
-rw-r--r--docbook/eug_src/EUG_chapter_capture.xml2
-rw-r--r--docbook/eug_src/EUG_chapter_introduction.xml14
-rw-r--r--docbook/eug_src/EUG_chapter_io.xml2
-rw-r--r--docbook/eug_src/EUG_chapter_use.xml20
-rw-r--r--docbook/eug_src/EUG_chapter_work.xml4
-rw-r--r--docbook/eug_src/EUG_preface.xml8
-rw-r--r--docbook/release-notes.xml2
18 files changed, 93 insertions, 93 deletions
diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml
index 7ff948594d..54c5f087ba 100644
--- a/docbook/developer-guide.xml
+++ b/docbook/developer-guide.xml
@@ -112,7 +112,7 @@ tasks.</command>
Part II. Ethereal Development
</para>
<para>
-The second part describes how the Ethereal sources are structured and how
+The second part describes how the Wireshark sources are structured and how
to change the sources (e.g. adding a new dissector).
</para>
</partintro>
@@ -138,7 +138,7 @@ to generate Ethereal, and how to do some typical development tasks.
<command>Part II. Ethereal Development</command>
</para>
<para>
-<command>The second part describes how the Ethereal sources are structured and how
+<command>The second part describes how the Wireshark sources are structured and how
to change the sources (e.g. adding a new dissector).</command>
</para>
</partintro>
diff --git a/docbook/edg_src/EDG_chapter_env_intro.xml b/docbook/edg_src/EDG_chapter_env_intro.xml
index 91864e1255..c10659559d 100644
--- a/docbook/edg_src/EDG_chapter_env_intro.xml
+++ b/docbook/edg_src/EDG_chapter_env_intro.xml
@@ -104,7 +104,7 @@
</title>
<para>
Ethereal was initially developed by Gerald Combs. Ongoing development
- and maintenance of Wireshark is handled by the Ethereal team, a loose
+ and maintenance of Wireshark is handled by the Wireshark team, a loose
group of individuals who fix bugs and provide new functionality.
</para>
<para>
@@ -112,7 +112,7 @@
protocol dissectors to Ethereal, and it is expected that this will
continue. You can find a list of the people who have contributed
code to Ethereal by checking the about dialog box of Ethereal, or have
- a look at the <ulink url="&EtherealAuthorsPage;"/> page on the Ethereal
+ a look at the <ulink url="&EtherealAuthorsPage;"/> page on the Wireshark
web site.
</para>
<para>
@@ -142,7 +142,7 @@
<para>
So unless you are going to change the development process of Ethereal
itself, you won't come in touch with any other programming language than
- ANSI C (such as perl or python, which are used only in the Ethereal build
+ ANSI C (such as perl or python, which are used only in the Wireshark build
process).
</para>
<para>
@@ -169,7 +169,7 @@
<para>
You are welcome to
modify Ethereal to suit your own needs, and it would be appreciated
- if you contribute your improvements back to the Ethereal team.
+ if you contribute your improvements back to the Wireshark team.
</para>
<para>
You gain three benefits by contributing your improvements back to the
@@ -204,7 +204,7 @@
</para>
<para>
The Wireshark source code and binary kits for some platforms are all
- available on the download page of the Ethereal website:
+ available on the download page of the Wireshark website:
<ulink url="&EtherealDownloadPage;">&EtherealDownloadPage;</ulink>.
</para>
@@ -283,7 +283,7 @@
<para>
You should use the released sources if you want to build Ethereal from
source on your platform for productive use. However, if you going to
- develop changes to the Ethereal sources, it might be better to use the
+ develop changes to the Wireshark sources, it might be better to use the
latest SVN sources. For details about the different ways to get the
Ethereal source code see <xref linkend="ChSrcObtain"/>.
</para>
@@ -305,7 +305,7 @@
<section id="ChIntroHomepage"><title>Website</title>
<para>
- You will find lot's of useful information on the Ethereal homepage at
+ You will find lot's of useful information on the Wireshark homepage at
<ulink url="&EtherealWebSite;">&EtherealWebSite;</ulink>.
</para>
</section>
@@ -402,10 +402,10 @@
</listitem>
</varlistentry>
</variablelist>
- You can subscribe to each of these lists from the Ethereal web site:
+ You can subscribe to each of these lists from the Wireshark web site:
<ulink url="&EtherealWebSite;">&EtherealWebSite;</ulink>. Simply
select the <command>mailing lists</command> link on the left hand
- side of the site. The lists are archived at the Ethereal web site
+ side of the site. The lists are archived at the Wireshark web site
as well.
<tip><title>Tip!</title>
<para>
@@ -557,7 +557,7 @@ $
<itemizedlist>
<listitem>
<para>
- have a look at the Ethereal source code
+ have a look at the Wireshark source code
</para>
</listitem>
<listitem>
diff --git a/docbook/edg_src/EDG_chapter_sources.xml b/docbook/edg_src/EDG_chapter_sources.xml
index 6fa741978a..27c1b89572 100644
--- a/docbook/edg_src/EDG_chapter_sources.xml
+++ b/docbook/edg_src/EDG_chapter_sources.xml
@@ -2,12 +2,12 @@
<!-- $Id$ -->
<chapter id="ChapterSources">
- <title>Work with the Ethereal sources</title>
+ <title>Work with the Wireshark sources</title>
<section id="ChSrcIntro">
<title>Introduction</title>
<para>
- This chapter will explain how to work with the Ethereal source code.
+ This chapter will explain how to work with the Wireshark source code.
It will show you how to:
<itemizedlist>
<listitem><para>
@@ -32,7 +32,7 @@
<section id="ChSrcSVNServer">
<title>The Wireshark Subversion repository</title>
<para>
- Subversion is used to keep track of the changes made to the Ethereal
+ Subversion is used to keep track of the changes made to the Wireshark
source code. The Wireshark source code is stored inside Ethereal project's
Subversion repository located at a server at the ethereal.com domain.
</para>
@@ -75,7 +75,7 @@
see which person changed a specific piece of code
</para></listitem>
<listitem><para>
- ... and a lot more things related to the history of the Ethereal source
+ ... and a lot more things related to the history of the Wireshark source
code development
</para></listitem>
</itemizedlist>
@@ -101,9 +101,9 @@
</para>
<tip><title>Tip!</title>
<para>
- As the Ethereal project has switched from CVS (Concurrent versioning
+ As the Wireshark project has switched from CVS (Concurrent versioning
system) to Subversion some time ago, you may still find old references to
- CVS in the Ethereal documentation and source files.
+ CVS in the Wireshark documentation and source files.
</para>
</tip>
</section>
@@ -111,7 +111,7 @@
<section id="ChSrcWebInterface">
<title>The web interface to the Subversion repository</title>
<para>
- If you need a quick look at the Ethereal source code,
+ If you need a quick look at the Wireshark source code,
you will only need a Web browser.
</para>
<para>
@@ -143,7 +143,7 @@
</section>
<section id="ChSrcObtain">
- <title>Obtain the Ethereal sources</title>
+ <title>Obtain the Wireshark sources</title>
<para>
There are several ways to obtain the sources from Ethereal's Subversion
server.
@@ -160,7 +160,7 @@
</tip>
<note><title>Note!</title>
<para>
- The following ways to retrieve the Ethereal sources are sorted in
+ The following ways to retrieve the Wireshark sources are sorted in
decreasing
actuality. If you plan to commit changes you've made to the sources,
it's a good idea to keep your private source tree as actual as possible.
@@ -273,9 +273,9 @@
</section>
<section id="ChSrcUpdating">
- <title>Update the Ethereal sources</title>
+ <title>Update the Wireshark sources</title>
<para>
- After you obtained the Ethereal sources for the first time, you
+ After you obtained the Wireshark sources for the first time, you
might want to keep them in sync with the sources at the Subversion
repository.
</para>
@@ -284,7 +284,7 @@
<title>... with Anonymous Subversion access</title>
<para>
After the first time checkout is done, updating your
- sources is simply done by typing (in the Ethereal source dir):
+ sources is simply done by typing (in the Wireshark source dir):
</para>
<para>
<prompt>$</prompt>
@@ -301,7 +301,7 @@
<section id="ChSrcZipUpdate">
<title>... from zip files</title>
<para>
- Independant of the way you retrieve the zip file of the Ethereal sources
+ Independant of the way you retrieve the zip file of the Wireshark sources
(as <xref linkend="ChSrcObtain"/> is providing several ways), the way to
bring the changes from the official sources into your personal source tree
is identical.
@@ -444,9 +444,9 @@ make
</section>
<section id="ChSrcChange">
- <title>Make changes to the Ethereal sources</title>
+ <title>Make changes to the Wireshark sources</title>
<para>
- As the Ethereal developers working on many different platforms, a lot of
+ As the Wireshark developers working on many different platforms, a lot of
editors are used to develop Ethereal (emacs, vi, Microsoft Visual Studio
and many many others). There's no "standard" or "default" development
environment.
@@ -460,7 +460,7 @@ make
<listitem><para>fix a bug</para></listitem>
<listitem><para>implement a new glorious feature :-)</para></listitem>
</itemizedlist>
- The internal structure of the Ethereal sources will be described in
+ The internal structure of the Wireshark sources will be described in
<xref linkend="PartDevelopment"/>.
</para>
<tip><title>Tip!</title>
@@ -481,8 +481,8 @@ make
<section id="ChSrcCommit">
<title>Commit changed sources</title>
<para>
- If you have finished changing the Ethereal sources to suit your needs,
- you might want to contribute your changes back to the Ethereal SVN
+ If you have finished changing the Wireshark sources to suit your needs,
+ you might want to contribute your changes back to the Wireshark SVN
repository.
</para>
<para>
@@ -766,7 +766,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa
</warning>
<itemizedlist>
<listitem><para>
- <command>Follow the Ethereal source code style guide.</command>
+ <command>Follow the Wireshark source code style guide.</command>
Just because something compiles on your platform, that doesn't
mean it'll compile on all of the other platforms for which Wireshark is
built.
@@ -814,7 +814,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa
harder to apply your patch.
</para>
<para>
- When someone from the Ethereal core maintainers finds the time to look
+ When someone from the Wireshark core maintainers finds the time to look
at your patch, it will be merged into the SVN repository, so
the latest SVN revisions and new releases will include it :-)
</para>
@@ -928,7 +928,7 @@ diff -c -r1.5 dlnames.c
</para>
<para>
For "cvs diff -c" or "cvs diff -u" diffs, there's a Python script
- "cvsdiff-fix.py" in the "tools" directory in the Ethereal source tree; it
+ "cvsdiff-fix.py" in the "tools" directory in the Wireshark source tree; it
will fix up those lines in "cvs diff" output. It reads its standard input
by default, or can be given a file name on the command line, and writes to
the standard output, so if you're typing at a command interpreter that
@@ -971,7 +971,7 @@ diff -c -r1.5 dlnames.c
<orderedlist>
<listitem>
<para>
- Add the Ethereal boilerplate to the new file(s).
+ Add the Wireshark boilerplate to the new file(s).
</para>
</listitem>
<listitem>
@@ -1052,7 +1052,7 @@ $Id$
The "Nullsoft Install System" is a free installer generator for win32
based systems, instructions how to install it can be found in <xref
linkend="ChToolsNSIS"/>.
- NSIS is script based, you will find the Ethereal installer
+ NSIS is script based, you will find the Wireshark installer
generation script at: <filename>packaging/nsis/ethereal.nsi</filename>.
</para>
<para>
diff --git a/docbook/edg_src/EDG_chapter_tools.xml b/docbook/edg_src/EDG_chapter_tools.xml
index 1358ccdacb..7b6f83b7f2 100644
--- a/docbook/edg_src/EDG_chapter_tools.xml
+++ b/docbook/edg_src/EDG_chapter_tools.xml
@@ -41,7 +41,7 @@
</para>
<para>
The following sections give a very brief description of
- what the particular tool is doing, how it is used in the Ethereal project
+ what the particular tool is doing, how it is used in the Wireshark project
and how it can be installed and tested.
</para>
<para>
@@ -193,7 +193,7 @@
<entry><xref linkend="ChToolsSubversion"/></entry>
<entry>-</entry>
<entry><ulink url="http://tortoisesvn.tigris.org/">TortoiseSVN</ulink></entry>
- <entry>Only needed if you access the Ethereal sources using
+ <entry>Only needed if you access the Wireshark sources using
the subversion repository (the recommended way).</entry>
</row>
<row>
@@ -338,7 +338,7 @@
<section>
<title>TortoiseSVN</title>
<para>
- If you want to work with the Ethereal subversion source repositories
+ If you want to work with the Wireshark subversion source repositories
(which is highly recommended, see <xref linkend="ChSrcObtain"/>),
it's recommended to use TortoiseSVN. You can download the setup from
<ulink url="http://tortoisesvn.tigris.org/"/> and simply install it.
@@ -353,7 +353,7 @@
</para>
<para>
You may check the MAKENSIS setting in the file
- <filename>config.nmake</filename> of the Ethereal sources.
+ <filename>config.nmake</filename> of the Wireshark sources.
</para>
</section>
</section>
@@ -361,14 +361,14 @@
<section id="ChToolsWin32Verify">
<title>Verify installed tools</title>
<para>
- After you've installed the Ethereal sources (see <xref
+ After you've installed the Wireshark sources (see <xref
linkend="ChSrcObtain"/>), you can check the correct installation of
all tools by using the verify_tools target of the
<filename>Makefile.nmake</filename> from the source package.
</para>
<warning><title>Warning!</title>
<para>
- You will need the Ethereal sources and some tools (nmake, bash) installed,
+ You will need the Wireshark sources and some tools (nmake, bash) installed,
before this verification is able to work.
</para>
</warning>
@@ -1075,14 +1075,14 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.]]>
<para>
The Wireshark project uses it's own subversion (or short SVN) server to keep
track of all the changes done to the source code. Details about the usage
- of subversion in the Ethereal project can be found in <xref
+ of subversion in the Wireshark project can be found in <xref
linkend="ChSrcSVNServer"/>.
</para>
<para>
If you want to work with the source code and planning to commit your
- changes back to the Ethereal community, it is recommended to use a SVN
+ changes back to the Wireshark community, it is recommended to use a SVN
client to get the latest source files. For detailed information about the
- different ways to obtain the Ethereal sources, see
+ different ways to obtain the Wireshark sources, see
<xref linkend="ChSrcObtain"/>.
</para>
<para>
@@ -1147,7 +1147,7 @@ This product includes software developed by CollabNet (http://www.Collab.Net/).
Diff is used to get a file of all differences between two source
files/trees (sometimes called a patch). The diff tool isn't needed for
building Ethereal, but it's needed if you are going to commit your changes
- back to the Ethereal community.
+ back to the Wireshark community.
</para>
<note><title>Note!</title>
<para>
@@ -1367,7 +1367,7 @@ written by Larry Wall and Paul Eggert]]>
<section id="ChToolsCVS">
<title>Obsolete: CVS client</title>
<para>
- Some time ago, the Ethereal project was using CVS to keep track of all
+ Some time ago, the Wireshark project was using CVS to keep track of all
the source code changes. As now subversion (SVN) is used, a CVS client
is no longer helpful, see <xref linkend="ChToolsSubversion"/> for details
about subversion clients.
diff --git a/docbook/edg_src/EDG_chapter_userinterface.xml b/docbook/edg_src/EDG_chapter_userinterface.xml
index e526418df5..d0b299e16f 100644
--- a/docbook/edg_src/EDG_chapter_userinterface.xml
+++ b/docbook/edg_src/EDG_chapter_userinterface.xml
@@ -28,7 +28,7 @@
</para></listitem>
</itemizedlist>
There are other Ethereal frontends existing, not developped nor
- maintained by the Ethereal development team:
+ maintained by the Wireshark development team:
<itemizedlist>
<listitem><para>
Packetyzer (Win32 native interface, written in Delphi and released
@@ -40,7 +40,7 @@
finished)
</para></listitem>
</itemizedlist>
- This chapter is focussed on the Ethereal frontend, and especially on
+ This chapter is focussed on the Wireshark frontend, and especially on
the GTK specific things.
</para>
</section>
diff --git a/docbook/edg_src/EDG_chapter_works.xml b/docbook/edg_src/EDG_chapter_works.xml
index b657ddc2f9..f3bc2cb586 100644
--- a/docbook/edg_src/EDG_chapter_works.xml
+++ b/docbook/edg_src/EDG_chapter_works.xml
@@ -92,7 +92,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><command>Win-/libpcap (not part of the Ethereal package)</command></term>
+ <term><command>Win-/libpcap (not part of the Wireshark package)</command></term>
<listitem>
<para>
The platform dependant packet capture library, including the capture
diff --git a/docbook/edg_src/EDG_preface.xml b/docbook/edg_src/EDG_preface.xml
index 1961b265e2..a614b548fc 100644
--- a/docbook/edg_src/EDG_preface.xml
+++ b/docbook/edg_src/EDG_preface.xml
@@ -20,7 +20,7 @@
needed to develop Ethereal.
</para>
<para>
- The second part of this book will describe how to change the Ethereal
+ The second part of this book will describe how to change the Wireshark
source code.
</para>
<para>
@@ -55,7 +55,7 @@
<itemizedlist>
<listitem>
<para>
- Gerald Combs, for initiating the Ethereal project.
+ Gerald Combs, for initiating the Wireshark project.
</para>
</listitem>
<listitem>
diff --git a/docbook/eug_src/EUG_app_files.xml b/docbook/eug_src/EUG_app_files.xml
index bf992c7dc7..19ec579e27 100644
--- a/docbook/eug_src/EUG_app_files.xml
+++ b/docbook/eug_src/EUG_app_files.xml
@@ -119,7 +119,7 @@
%APPDATA% points to the personal configuration folder, typically
<filename>C:\Documents and Settings\&lt;username&gt;\Application Data</filename>
(for further details, have a look at <xref linkend="ChWindowsProfiles"/>),
- %ETHEREAL% points to the Ethereal program folder, typically
+ %ETHEREAL% points to the Wireshark program folder, typically
<filename>C:\Program Files\Ethereal</filename>
</para>
</note>
diff --git a/docbook/eug_src/EUG_app_tools.xml b/docbook/eug_src/EUG_app_tools.xml
index 0338684781..4c9364dac4 100644
--- a/docbook/eug_src/EUG_app_tools.xml
+++ b/docbook/eug_src/EUG_app_tools.xml
@@ -8,7 +8,7 @@
<section id="AppToolsIntroduction">
<title>Introduction</title>
<para>
- Beside the Ethereal GUI application, there are some command line tools,
+ Beside the Wireshark GUI application, there are some command line tools,
which can be helpful for doing some more specialized things. These tools
will be described in this chapter.
</para>
@@ -42,7 +42,7 @@ tcpdump -i &lt;interface> -s 1500 -w &lt;some-file>
</para>
<note><title>Note!</title>
<para>
- tcpdump is not part of the Ethereal distribution. You can get it from:
+ tcpdump is not part of the Wireshark distribution. You can get it from:
<ulink url="http://www.tcpdump.org">http://www.tcpdump.org</ulink> for various
platforms.
</para>
diff --git a/docbook/eug_src/EUG_chapter_advanced.xml b/docbook/eug_src/EUG_chapter_advanced.xml
index 6a7a33b4e6..db04444142 100644
--- a/docbook/eug_src/EUG_chapter_advanced.xml
+++ b/docbook/eug_src/EUG_chapter_advanced.xml
@@ -25,7 +25,7 @@
<para>
Simply select a TCP packet in the packet list of the stream/connection
you are interested in and then select the Follow TCP Stream menu item
- from the Ethereal Tools menu (or use the context menu in the packet
+ from the Wireshark Tools menu (or use the context menu in the packet
list).
Ethereal will set an appropriate display filter and pop up a dialog
box with all the data from the TCP stream laid out in order,
@@ -883,7 +883,7 @@
</listitem>
<listitem>
<para>
- Turn off checksum validation of the specific protocol in the Ethereal
+ Turn off checksum validation of the specific protocol in the Wireshark
preferences.
</para>
</listitem>
diff --git a/docbook/eug_src/EUG_chapter_build_install.xml b/docbook/eug_src/EUG_chapter_build_install.xml
index 8797483fc2..2613270660 100644
--- a/docbook/eug_src/EUG_chapter_build_install.xml
+++ b/docbook/eug_src/EUG_chapter_build_install.xml
@@ -62,7 +62,7 @@
<section id="ChBuildInstallDistro">
<title>Obtaining the source and binary distributions</title>
<para>
- You can obtain both source and binary distributions from the Ethereal
+ You can obtain both source and binary distributions from the Wireshark
web site: <ulink url="&EtherealWebSite;">&EtherealWebSite;</ulink>.
Simply select the download link, and then select either the source
package or binary package of your choice from the mirror site closest
@@ -307,7 +307,7 @@ tar xvf ethereal-&EtherealCurrentVersion;-tar
<note>
<title>Note!</title>
<para>
- If you have downloaded the Ethereal tarball under Windows,
+ If you have downloaded the Wireshark tarball under Windows,
you may find that your browser has created a file with
underscores rather than periods in its file name.
</para>
@@ -316,7 +316,7 @@ tar xvf ethereal-&EtherealCurrentVersion;-tar
</listitem>
<listitem>
<para>
- Change directory to the Ethereal source directory.
+ Change directory to the Wireshark source directory.
</para>
</listitem>
<listitem>
@@ -365,15 +365,15 @@ make install
In general, installing the binary under your version of UNIX will be
specific to the installation methods used with your version of UNIX.
For example, under AIX, you would use <command>smit</command> to
- install the Ethereal binary package, while under Tru64 UNIX
+ install the Wireshark binary package, while under Tru64 UNIX
(formerly Digital UNIX) you would use <command>setld</command>.
</para>
<section>
<title>Installing from rpm's under RedHat and alike</title>
<para>
- Use the following command to install the Ethereal RPM that you have
- downloaded from the Ethereal web site:
+ Use the following command to install the Wireshark RPM that you have
+ downloaded from the Wireshark web site:
<programlisting>
rpm -ivh ethereal-0.10.5-0.2.2.i386.rpm
</programlisting>
@@ -460,7 +460,7 @@ apt-get install ethereal
<filename>ethereal-setup-x.y.z.exe</filename>.
</para>
<para>
- Simply download the Ethereal installer from:
+ Simply download the Wireshark installer from:
<ulink url="&EtherealBinariesPage;">&EtherealBinariesPage;</ulink>
and execute it.
</para>
@@ -474,7 +474,7 @@ apt-get install ethereal
<section id="ChBuildInstallEtherealCommandLine">
<title>Command line options</title>
<para>
- You can simply start the Ethereal installer without any command line
+ You can simply start the Wireshark installer without any command line
parameters, it will show you the usual interactive installer.
</para>
<para>
@@ -620,7 +620,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P
<title>Install WinPcap</title>
<note><title>Note!</title>
<para>
- <command>As mentioned above, the Ethereal installer
+ <command>As mentioned above, the Wireshark installer
(since version 0.10.12) takes care of the installation of WinPcap,
so usually you don't have to worry about WinPcap at all!</command>
</para>
@@ -630,7 +630,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P
capture files, but you will not be able to capture live network traffic.
</para>
<para>
- While running, the Ethereal installer detects which WinPcap version is
+ While running, the Wireshark installer detects which WinPcap version is
currently installed and will install WinPcap, if none or an older version is
detected.
</para>
@@ -651,7 +651,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P
<title>Manual WinPcap Installation</title>
<para>
The following is only necessary if you want to
- try a different version than the one included in the Ethereal installer,
+ try a different version than the one included in the Wireshark installer,
e.g. because a new WinPcap (beta) version was released.
</para>
<para>
diff --git a/docbook/eug_src/EUG_chapter_capture.xml b/docbook/eug_src/EUG_chapter_capture.xml
index ed8a3c3e08..9918b3e9fb 100644
--- a/docbook/eug_src/EUG_chapter_capture.xml
+++ b/docbook/eug_src/EUG_chapter_capture.xml
@@ -765,7 +765,7 @@ ethereal -i eth0 -k
</para>
</tip>
<para>
- You enter the capture filter into the Filter field of the Ethereal
+ You enter the capture filter into the Filter field of the Wireshark
Capture Options dialog box, as shown in
<xref linkend="ChCapCaptureOptionsDialog"/>. The following is an outline
of the syntax of the <command>tcpdump</command> capture filter language.
diff --git a/docbook/eug_src/EUG_chapter_introduction.xml b/docbook/eug_src/EUG_chapter_introduction.xml
index 1c91edd811..99f7e52957 100644
--- a/docbook/eug_src/EUG_chapter_introduction.xml
+++ b/docbook/eug_src/EUG_chapter_introduction.xml
@@ -263,7 +263,7 @@
<section id="ChIntroDownload">
<title>Where to get Ethereal?</title>
<para>
- You can get the latest copy of the program from the Ethereal website:
+ You can get the latest copy of the program from the Wireshark website:
<ulink url="&EtherealDownloadPage;">&EtherealDownloadPage;</ulink>. The
website allows you to choose from among several mirrors for
downloading.
@@ -341,7 +341,7 @@
</title>
<para>
Ethereal was initially developed by Gerald Combs. Ongoing development
- and maintenance of Wireshark is handled by the Ethereal team, a loose
+ and maintenance of Wireshark is handled by the Wireshark team, a loose
group of individuals who fix bugs and provide new functionality.
</para>
<para>
@@ -357,7 +357,7 @@
the <ulink url="&GPLWebsite;">GNU General Public Licence</ulink> (GPL).
All source code is freely available under the GPL. You are welcome to
modify Ethereal to suit your own needs, and it would be appreciated
- if you contribute your improvements back to the Ethereal team.
+ if you contribute your improvements back to the Wireshark team.
</para>
<para>
You gain three benefits by contributing your improvements back to the
@@ -392,7 +392,7 @@
</para>
<para>
The Wireshark source code and binary kits for some platforms are all
- available on the download page of the Ethereal website:
+ available on the download page of the Wireshark website:
<ulink url="&EtherealDownloadPage;">&EtherealDownloadPage;</ulink>.
</para>
</section>
@@ -407,7 +407,7 @@
<section id="ChIntroHomepage"><title>Website</title>
<para>
- You will find lot's of useful information on the Ethereal homepage at
+ You will find lot's of useful information on the Wireshark homepage at
<ulink url="&EtherealWebSite;">&EtherealWebSite;</ulink>.
</para>
</section>
@@ -481,10 +481,10 @@
</listitem>
</varlistentry>
</variablelist>
- You can subscribe to each of these lists from the Ethereal web site:
+ You can subscribe to each of these lists from the Wireshark web site:
<ulink url="&EtherealWebSite;">&EtherealWebSite;</ulink>. Simply
select the <command>mailing lists</command> link on the left hand
- side of the site. The lists are archived at the Ethereal web site
+ side of the site. The lists are archived at the Wireshark web site
as well.
<tip><title>Tip!</title>
<para>
diff --git a/docbook/eug_src/EUG_chapter_io.xml b/docbook/eug_src/EUG_chapter_io.xml
index 1555c0cdc2..cadbefc353 100644
--- a/docbook/eug_src/EUG_chapter_io.xml
+++ b/docbook/eug_src/EUG_chapter_io.xml
@@ -68,7 +68,7 @@
The "Open Capture File" dialog box allows you to search for a
capture file containing previously captured packets for display in
Ethereal. <xref linkend="ChIOOpenFileDialog"/> shows an example
- of the Ethereal Open File Dialog box.
+ of the Wireshark Open File Dialog box.
</para>
<note>
<title>Note</title>
diff --git a/docbook/eug_src/EUG_chapter_use.xml b/docbook/eug_src/EUG_chapter_use.xml
index 36838f46a5..9852ce4b50 100644
--- a/docbook/eug_src/EUG_chapter_use.xml
+++ b/docbook/eug_src/EUG_chapter_use.xml
@@ -11,7 +11,7 @@
<itemizedlist>
<listitem>
<para>
- How the Ethereal user interface works
+ How the Wireshark user interface works
</para>
</listitem>
<listitem>
@@ -132,7 +132,7 @@
<section id="ChUseMenuSection"><title>The Menu</title>
<para>
- The Wireshark menu sits on top of the Ethereal window.
+ The Wireshark menu sits on top of the Wireshark window.
An example is shown in <xref linkend="ChUseEtherealMenu"/>.
</para>
<note><title>Note!</title>
@@ -342,7 +342,7 @@
<entry></entry>
<entry><para>
This menu item allows you to show a list of files in a file set.
- It pops up the Ethereal List File Set dialog box (which is
+ It pops up the Wireshark List File Set dialog box (which is
discussed further in <xref linkend="ChIOFileSetSection"/>).
</para></entry>
</row>
@@ -375,7 +375,7 @@
<entry><para>
This menu item allows you to export all, or some, of the packets in
the capture file to a plain ASCII text file.
- It pops up the Ethereal Export dialog box (which is discussed further in
+ It pops up the Wireshark Export dialog box (which is discussed further in
<xref linkend="ChIOExportPlainDialog"/>).
</para></entry>
</row>
@@ -385,7 +385,7 @@
<entry><para>
This menu item allows you to export the (or some) of the packets in
the capture file to a PostScript file.
- It pops up the Ethereal Export dialog box (which is discussed further in
+ It pops up the Wireshark Export dialog box (which is discussed further in
<xref linkend="ChIOExportPSDialog"/>).
</para></entry>
</row>
@@ -395,7 +395,7 @@
<entry><para>
This menu item allows you to export the (or some) of the packet summaries in
the capture file to a .csv file (e.g. used by spreadsheet programs).
- It pops up the Ethereal Export dialog box (which is discussed further in
+ It pops up the Wireshark Export dialog box (which is discussed further in
<xref linkend="ChIOExportCSVDialog"/>).
</para></entry>
</row>
@@ -405,7 +405,7 @@
<entry><para>
This menu item allows you to export the (or some) of the packets in
the capture file to a PSML (packet summary markup language) XML file.
- It pops up the Ethereal Export dialog box (which is discussed further in
+ It pops up the Wireshark Export dialog box (which is discussed further in
<xref linkend="ChIOExportPSMLDialog"/>).
</para></entry>
</row>
@@ -415,7 +415,7 @@
<entry><para>
This menu item allows you to export the (or some) of the packets in
the capture file to a PDML (packet details markup language) XML file.
- It pops up the Ethereal Export dialog box (which is discussed further in
+ It pops up the Wireshark Export dialog box (which is discussed further in
<xref linkend="ChIOExportPDMLDialog"/>).
</para></entry>
</row>
@@ -439,7 +439,7 @@
<entry>Ctrl+P</entry>
<entry><para>
This menu item allows you to print all (or some of) the packets in
- the capture file. It pops up the Ethereal Print dialog
+ the capture file. It pops up the Wireshark Print dialog
box (which is discussed further in
<xref linkend="ChIOPrintSection"/>).
</para></entry>
@@ -1586,7 +1586,7 @@
<entry>File/Print...</entry>
<entry><para>
This item allows you to print all (or some of) the packets in
- the capture file. It pops up the Ethereal Print dialog
+ the capture file. It pops up the Wireshark Print dialog
box (which is discussed further in
<xref linkend="ChIOPrintSection"/>).
</para></entry>
diff --git a/docbook/eug_src/EUG_chapter_work.xml b/docbook/eug_src/EUG_chapter_work.xml
index 76bde0dbdd..9d083939a3 100644
--- a/docbook/eug_src/EUG_chapter_work.xml
+++ b/docbook/eug_src/EUG_chapter_work.xml
@@ -506,7 +506,7 @@
<para>
To select packets based on protocol type, simply type the protocol you
are interested in in the <command>Filter:</command> field in the filter
- toolbar of the Ethereal window and press enter to initiate
+ toolbar of the Wireshark window and press enter to initiate
the filter. <xref linkend="ChWorkTCPFilter"/> shows an example of what
happens when you type <command>tcp</command> in the filter field.
</para>
@@ -537,7 +537,7 @@
You can filter on any protocol that Ethereal understands.
You can also filter on any field that a dissector adds to the tree
view, but only if the dissector has added an abbreviation for the
- field. A list of such fields is available in the Ethereal in the
+ field. A list of such fields is available in the Wireshark in the
<command>Add Expression...</command> dialog box. You can find more
information on the <command>Add Expression...</command> dialog box
in <xref linkend="ChWorkFilterAddExpressionSection"/>.
diff --git a/docbook/eug_src/EUG_preface.xml b/docbook/eug_src/EUG_preface.xml
index 2802bdf284..665fc98423 100644
--- a/docbook/eug_src/EUG_preface.xml
+++ b/docbook/eug_src/EUG_preface.xml
@@ -10,7 +10,7 @@
would like from Ethereal because of the lack of documentation.
</para>
<para>
- This document is part of an effort by the Ethereal team to improve the
+ This document is part of an effort by the Wireshark team to improve the
usability of Ethereal.
</para>
<para>
@@ -32,7 +32,7 @@
<para>
This book is not intended to explain network sniffing in general and it will
not provide details about specific network protocols. A lot of useful
- information regarding these topics can be found at the Ethereal Wiki at
+ information regarding these topics can be found at the Wireshark Wiki at
<ulink url="&EtherealWikiPage;">&EtherealWikiPage;</ulink>
</para>
<para>
@@ -53,7 +53,7 @@
<itemizedlist>
<listitem>
<para>
- Gerald Combs, for initiating the Ethereal project and funding to
+ Gerald Combs, for initiating the Wireshark project and funding to
do this documentation.
</para>
</listitem>
@@ -124,7 +124,7 @@
<para>
This book was originally developed by
<ulink url="mailto:&AuthorEmail;">Richard Sharpe</ulink> with
- funds provided from the Ethereal Fund. It was updated by
+ funds provided from the Wireshark Fund. It was updated by
<ulink url="mailto:&AuthorEmail2;">Ed Warnicke</ulink> and more recently
redesigned and updated by <ulink url="mailto:&AuthorEmail3;">Ulf
Lamping</ulink>.
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index e244584141..6dfdd794e1 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -131,7 +131,7 @@ Ethereal Info
Most Linux and Unix vendors supply their own Ethereal packages.
You can install or upgrade Ethereal using the package management
system specific to that platform. A list of third-party packages
- can be found on the <ulink url="http://www.ethereal.com/download.html#otherplat">download page</ulink> on the Ethereal web site.
+ can be found on the <ulink url="http://www.ethereal.com/download.html#otherplat">download page</ulink> on the Wireshark web site.
</para>
</section>