diff options
Diffstat (limited to 'docbook')
22 files changed, 95 insertions, 95 deletions
diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml index 9d1ee2ff8e..7ff948594d 100644 --- a/docbook/developer-guide.xml +++ b/docbook/developer-guide.xml @@ -28,7 +28,7 @@ DOCUMENT SECTION --> <!ENTITY DocumentTitle "<application>Ethereal</application> Developer's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Ethereal &EtherealCurrentVersion;"> + <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &EtherealCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "EDG"> <!ENTITY DocumentCopyrightHolder "Ulf Lamping"> diff --git a/docbook/edg_src/EDG_chapter_build_intro.xml b/docbook/edg_src/EDG_chapter_build_intro.xml index ecf075d459..f030b75b91 100644 --- a/docbook/edg_src/EDG_chapter_build_intro.xml +++ b/docbook/edg_src/EDG_chapter_build_intro.xml @@ -38,7 +38,7 @@ <section id="ChCodeStyle"> <title>Coding styleguides</title> <para> - The coding styleguides for Ethereal can be found in the "Code style" + The coding styleguides for Wireshark can be found in the "Code style" section of the file <filename>doc/README.developer</filename>. </para> </section> diff --git a/docbook/edg_src/EDG_chapter_env_intro.xml b/docbook/edg_src/EDG_chapter_env_intro.xml index b812ef2e37..91864e1255 100644 --- a/docbook/edg_src/EDG_chapter_env_intro.xml +++ b/docbook/edg_src/EDG_chapter_env_intro.xml @@ -16,7 +16,7 @@ <title>What is <application>Ethereal?</application></title> <para> Well, if you want to start Ethereal development, you might already - know what Ethereal is doing. If not, please have a look at the + know what Wireshark is doing. If not, please have a look at the <ulink url="&EtherealUsersGuidePage;">Ethereal User's Guide</ulink>, which will provide a lot of general information about it. </para> @@ -31,7 +31,7 @@ order to run. </para> <para> - As Ethereal is developed in a platform independant way and uses libraries + As Wireshark is developed in a platform independant way and uses libraries which are available for a lot of different platforms (such as the GTK+ GUI library), it's available on a such a wide variety of platforms. </para> @@ -104,7 +104,7 @@ </title> <para> Ethereal was initially developed by Gerald Combs. Ongoing development - and maintenance of Ethereal is handled by the Ethereal team, a loose + and maintenance of Wireshark is handled by the Ethereal team, a loose group of individuals who fix bugs and provide new functionality. </para> <para> @@ -131,13 +131,13 @@ <section><title>Programming language(s) used</title> <para> - Almost any part of Ethereal is implemented in plain ANSI C. + Almost any part of Wireshark is implemented in plain ANSI C. </para> <para> The typical task for a new Ethereal developer is to extend an existing, or write a new dissector for a specific network protocol. As (almost) any dissector is written in plain old ANSI C, a good knowledge about ANSI C - will be sufficient for Ethereal development in almost any case. + will be sufficient for Wireshark development in almost any case. </para> <para> So unless you are going to change the development process of Ethereal @@ -149,7 +149,7 @@ Beside the usual tools for developing a program in C (compiler, make, ...), the build process uses some additional helper tools (Perl, Python, Sed, ...), which are needed for the build process and in the case Ethereal - should be installed from the released source packages. If Ethereal is + should be installed from the released source packages. If Wireshark is installed from a binary package, none of these helper tools are needed on the target system. </para> @@ -158,7 +158,7 @@ <section><title>Open Source Software</title> <para> - Ethereal is an open source software project, and is released under + Wireshark is an open source software project, and is released under the <ulink url="&GPLWebsite;">GNU General Public Licence</ulink> (GPL). You can freely use Ethereal on any number of computers you like, without worrying about license keys or fees or such. In addition, all source @@ -195,7 +195,7 @@ The maintainers and developers of Ethereal will maintain your code as well, fixing it when API changes or other changes are made, and generally keeping it in tune with what is happening - with Ethereal. So if Ethereal is updated (which is done often), + with Ethereal. So if Wireshark is updated (which is done often), you can get a new Ethereal version from the website and your changes will already be included without any effort for you. </para> @@ -203,7 +203,7 @@ </itemizedlist> </para> <para> - The Ethereal source code and binary kits for some platforms are all + The Wireshark source code and binary kits for some platforms are all available on the download page of the Ethereal website: <ulink url="&EtherealDownloadPage;">&EtherealDownloadPage;</ulink>. </para> @@ -312,7 +312,7 @@ <section id="ChIntroWiki"><title>Wiki</title> <para> - The Ethereal Wiki at <ulink + The Wireshark Wiki at <ulink url="&EtherealWikiSite;">&EtherealWikiSite;</ulink> provides a wide range of information related to Ethereal and packet capturing in general. You will find a lot of information not part of this developer's guide. For @@ -373,7 +373,7 @@ <varlistentry><term><command>ethereal-dev</command></term> <listitem> <para> - This list is for Ethereal developers. People post questions about + This list is for Wireshark developers. People post questions about the development of Ethereal, others (hopefully) provide answers. If you want to start developing a protocol dissector, join this list. </para> @@ -382,7 +382,7 @@ <varlistentry><term><command>ethereal-bugs</command></term> <listitem> <para> - This list is for Ethereal developers. Everytime a change to the bug + This list is for Wireshark developers. Everytime a change to the bug database occurs, a mail to this mailing list is generated. If you want to be notified about all the changes to the bug database, join this list. Details about the bug database can be @@ -393,7 +393,7 @@ <varlistentry><term><command>ethereal-cvs</command></term> <listitem> <para> - This list is for Ethereal developers. Everytime a change to the SVN + This list is for Wireshark developers. Everytime a change to the SVN repository is checked in, a mail to this mailing list is generated. If you want to be notified about all the changes to the SVN repository, join this list. Details about the SVN repository can be diff --git a/docbook/edg_src/EDG_chapter_libraries.xml b/docbook/edg_src/EDG_chapter_libraries.xml index e1eb2d9ee2..460d90e92a 100644 --- a/docbook/edg_src/EDG_chapter_libraries.xml +++ b/docbook/edg_src/EDG_chapter_libraries.xml @@ -81,7 +81,7 @@ <title>Win32: cygwin gcc</title> <para> Cygwin provides most of the required libraries (with file extension .a/.lib) - for Ethereal suitable for cygwin's gcc compiler. + for Wireshark suitable for cygwin's gcc compiler. </para> </section> </section> diff --git a/docbook/edg_src/EDG_chapter_sources.xml b/docbook/edg_src/EDG_chapter_sources.xml index 7243756702..6fa741978a 100644 --- a/docbook/edg_src/EDG_chapter_sources.xml +++ b/docbook/edg_src/EDG_chapter_sources.xml @@ -30,10 +30,10 @@ </section> <section id="ChSrcSVNServer"> - <title>The Ethereal Subversion repository</title> + <title>The Wireshark Subversion repository</title> <para> Subversion is used to keep track of the changes made to the Ethereal - source code. The Ethereal source code is stored inside Ethereal project's + source code. The Wireshark source code is stored inside Ethereal project's Subversion repository located at a server at the ethereal.com domain. </para> <para> @@ -338,7 +338,7 @@ <para> So after obtaining the sources, tools and libraries, the first place to look at is <filename>doc/README.developer</filename>, - here you will get the latest infos for Ethereal development for all + here you will get the latest infos for Wireshark development for all supported platforms. </para> <tip><title>Tip!</title> @@ -502,7 +502,7 @@ make <listitem><para> The maintainers and developers of Ethereal will maintain your code as well, fixing it when API changes or other changes are made, and generally - keeping it in tune with what is happening with Ethereal. So if Ethereal is + keeping it in tune with what is happening with Ethereal. So if Wireshark is updated (which is done often), you can get a new Ethereal version from the website and your changes will already be included without any effort for you. The maintainers and developers of Ethereal will maintain your @@ -531,7 +531,7 @@ make </tip> </para> <para> - The Ethereal community is using patches to transfer source code changes + The Wireshark community is using patches to transfer source code changes between the authors. </para> <para> @@ -559,7 +559,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa sign indicates a deleted line compared to the original sources. </para> <para> - As we always use so called "unified" diff files in Ethereal development, + As we always use so called "unified" diff files in Wireshark development, three unchanged lines before and after the actual changed parts are included. This will make it much easier for a merge/patch tool to find the right place(s) to change in the existing sources. @@ -768,7 +768,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa <listitem><para> <command>Follow the Ethereal 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 Ethereal is + mean it'll compile on all of the other platforms for which Wireshark is built. Ethereal runs on many platforms, and can be compiled with a number of different compilers. See <xref linkend="ChCodeStyle"/> for details. diff --git a/docbook/edg_src/EDG_chapter_tools.xml b/docbook/edg_src/EDG_chapter_tools.xml index 8f9e15693d..1358ccdacb 100644 --- a/docbook/edg_src/EDG_chapter_tools.xml +++ b/docbook/edg_src/EDG_chapter_tools.xml @@ -7,7 +7,7 @@ <title>Introduction</title> <para> This chapter will provide you with information how to install - the various tools needed for Ethereal development. + the various tools needed for Wireshark development. </para> <para> None of the tools mentioned in this chapter is needed to run Ethereal, @@ -931,7 +931,7 @@ Built 18:08:02 Feb 4 2003 <title>sed</title> <para> Sed it the streaming editor. It makes it easy for example to replace - specially marked texts inside a source code file. The Ethereal build + specially marked texts inside a source code file. The Wireshark build process uses this to stamp version strings into various places. </para> @@ -1073,7 +1073,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.]]> <section id="ChToolsSubversion"> <title>Subversion (SVN) client (optional)</title> <para> - The Ethereal project uses it's own subversion (or short SVN) server to keep + 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 linkend="ChSrcSVNServer"/>. diff --git a/docbook/edg_src/EDG_chapter_userinterface.xml b/docbook/edg_src/EDG_chapter_userinterface.xml index 477b978e47..e526418df5 100644 --- a/docbook/edg_src/EDG_chapter_userinterface.xml +++ b/docbook/edg_src/EDG_chapter_userinterface.xml @@ -48,7 +48,7 @@ <section id="ChUIGTK"> <title>The GTK library</title> <para> - Ethereal is based on the GTK toolkit, see: <ulink url="http://www.gtk.org"/> + Wireshark is based on the GTK toolkit, see: <ulink url="http://www.gtk.org"/> for details. GTK is designed to hide the details of the underlying GUI in a platform independant way. As this is appreciated for a @@ -69,7 +69,7 @@ <para> There are other similar toolkits like Qt, wxwidgets, ..., which could also - be used for Ethereal. There's no "one and only" reason for or against + be used for Wireshark. There's no "one and only" reason for or against any of these toolkits. However, the decision towards GTK was made a long time ago :-) </para> @@ -203,7 +203,7 @@ gtk.h headers. </para> <para> - There are some common compatibility issues in Ethereal between the two + There are some common compatibility issues in Wireshark between the two versions. </para> <para> @@ -232,7 +232,7 @@ <para> First of all, have a look at: <ulink url="http://www.gtk.org"/> as this will be the first place to look at. If you want to develop GTK related - things for Ethereal, the most important place might + things for Wireshark, the most important place might be the GTK API documentation at: <ulink url="http://gtk.org/api/"/>. </para> <para> @@ -261,7 +261,7 @@ <section id="ChUIGUIDocs"> <title>GUI Reference documents</title> <para> - Although the GUI development of Ethereal is platform independant, the + Although the GUI development of Wireshark is platform independant, the Ethereal development team tries to follow the GNOME Human Interface Guidelines (HIG) where appropriate. This is the case, because both GNOME and Ethereal are based on the GTK+ diff --git a/docbook/edg_src/EDG_chapter_works.xml b/docbook/edg_src/EDG_chapter_works.xml index 48d78a8baa..b657ddc2f9 100644 --- a/docbook/edg_src/EDG_chapter_works.xml +++ b/docbook/edg_src/EDG_chapter_works.xml @@ -7,7 +7,7 @@ <section id="ChWorksIntro"> <title>Introduction</title> <para> - This chapter will give you a short overview, how Ethereal is working. + This chapter will give you a short overview, how Wireshark is working. </para> </section> @@ -137,7 +137,7 @@ <section id="ChWorksDissectPackets"> <title>Dissect packets</title> <para> - While Ethereal is loading packets from a file, each packet is dissected. + While Wireshark is loading packets from a file, each packet is dissected. Ethereal tries to detect what kind of packet it is and getting as much information from it as possible. In this run, only the information showed in the packet list pane is needed though. diff --git a/docbook/eug_src/EUG_app_files.xml b/docbook/eug_src/EUG_app_files.xml index 8658947dce..bf992c7dc7 100644 --- a/docbook/eug_src/EUG_app_files.xml +++ b/docbook/eug_src/EUG_app_files.xml @@ -235,7 +235,7 @@ udp </term> <listitem> <para> - When Ethereal is trying to translate Ethernet hardware + When Wireshark is trying to translate Ethernet hardware addresses to names, it consults the files listed in <xref linkend="AppFilesTabFolders"/>. If an address is not found in /etc/ethers, @@ -252,7 +252,7 @@ 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 - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -273,7 +273,7 @@ c0-00-ff-ff-ff-ff TR_broadcast </para> <para> The settings from this file are read in at program start and never - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -296,7 +296,7 @@ c0-00-ff-ff-ff-ff TR_broadcast </para> <para> The settings from this file are read in at program start and never - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -318,7 +318,7 @@ c0-a8-1c-00 CEO </para> <para> The settings from this file are read in at program start and never - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -347,7 +347,7 @@ c0-a8-1c-00 CEO <section id="ChWindowsFolder"><title>Windows folders</title> <para> - Here you will find some details about the folders used in Ethereal + Here you will find some details about the folders used in Wireshark on different Windows versions. </para> <para> @@ -371,7 +371,7 @@ c0-a8-1c-00 CEO </note> <para> The following will try to guide - you to the right place where to look for Ethereals profile data. + you to the right place where to look for Wiresharks profile data. </para> <para> <variablelist> @@ -427,7 +427,7 @@ c0-a8-1c-00 CEO you are currently working on, but on the domain server. </para> <para> - As Ethereal is using the correct places to store it's profile data, + As Wireshark is using the correct places to store it's profile data, your settings will travel with you, if you logon to a different computer the next time. </para> diff --git a/docbook/eug_src/EUG_app_messages.xml b/docbook/eug_src/EUG_app_messages.xml index 752014864b..a0631e7d2a 100644 --- a/docbook/eug_src/EUG_app_messages.xml +++ b/docbook/eug_src/EUG_app_messages.xml @@ -6,7 +6,7 @@ <para> Ethereal provides you with additional information generated out of the plain packet data or it may need to indicate dissection problems. - Messages generated by Ethereal are usually placed in [] parentheses. + Messages generated by Wireshark are usually placed in [] parentheses. </para> <section id="AppMessagesList"><title>Packet List Messages</title> <para> diff --git a/docbook/eug_src/EUG_app_tools.xml b/docbook/eug_src/EUG_app_tools.xml index 27e2dc729e..0338684781 100644 --- a/docbook/eug_src/EUG_app_tools.xml +++ b/docbook/eug_src/EUG_app_tools.xml @@ -65,7 +65,7 @@ tcpdump -i <interface> -s 1500 -w <some-file> <title><command>capinfos</command>: Print information about capture files </title> <para> - Included with Ethereal is a small utility called + Included with Wireshark is a small utility called <command>capinfos</command>, which is a command-line utility to print information about binary capture files. </para> @@ -98,7 +98,7 @@ Usage: capinfos [-t] [-c] [-s] [-d] [-u] [-a] [-e] [-y] <section id="AppToolseditcap"> <title><command>editcap</command>: Edit capture files</title> <para> - Included with Ethereal is a small utility called + Included with Wireshark 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 files, but it can also be used to convert diff --git a/docbook/eug_src/EUG_chapter_advanced.xml b/docbook/eug_src/EUG_chapter_advanced.xml index cd9bcbcddc..6a7a33b4e6 100644 --- a/docbook/eug_src/EUG_chapter_advanced.xml +++ b/docbook/eug_src/EUG_chapter_advanced.xml @@ -184,7 +184,7 @@ time stamp precision itself (whatever the benefit may be). </para> <para> - The common libpcap capture file format that is used by Ethereal (and a + The common libpcap capture file format that is used by Wireshark (and a lot of other tools) supports a fixed microsecond resolution "0.123456" only. </para> @@ -201,7 +201,7 @@ </section> <section><title>Accuracy</title> <para> - It's often asked: "Which time stamp accuracy is provided by Ethereal?". + It's often asked: "Which time stamp accuracy is provided by Wireshark?". Well, Ethereal doesn't create any time stamps itself but simply get's them from "somewhere else" and displays them. So accuracy will depend on the capture system (operating system, performance, ...) that you use. @@ -371,7 +371,7 @@ UN*X systems, and "Windows NT based" systems (Windows NT 4.0, Windows 2000, Windows XP, Windows Server 2003, Windows Vista) represent time internally as UTC. - When Ethereal is capturing, no conversion is necessary. + When Wireshark is capturing, no conversion is necessary. However, if the system time zone is not set correctly, the system's UTC time might not be correctly set even if the system clock appears to display correct local time. @@ -604,7 +604,7 @@ <para> <command>Name resolution will often fail.</command> The name to be resolved might simply be unknown by the name servers asked or the servers - are just not available and the name is also not found in Ethereal's + are just not available and the name is also not found in Wireshark's configuration files. </para> </listitem> @@ -630,12 +630,12 @@ </listitem> <listitem> <para> - <command>Resolved DNS names are cached by Ethereal.</command> + <command>Resolved DNS names are cached by Wireshark.</command> This is required for acceptable performance. However, if the name resolution information - should change while Ethereal is running, + should change while Wireshark is running, Ethereal won't notice a change to the name resolution information once - it's get cached. If this information changes while Ethereal is running, + it's get cached. If this information changes while Wireshark is running, e.g. a new DHCP lease takes effect, Ethereal won't notice it. XXX - is this true for all or only for DNS info? </para> diff --git a/docbook/eug_src/EUG_chapter_build_install.xml b/docbook/eug_src/EUG_chapter_build_install.xml index 91381c540d..8797483fc2 100644 --- a/docbook/eug_src/EUG_chapter_build_install.xml +++ b/docbook/eug_src/EUG_chapter_build_install.xml @@ -467,7 +467,7 @@ apt-get install ethereal <note><title>Note!</title> <para> <command>Since Ethereal Version 0.10.12, the WinPcap installer has become - part of the main Ethereal installer, so you don't need to download and + part of the main Wireshark installer, so you don't need to download and install two separate packages any longer!</command> </para> </note> @@ -542,11 +542,11 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P (both Ethereal GTK1 and 2 cannot be installed at the same time): <itemizedlist> <listitem><para> - <command>Etheral GTK1</command> - Ethereal is a GUI network protocol + <command>Etheral GTK1</command> - Wireshark is a GUI network protocol analyzer. </para></listitem> <listitem><para> - <command>Etheral GTK2</command> - Ethereal is a GUI network protocol + <command>Etheral GTK2</command> - Wireshark is a GUI network protocol analyzer (using the modern GTK2 GUI toolkit, recommended). </para></listitem> <listitem><para> @@ -558,7 +558,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P protocol analyzer. </para></listitem> </itemizedlist> - The dissection extensions for Ethereal and Tethereal: + The dissection extensions for Wireshark and Tethereal: <itemizedlist> <listitem><para> <command>Dissector Plugins</command> - Plugins with some extended dissections. @@ -686,13 +686,13 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P <title>Update Ethereal</title> <para> From time to time you may want to update your installed Ethereal to a more - recent version. If you join Ethereal's announce mailing list, you will be + recent version. If you join Wireshark's announce mailing list, you will be informed about new Ethereal versions, see <xref linkend="ChIntroMailingLists"/> for details how to subscribe to this list. </para> <para> New versions of Ethereal usually become available every 4-8 weeks. - Updating Ethereal is done the same way as installing it, you simply + Updating Wireshark is done the same way as installing it, you simply download and start the installer exe. A reboot is usually not required and all your personal settings remain unchanged. </para> @@ -723,7 +723,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P start the uninstallation procedure. </para> <para> - The Ethereal uninstaller will provide several options which things to be + The Wireshark uninstaller will provide several options which things to be uninstalled, the default is to remove the core components but keep the personal settings, WinPcap and alike. </para> diff --git a/docbook/eug_src/EUG_chapter_capture.xml b/docbook/eug_src/EUG_chapter_capture.xml index 6bea52335a..ed8a3c3e08 100644 --- a/docbook/eug_src/EUG_chapter_capture.xml +++ b/docbook/eug_src/EUG_chapter_capture.xml @@ -10,7 +10,7 @@ Capturing live network data is one of the major features of Ethereal. </para> <para> - The Ethereal capture engine provides the following features: + The Wireshark capture engine provides the following features: </para> <para> <itemizedlist> @@ -581,7 +581,7 @@ ethereal -i eth0 -k <para> While capturing, the underlying libpcap capturing engine will grab the packets from the network card and keep the packet data in a (relatively) - small kernel buffer. This data is read by Ethereal and saved into + small kernel buffer. This data is read by Wireshark and saved into the capture file(s) the user specified. </para> diff --git a/docbook/eug_src/EUG_chapter_customize.xml b/docbook/eug_src/EUG_chapter_customize.xml index e8c4df2fb5..5c9c9d23e3 100644 --- a/docbook/eug_src/EUG_chapter_customize.xml +++ b/docbook/eug_src/EUG_chapter_customize.xml @@ -83,7 +83,7 @@ ethereal [ -vh ] [ -DklLnpQS ] [ -a <capture autostop condition> ] ... <varlistentry><term><command>-a <capture autostop condition></command></term> <listitem> <para> - Specify a criterion that specifies when Ethereal is to stop writing + Specify a criterion that specifies when Wireshark is to stop writing to a capture file. The criterion is of the form test:value, where test is one of: <variablelist> @@ -194,7 +194,7 @@ interface name is a somewhat complex string. Note that "can capture" means that Ethereal was able to open that device to do a live capture; if, on your system, a program doing a network capture must be run from an account with special privileges (for -example, as root), then, if Ethereal is run with the <command>-D</command> flag and +example, as root), then, if Wireshark is run with the <command>-D</command> flag and is not run from such an account, it will not list any interfaces. </para> </listitem> @@ -281,7 +281,7 @@ standard libpcap format. <listitem> <para> This option sets the name of the font used for most text - displayed by Ethereal. XXX - add an example! + displayed by Wireshark. XXX - add an example! </para> </listitem> </varlistentry> @@ -349,7 +349,7 @@ standard libpcap format. the interface might be in promiscuous mode for some other reason; hence, -p cannot be used to ensure that the only traffic that is captured is traffic sent to or from the - machine on which Ethereal is running, broadcast traffic, and + machine on which Wireshark is running, broadcast traffic, and multicast traffic to addresses received by that machine. </para> </listitem> @@ -367,7 +367,7 @@ standard libpcap format. <varlistentry><term><command>-r <infile></command></term> <listitem> <para> - This option provides the name of a capture file for Ethereal + This option provides the name of a capture file for Wireshark to read and display. This capture file can be in one of the formats Ethereal understands. </para> @@ -491,7 +491,7 @@ standard libpcap format. <section id="ChCustColorizationSection"><title>Packet colorization</title> <para> - A very useful mechanism available in Ethereal is packet colorization. + A very useful mechanism available in Wireshark is packet colorization. You can set-up Ethereal so that it will colorize packets according to a filter. This allows you to emphasize the packets you are usually interested in. @@ -569,7 +569,7 @@ standard libpcap format. </note> <para> <xref linkend="ChCustColorFilterMany"/> shows an example of several color - filters being used in Ethereal. You may not like the color choices, + filters being used in Wireshark. You may not like the color choices, however, feel free to choose your own. </para> <figure id="ChCustColorFilterMany"> @@ -629,7 +629,7 @@ standard libpcap format. <para> You have to use the Save button to save your settings. The OK or Apply buttons will not save your changes permanently, so they will be lost - when Ethereal is closed. + when Wireshark is closed. </para> </warning> <para> diff --git a/docbook/eug_src/EUG_chapter_introduction.xml b/docbook/eug_src/EUG_chapter_introduction.xml index 68e7807ed9..1c91edd811 100644 --- a/docbook/eug_src/EUG_chapter_introduction.xml +++ b/docbook/eug_src/EUG_chapter_introduction.xml @@ -7,7 +7,7 @@ <section id="ChIntroWhatIs"> <title>What is <application>Ethereal?</application></title> <para> - Ethereal is a network packet analyzer. A network packet + Wireshark is a network packet analyzer. A network packet analyzer will try to capture network packets and tries to display that packet data as detailed as possible. </para> @@ -141,14 +141,14 @@ <title>Many protocol decoders</title> <para> There are protocol decoders (or dissectors, as they are - known in Ethereal) for a great many protocols: + known in Wireshark) for a great many protocols: see <xref linkend="AppProtocols"/>. </para> </section> <section><title>Open Source Software</title> <para> - Ethereal is an open source software project, and is released under + Wireshark is an open source software project, and is released under the <ulink url="&GPLWebsite;">GNU General Public Licence</ulink> (GPL). You can freely use Ethereal on any number of computers you like, without worrying about license keys or fees or such. In addition, all source @@ -158,7 +158,7 @@ </para> </section> - <section id="ChIntroNoFeatures"><title>What Ethereal is not</title> + <section id="ChIntroNoFeatures"><title>What Wireshark is not</title> <para> Here are some things Ethereal does not provide: <itemizedlist> @@ -341,7 +341,7 @@ </title> <para> Ethereal was initially developed by Gerald Combs. Ongoing development - and maintenance of Ethereal is handled by the Ethereal team, a loose + and maintenance of Wireshark is handled by the Ethereal team, a loose group of individuals who fix bugs and provide new functionality. </para> <para> @@ -353,7 +353,7 @@ Ethereal web site. </para> <para> - Ethereal is an open source software project, and is released under + Wireshark is an open source software project, and is released under 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 @@ -383,7 +383,7 @@ The maintainers and developers of Ethereal will maintain your code as well, fixing it when API changes or other changes are made, and generally keeping it in tune with what is happening - with Ethereal. So if Ethereal is updated (which is done often), + with Ethereal. So if Wireshark is updated (which is done often), you can get a new Ethereal version from the website and your changes will already be included without any effort for you. </para> @@ -391,7 +391,7 @@ </itemizedlist> </para> <para> - The Ethereal source code and binary kits for some platforms are all + The Wireshark source code and binary kits for some platforms are all available on the download page of the Ethereal website: <ulink url="&EtherealDownloadPage;">&EtherealDownloadPage;</ulink>. </para> @@ -414,7 +414,7 @@ <section id="ChIntroWiki"><title>Wiki</title> <para> - The Ethereal Wiki at <ulink + The Wireshark Wiki at <ulink url="&EtherealWikiPage;">&EtherealWikiPage;</ulink> provides a wide range of information related to Ethereal and packet capturing in general. You will find a lot of information not part of this user's guide. For @@ -475,7 +475,7 @@ <varlistentry><term><command>ethereal-dev</command></term> <listitem> <para> - This list is for Ethereal developers. If you want to start + This list is for Wireshark developers. If you want to start developing a protocol dissector, join this list. </para> </listitem> diff --git a/docbook/eug_src/EUG_chapter_troubleshoot.xml b/docbook/eug_src/EUG_chapter_troubleshoot.xml index b0afb9b251..ffeb050f4a 100644 --- a/docbook/eug_src/EUG_chapter_troubleshoot.xml +++ b/docbook/eug_src/EUG_chapter_troubleshoot.xml @@ -6,7 +6,7 @@ <section> <title>An approach to troubleshooting with Ethereal</title> <para> - Ethereal is a very useful tool for network troubleshooting, since it + Wireshark is a very useful tool for network troubleshooting, since it contains a number of features that allow you to quickly focus on problems in your networkfor several reasons: <itemizedlist> diff --git a/docbook/eug_src/EUG_chapter_use.xml b/docbook/eug_src/EUG_chapter_use.xml index 4daf701211..36838f46a5 100644 --- a/docbook/eug_src/EUG_chapter_use.xml +++ b/docbook/eug_src/EUG_chapter_use.xml @@ -132,7 +132,7 @@ <section id="ChUseMenuSection"><title>The Menu</title> <para> - The Ethereal menu sits on top of the Ethereal window. + The Wireshark menu sits on top of the Ethereal window. An example is shown in <xref linkend="ChUseEtherealMenu"/>. </para> <note><title>Note!</title> @@ -238,7 +238,7 @@ <section id="ChUseFileMenuSection"><title>The "File" menu</title> <para> - The Ethereal file menu contains the fields shown in + The Wireshark file menu contains the fields shown in <xref linkend="ChUseTabFile"/>. </para> <figure id="ChUseEtherealFileMenu"> @@ -465,7 +465,7 @@ <section id="ChUseEditMenuSection"><title>The "Edit" menu</title> <para> - The Ethereal Edit menu contains the fields shown in + The Wireshark Edit menu contains the fields shown in <xref linkend="ChUseTabEdit"/>. </para> <figure id="ChUseEtherealEditMenu"> @@ -583,7 +583,7 @@ <section id="ChUseViewMenuSection"><title>The "View" menu</title> <para> - The Ethereal View menu contains the fields shown in + The Wireshark View menu contains the fields shown in <xref linkend="ChUseTabView"/>. </para> <figure id="ChUseEtherealViewMenu"> @@ -912,7 +912,7 @@ <section id="ChUseGoMenuSection"><title>The "Go" menu</title> <para> - The Ethereal Go menu contains the fields shown in + The Wireshark Go menu contains the fields shown in <xref linkend="ChUseTabGo"/>. </para> <figure id="ChUseEtherealGoMenu"> @@ -992,7 +992,7 @@ <section id="ChUseCaptureMenuSection"><title>The "Capture" menu</title> <para> - The Ethereal Capture menu contains the fields shown in + The Wireshark Capture menu contains the fields shown in <xref linkend="ChUseTabCap"/>. </para> <figure id="ChUseEtherealCaptureMenu"> @@ -1073,7 +1073,7 @@ <section id="ChUseAnalyzeMenuSection"><title>The "Analyze" menu</title> <para> - The Ethereal Analyze menu contains the fields shown in + The Wireshark Analyze menu contains the fields shown in <xref linkend="ChUseAnalyze"/>. </para> <figure id="ChUseEtherealAnalyzeMenu"> @@ -1176,7 +1176,7 @@ <section id="ChUseStatisticsMenuSection"><title>The "Statistics" menu</title> <para> - The Ethereal Statistics menu contains the fields shown in + The Wireshark Statistics menu contains the fields shown in <xref linkend="ChUseStatistics"/>. </para> <figure id="ChUseEtherealStatisticsMenu"> @@ -1363,7 +1363,7 @@ <section id="ChUseHelpMenuSection"><title>The "Help" menu</title> <para> - The Ethereal Help menu contains the fields shown in + The Wireshark Help menu contains the fields shown in <xref linkend="ChUseHelp"/>. </para> <figure id="ChUseEtherealHelpMenu"> @@ -2016,7 +2016,7 @@ <graphic entityref="EtherealStatusbarEmpty" format="PNG"/> </figure> This statusbar is shown while no capture file is loaded, e.g. when - Ethereal is started. + Wireshark is started. </para> <para> <figure id="ChUseEtherealStatusbarLoaded"> diff --git a/docbook/eug_src/EUG_chapter_work.xml b/docbook/eug_src/EUG_chapter_work.xml index 1b9854abd4..76bde0dbdd 100644 --- a/docbook/eug_src/EUG_chapter_work.xml +++ b/docbook/eug_src/EUG_chapter_work.xml @@ -27,7 +27,7 @@ </figure> </para> <para> - You can also select and view packets the same way, while Ethereal is + You can also select and view packets the same way, while Wireshark is capturing, if you selected "Update list of packets in real time" in the Ethereal Capture Preferences dialog box. </para> @@ -753,7 +753,7 @@ ip.len le 0x436 <section> <title>Combining expressions</title> <para> - You can combine filter expressions in Ethereal using the + You can combine filter expressions in Wireshark using the logical operators shown in <xref linkend="FiltLogOps"/> </para> <table id="FiltLogOps"> diff --git a/docbook/eug_src/EUG_preface.xml b/docbook/eug_src/EUG_preface.xml index 222e7e86a7..2802bdf284 100644 --- a/docbook/eug_src/EUG_preface.xml +++ b/docbook/eug_src/EUG_preface.xml @@ -5,7 +5,7 @@ <section id="PreForeword"> <title>Foreword</title> <para> - Ethereal is one of those programs that many network managers would love + Wireshark is one of those programs that many network managers would love to be able to use, but they are often prevented from getting what they would like from Ethereal because of the lack of documentation. </para> diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index ea223a7dd1..e244584141 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -21,7 +21,7 @@ Ethereal Info <section id="WhatIs"><title>What is Ethereal?</title> <para> - Ethereal is the world's most popular network protocol analyzer. It + Wireshark is the world's most popular network protocol analyzer. It is used for troubleshooting, analysis, development, and education. </para> </section> @@ -47,7 +47,7 @@ Ethereal Info Under a grant funded by the U.S. Department of Homeland Security, <ulink url="http://www.coverity.com">Coverity</ulink> has uncovered - a number of vulnerabilities in Ethereal: + a number of vulnerabilities in Wireshark: <itemizedlist> <!-- CID 1 - 149: Fixed for 0.99.0 --> diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml index 75993ee564..d870c5835f 100644 --- a/docbook/user-guide.xml +++ b/docbook/user-guide.xml @@ -54,7 +54,7 @@ DOCUMENT SECTION --> <!ENTITY DocumentTitle "<application>Ethereal</application> User's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Ethereal &EtherealCurrentVersion;"> + <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &EtherealCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "EUG"> <!ENTITY DocumentCopyrightHolder1 "Ulf Lamping "> |