Further cleanup of Wireshark User Guide

svn path=/trunk/; revision=18290

9 files changed, 86 insertions, 103 deletions

diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index 9fdbb77a4a..b33b9ba0cb 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -60,11 +60,11 @@ DOCUMENT SECTION
   <!ENTITY DocumentCopyrightHolder1 "Ulf Lamping ">
   <!ENTITY DocumentCopyrightHolder2 "Richard Sharpe ">
   <!ENTITY DocumentCopyrightHolder3 "Ed Warnicke ">
-  <!ENTITY DocumentCopyrightYear "2004-2005">
+  <!ENTITY DocumentCopyrightYear "2004-2006">
 
   <!ENTITY DocumentEdition "Third ">
-  <!ENTITY DocumentVersion "V2.0.2">
-  <!ENTITY DocumentPubDate "2005">
+  <!ENTITY DocumentVersion "V3.0.2">
+  <!ENTITY DocumentPubDate "2006">
 
   <!ENTITY % SvnVersionFile SYSTEM "svn_version.xml">
   %SvnVersionFile;
@@ -73,7 +73,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "0.10.14">
+  <!ENTITY WiresharkCurrentVersion "0.99.0">
   <!ENTITY WiresharkWebSite "http://www.wireshark.org">
   <!ENTITY WiresharkUsersGuidePage "&WiresharkWebSite;/docs/#usersguide">
   <!ENTITY WiresharkDownloadPage "&WiresharkWebSite;/download.html">
@@ -98,12 +98,13 @@ Wireshark Info
 Winpcap Info
 -->
   <!ENTITY WinPcapWebsite "http://www.winpcap.org">
-  <!ENTITY WinPcapDownloadWebsite "http://www.winpcap.org/install/default.htm">
+  <!ENTITY WinPcapDownloadWebsite "&WinPcapWebsite;/install/default.htm">
 
 <!--
 Tcpdump Info
 -->
-  <!ENTITY TcpdumpManpage "http://www.tcpdump.org/tcpdump_man.html">
+  <!ENTITY TcpdumpWebsite "http://www.tcpdump.org">
+  <!ENTITY TcpdumpManpage "&TcpdumpWebsite;/tcpdump_man.html">
 
 <!--
 Gnu info
@@ -116,9 +117,10 @@ Timezone info
   <!ENTITY TimezoneGMTSite "http://wwp.greenwichmeantime.com/">
   <!ENTITY TimezoneWorldClockSite "http://www.timeanddate.com/worldclock/">
   <!ENTITY NTPSite "http://www.ntp.org/">
-  <!ENTITY WikipediaTimezone "http://en.wikipedia.org/wiki/Time_zone">
-  <!ENTITY WikipediaDaylightSaving "http://en.wikipedia.org/wiki/Daylight_saving">
-  <!ENTITY WikipediaUTC "http://en.wikipedia.org/wiki/Coordinated_Universal_Time">
+  <!ENTITY WikipediaWebsite "http://en.wikipedia.org">
+  <!ENTITY WikipediaTimezone "&WikipediaWebsite;/wiki/Time_zone">
+  <!ENTITY WikipediaDaylightSaving "&WikipediaWebsite;/wiki/Daylight_saving">
+  <!ENTITY WikipediaUTC "&WikipediaWebsite;/wiki/Coordinated_Universal_Time">
 
 <!--
 FILE SECTION
diff --git a/docbook/wsug_src/WSUG_app_tools.xml b/docbook/wsug_src/WSUG_app_tools.xml
index 8fdb6abd5d..8c0d8d0e21 100644
--- a/docbook/wsug_src/WSUG_app_tools.xml
+++ b/docbook/wsug_src/WSUG_app_tools.xml
@@ -19,7 +19,7 @@
 	with Wireshark</title>
     <para>
       There are occasions when you want to capture packets using 
-      <command>tcpdump</command> rather than <command>ethereal</command>, 
+      <command>tcpdump</command> rather than <command>wireshark</command>, 
       especially when you want to do a remote capture and do not want the 
       network load associated with running Wireshark remotely (not to 
       mention all the X traffic polluting your capture).
@@ -43,19 +43,19 @@ tcpdump -i &lt;interface> -s 1500 -w &lt;some-file>
 	<note><title>Note!</title>
 	<para>
 	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 
+	<ulink url="&TcpdumpWebsite;">&TcpdumpWebsite;</ulink> for various 
 	platforms.
 	</para>
 	</note>
   </section>
   
   <section id="AppToolstshark">
-    <title><command>tshark</command>: Terminal-based Wireshark</title>
+    <title><command>TShark</command>: Terminal-based Wireshark</title>
     <para>
       <application>TShark</application> is a terminal oriented version 
-      of ethereal designed for capturing and displaying packets when an 
+      of Wireshark designed for capturing and displaying packets when an 
 	  interactive user interface isn't necessary or available. It supports 
-	  the same options as <command>ethereal</command>. For more 
+	  the same options as <command>wireshark</command>. For more 
       information on <command>tshark</command>, see the manual pages 
       (<command>man tshark</command>).
     </para>
@@ -560,7 +560,7 @@ Usage: mergecap [-hva] [-s &lt;snaplen&gt;] [-T &lt;encap type&gt;]
       processable packet dumps from hexdumps of application-level data only.
     </para>
     <para>
-      Text2pcap understands a hexdump of the form generated by od -t x1. In 
+      Text2pcap understands a hexdump of the form generated by od -A x -t x1. In 
       other words, each byte is individually displayed and surrounded with a 
       space. Each line begins with an offset describing the position in the 
       file. The offset is a hex number (can also be octal - see -o), of 
@@ -748,7 +748,7 @@ where &lt;input-filename&gt; specifies input filename (use - for standard input)
   
   <section id="AppToolsidl2wrs" >
     <title><command>idl2wrs</command>: 
-      Creating dissectors from Corba IDL files
+      Creating dissectors from CORBA IDL files
     </title>
     <para>
       In an ideal world idl2wrs would be mentioned in the users guide 
@@ -763,7 +763,7 @@ where &lt;input-filename&gt; specifies input filename (use - for standard input)
 	<command>idl2wrs</command> takes a
 	user specified IDL file and attempts to build a dissector that
 	can decode the IDL traffic over GIOP. The resulting file is
-	"C" code, that should compile okay as an ethereal dissector.
+	"C" code, that should compile okay as a Wireshark dissector.
       </para>
       <para>
 	<command>idl2wrs</command> basically parses the data struct given to 
@@ -778,12 +778,12 @@ where &lt;input-filename&gt; specifies input filename (use - for standard input)
 	    <para>This document</para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><filename>ethereal_be.py</filename></term>
+	<varlistentry><term><filename>wireshark_be.py</filename></term>
 	  <listitem>
 	    <para>The main compiler backend</para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><filename>ethereal_gen.py</filename></term>
+	<varlistentry><term><filename>wireshark_gen.py</filename></term>
 	  <listitem>
 	    <para>A helper class, that generates the C code.</para>
 	  </listitem>
@@ -813,13 +813,13 @@ where &lt;input-filename&gt; specifies input filename (use - for standard input)
       <para>
 	It is also COOL to work on a great Open Source project such as
 	the case with "Wireshark" (
-	<ulink url="http://www.wireshark.org">http://www.wireshark.org</ulink>
+	<ulink url="&WiresharkWebSite;">&WiresharkWebSite;</ulink>
 	)
       </para>
     </section>
     <section><title>How to use idl2wrs</title>
       <para>
-	To use the idl2wrs to generate ethereal dissectors, you
+	To use the idl2wrs to generate Wireshark dissectors, you
 	need the following:
       </para>
       <orderedlist>
@@ -838,19 +838,19 @@ where &lt;input-filename&gt; specifies input filename (use - for standard input)
 	</listitem>
 	<listitem>
 	  <para>
-	    Of course you need ethereal installed to compile the
+	    Of course you need Wireshark installed to compile the
 	    code and tweak it if required. idl2wrs is part of the 
 	    standard Wireshark distribution
 	  </para>
 	</listitem>
       </orderedlist>
       <para>
-	To use idl2wrs to generate an ethereal dissector from an idl file 
+	To use idl2wrs to generate an Wireshark dissector from an idl file 
 	use the following procedure:
       </para>
       <orderedlist>
 	<title>
-	  Procedure for converting a Corba idl file into an ethereal 
+	  Procedure for converting a CORBA idl file into a Wireshark 
 	  dissector
 	</title>
 	<listitem>
@@ -875,25 +875,25 @@ where &lt;input-filename&gt; specifies input filename (use - for standard input)
       <orderedlist continuation="continues">
 	<listitem>
 	  <para>To write the C code to stdout.
-	    <programlisting>Usage: omniidl  -p ./ -b ethereal_be &lt;your file.idl&gt;</programlisting>
+	    <programlisting>Usage: omniidl  -p ./ -b wireshark_be &lt;your file.idl&gt;</programlisting>
 	    eg:
-	    <programlisting>omniidl  -p ./ -b ethereal_be echo.idl</programlisting>
+	    <programlisting>omniidl  -p ./ -b wireshark_be echo.idl</programlisting>
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
 	    To write to a file, just redirect the output.
-	    <programlisting>omniidl  -p ./ -b ethereal_be echo.idl > packet-test-idl.c</programlisting>
+	    <programlisting>omniidl  -p ./ -b wireshark_be echo.idl > packet-test-idl.c</programlisting>
 	    You may wish to comment out the register_giop_user_module() code
 	    and that will leave you with heuristic dissection.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    Copy the resulting C code to your ethereal src directory, 
-	    edit the 2 make files to include the packet-test-idl.c
+	    Copy the resulting C code to your Wireshark src directory, 
+	    edit the two make files to include the packet-test-idl.c
 	    <programlisting>
-cp packet-test-idl.c /dir/where/ethereal/lives/
+cp packet-test-idl.c /dir/where/wireshark/lives/
 edit Makefile.am
 edit Makefile.nmake
 	    </programlisting>
@@ -945,7 +945,7 @@ edit Makefile.nmake
 	<listitem>
 	  <para>
 	    The "-p ./" option passed to omniidl indicates that the 
-	    ethereal_be.py and ethereal_gen.py are residing in the 
+	    wireshark_be.py and wireshark_gen.py are residing in the 
 	    current directory. This may need
 	    tweaking if you place these files somewhere else.
 	  </para>
diff --git a/docbook/wsug_src/WSUG_chapter_advanced.xml b/docbook/wsug_src/WSUG_chapter_advanced.xml
index eec9b786f5..b310fe3131 100644
--- a/docbook/wsug_src/WSUG_chapter_advanced.xml
+++ b/docbook/wsug_src/WSUG_chapter_advanced.xml
@@ -677,13 +677,13 @@
 	
 	<section><title>IP name resolution (network layer)</title>
 	<para>
-	Try to resolve an IP address (e.g. 65.208.228.223) to 
+	Try to resolve an IP address (e.g. 216.239.37.99) to 
 	something more "human readable".
 	</para>
     <para><command>DNS/ADNS name resolution (system/library service)</command>
 	Wireshark will ask the operating system (or the ADNS library), 
 	to convert an IP address to the hostname associated with it 
-	(e.g. 65.208.228.223 -> www.wireshark.org). The DNS service is using 
+	(e.g. 216.239.37.99 -> www.1.google.com). The DNS service is using 
 	synchronous calls to the DNS server. So Wireshark will stop responding 
 	until a response to a DNS request is returned. If possible, you might 
 	consider using the ADNS library (which won't wait for a network response).
@@ -723,8 +723,8 @@
 	</para>
     <para><command>hosts name resolution (hosts file)</command>
 	If DNS name resolution failed, Wireshark will try to convert an IP address 
-	to the hostname associated with it, using an hosts file provided by the 
-	user (e.g. 65.208.228.223 -> www.wireshark.org).
+	to the hostname associated with it, using a hosts file provided by the 
+	user (e.g. 216.239.37.99 -> www.google.com).
     </para>
 	</section>
 	
@@ -808,7 +808,7 @@
 	</para>
 	<para>
 	Further information about checksums can be found at:
-	<ulink url="http://en.wikipedia.org/wiki/Checksum"/>.
+	<ulink url="&WikipediaWebsite;/wiki/Checksum"/>.
 	</para>
 	</sidebar>
   <section><title>Wireshark checksum validation</title>
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml
index 321e55ee14..7efa1d4461 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.xml
+++ b/docbook/wsug_src/WSUG_chapter_build_install.xml
@@ -116,7 +116,7 @@
 	  </para>
 	  <para>
 	    You can obtain libpcap from 
-	    <ulink url="http://www.tcpdump.org">www.tcpdump.org</ulink>
+	    <ulink url="&TcpdumpWebsite;">www.tcpdump.org</ulink>
 	  </para>
 	</listitem>
       </itemizedlist>
@@ -179,7 +179,7 @@ make install
       shown in <xref linkend="Ch2Ex2"/>  will assist in building it. Also, 
 	if your operating system does not support <command>tcpdump</command>, 
 	you might also want to download it from the 
-	<ulink url="http://www.tcpdump.org">tcpdump</ulink> web site and 
+	<ulink url="&TcpdumpWebsite;">tcpdump</ulink> web site and 
 	install it.
 	<example id="Ch2Ex2">
 	  <title>Building and installing libpcap</title>
@@ -266,7 +266,7 @@ rpm -ivh libpcap-0.4-19.i386.rpm
 	<example id="Ch02Ex5">
 	  <title>Installing debs under Debian</title>
 	  <programlisting>
-apt-get install ethereal
+apt-get install wireshark-dev
 	  </programlisting>
 	</example>
     </para>
@@ -355,7 +355,7 @@ make install
     <para>
       Once you have installed Wireshark with <command>make install</command> 
       above, you should be able to run it by entering 
-      <command>ethereal</command>.
+      <command>wireshark</command>.
     </para>
   </section>
   
@@ -375,7 +375,7 @@ make install
       Use the following command to install the Wireshark RPM that you have 
       downloaded from the Wireshark web site:
       <programlisting>
-rpm -ivh wireshark-0.10.5-0.2.2.i386.rpm
+rpm -ivh wireshark-&WiresharkCurrentVersion;.i386.rpm
       </programlisting>
       If the above step fails because of missing dependencies, install the 
       dependencies first, and then retry the step above.  See 
@@ -389,7 +389,7 @@ rpm -ivh wireshark-0.10.5-0.2.2.i386.rpm
     <para> 
       Use the following command to install Wireshark under Debian:
       <programlisting>
-apt-get install ethereal
+apt-get install wireshark
       </programlisting>
       apt-get should take care of all of the dependency issues for you.
     </para>
@@ -442,7 +442,7 @@ apt-get install ethereal
     <para>
 	  For further information how to build Wireshark for Windows from the 
 	  sources, have a look at the Development Wiki:
-	  <ulink url="http://wiki.wireshark.org/Development">http://wiki.wireshark.org/Development</ulink>
+	  <ulink url="&WiresharkWikiPage;/Development">&WiresharkWikiPage;/Development</ulink>
 	  for the latest available development documentation.
     </para>
   </section>
@@ -466,9 +466,9 @@ apt-get install ethereal
 	</para>
 	<note><title>Note!</title>
 	<para>
-	<command>Since Wireshark Version 0.10.12, the WinPcap installer has become 
+	<command>The WinPcap installer has become 
 	part of the main Wireshark installer, so you don't need to download and 
-	install two separate packages any longer!</command>
+	install two separate packages</command>
     </para>
 	</note>
   <section id="ChBuildInstallWiresharkCommandLine">
@@ -497,8 +497,7 @@ apt-get install ethereal
 		<command>/desktopicon</command> installation of the desktop icon, 
 		<command>=yes</command> - force installation, <command>=no</command> - 
 		don't install, otherwise use defaults / user settings.
-		This option is available since 0.10.13 an can be useful for a silent 
-		installer. 
+		This option can be useful for a silent installer. 
 		</para>
 	</listitem>
 	<listitem>
@@ -506,8 +505,6 @@ apt-get install ethereal
 		<command>/quicklaunchicon</command> installation of the quick launch icon, 
 		<command>=yes</command> - force installation, <command>=no</command> - 
 		don't install, otherwise use defaults / user settings.
-		This option is available since 0.10.13 an can be useful for a silent 
-		installer. 
 		</para>
 	</listitem>
 	<listitem>
@@ -522,7 +519,8 @@ apt-get install ethereal
 	</itemizedlist>
 	<para> Example:
     <programlisting>
-wireshark-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\Program Files\Foo
+wireshark-setup-&WiresharkCurrentVersion;.exe /NCRC /S /desktopicon=yes 
+  /quicklaunchicon=no /D=C:\Program Files\Foo
 	</programlisting>
 	</para>
   </section>
@@ -542,11 +540,11 @@ wireshark-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\
 	(both Wireshark GTK1 and 2 cannot be installed at the same time):
 	<itemizedlist>
 	<listitem><para>
-	<command>Etheral GTK1</command> - Wireshark is a GUI network protocol 
+	<command>Wireshark GTK1</command> - Wireshark is a GUI network protocol 
 	analyzer.
 	</para></listitem>
 	<listitem><para>
-	<command>Etheral GTK2</command> - Wireshark is a GUI network protocol 
+	<command>Wireshark GTK2</command> - Wireshark is a GUI network protocol 
 	analyzer (using the modern GTK2 GUI toolkit, recommended).
 	</para></listitem>
 	<listitem><para>
@@ -569,7 +567,7 @@ wireshark-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\
 	<listitem><para>
 	<command>Mate - Meta Analysis and Tracing Engine</command> - user 
 	configurable extension(s) of the display filter engine, see 
-	<ulink url="http://wiki.wireshark.org/Mate">http://wiki.wireshark.org/Mate</ulink>
+	<ulink url="&WiresharkWikiPage;/Mate">&WiresharkWikiPage;/Mate</ulink>
 	for details.
 	</para></listitem>
 	<listitem><para>
@@ -621,7 +619,7 @@ wireshark-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\
     <note><title>Note!</title>
 	<para>
 	<command>As mentioned above, the Wireshark installer 
-	(since version 0.10.12) takes care of the installation of WinPcap, 
+	takes care of the installation of WinPcap, 
 	so usually you don't have to worry about WinPcap at all!</command> 
     </para>
 	</note>
@@ -639,7 +637,7 @@ wireshark-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\
 	<itemizedlist>
 	<listitem><para>
 	Wireshark related:
-	<ulink url="http://wiki.wireshark.org/WinPcap">http://wiki.wireshark.org/WinPcap</ulink>
+	<ulink url="&WiresharkWikiPage;/WinPcap">&WiresharkWikiPage;/WinPcap</ulink>
 	</para></listitem>
 	<listitem><para>
 	General WinPcap info: 
@@ -663,9 +661,9 @@ wireshark-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\
 	<ulink url="&WinPcapWebsite;">&WinPcapWebsite;</ulink>
 	</para></listitem>
 	<listitem><para>
-    The wireshark.org mirror:
-	<ulink url="http://winpcap.mirror.wireshark.org">
-	http://winpcap.mirror.wireshark.org</ulink>
+    The ethereal.com mirror:
+	<ulink url="http://winpcap.mirror.ethereal.com">
+	http://winpcap.mirror.ethereal.com</ulink>
 	</para></listitem>
 	<listitem><para>
     The Wiretapped.net mirror:
diff --git a/docbook/wsug_src/WSUG_chapter_capture.xml b/docbook/wsug_src/WSUG_chapter_capture.xml
index 975b522bff..ba60c3ca64 100644
--- a/docbook/wsug_src/WSUG_chapter_capture.xml
+++ b/docbook/wsug_src/WSUG_chapter_capture.xml
@@ -56,7 +56,7 @@
 	</para>
 	<tip><title>Tip!</title><para>
 	A comprehensive guide "How To setup a Capture" is available at:
-	<ulink url="http://wiki.wireshark.org/CaptureSetup">http://wiki.wireshark.org/CaptureSetup</ulink>.
+	<ulink url="&WiresharkWikiPage;/CaptureSetup">&WiresharkWikiPage;/CaptureSetup</ulink>.
 	</para></tip>
 	<para>
 	Here are some common pitfalls:
@@ -128,7 +128,7 @@
 	    If you already know the name of the capture interface, you can start 
 		Wireshark from the command line and use the following:
 	    <programlisting>
-ethereal -i eth0 -k
+wireshark -i eth0 -k
 	    </programlisting>
 		This will start Wireshark capturing on interface eth0, more details 
 		can be found at: <xref linkend="ChCustCommandLine"/>.
diff --git a/docbook/wsug_src/WSUG_chapter_customize.xml b/docbook/wsug_src/WSUG_chapter_customize.xml
index 23c333365b..78bbad6117 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.xml
+++ b/docbook/wsug_src/WSUG_chapter_customize.xml
@@ -44,22 +44,22 @@
     <para>
       <application>Wireshark</application> supports a large number of 
       command line parameters. To see what they are, simply enter the 
-      command <command> ethereal -h</command> and the help information 
+      command <command>wireshark -h</command> and the help information 
       shown in <xref linkend="ChCustEx1"/> (or something similar) should be 
 	  printed.
 	<example id="ChCustEx1">
 	  <title>Help information available from Wireshark</title>
 	  <programlisting>
-This is ethereal 0.10.13
- (C) 1998-2005 Gerald Combs &lt;gerald@wireshark.org>
+Version 0.99.0
+Copyright 1998-2006 Gerald Combs &lt;gerald@wireshark.org> and contributors.
 
 Compiled with GTK+ 2.6.9, with GLib 2.6.6, with WinPcap (version unknown),
-with libz 1.2.3, with libpcre 6.3, with Net-SNMP 5.2.1.2, with ADNS.
+with libz 1.2.3, with libpcre 6.4, with Net-SNMP 5.2.2, with ADNS, with Lua 5.1.
 
-Running with WinPcap version 3.1 (packet.dll version 3, 1, 0, 27), based on libp
-cap version 0.9[.x] on Windows XP Service Pack 2, build 2600.
+Running with WinPcap version 3.1 (packet.dll version 3, 1, 0, 27), based on 
+libpcap version 0.9[.x] on Windows XP Service Pack 2, build 2600.
 
-ethereal [ -vh ] [ -DklLnpQS ] [ -a &lt;capture autostop condition> ] ...
+wireshark [ -vh ] [ -DklLnpQS ] [ -a &lt;capture autostop condition> ] ...
         [ -b &lt;capture ring buffer option> ] ...
         [ -B &lt;capture buffer size> ]
         [ -c &lt;capture packet count> ] [ -f &lt;capture filter> ]
@@ -74,7 +74,7 @@ ethereal [ -vh ] [ -DklLnpQS ] [ -a &lt;capture autostop condition> ] ...
     </para>
     <para>
       The first thing to notice is that issuing the command 
-      <command>ethereal</command> by itself will bring up 
+      <command>wireshark</command> by itself will bring up 
       <application>Wireshark</application>.
       However, you can include as many of the command line parameters as 
       you like. Their meanings are as follows ( in alphabetical order ):
@@ -231,8 +231,8 @@ capture.
 	    </para>
 	    <para>
 Network interface names should match one of the names listed in
-<command>ethereal -D</command> (described above); a number, as reported by
-<command>ethereal -D</command>, can also be used.  If you're using UNIX, <command>netstat
+<command>wireshark -D</command> (described above); a number, as reported by
+<command>wireshark -D</command>, can also be used.  If you're using UNIX, <command>netstat
 -i</command> or <command>ifconfig -a</command> might also work to list interface names,
 although not all versions of UNIX support the <command>-a</command> flag to <command>ifconfig</command>.
 	    </para>
@@ -323,7 +323,7 @@ standard libpcap format.
 	    <para>An example of setting a single preference would be: </para>
 	    <para>
 	      <command>
-		ethereal -o mgcp.display_dissect_tree:TRUE
+		wireshark -o mgcp.display_dissect_tree:TRUE
 	      </command>
 	    </para>
 	    <para> 
@@ -331,7 +331,7 @@ standard libpcap format.
 	    </para>
 	    <para>
 	      <command>
-		ethereal -o mgcp.display_dissect_tree:TRUE -o mgcp.udp.callagent_port:2627
+		wireshark -o mgcp.display_dissect_tree:TRUE -o mgcp.udp.callagent_port:2627
 	      </command>
 	    </para>
 		<tip><title>Tip!</title>
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index 5f59f99903..1dda50d412 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -278,37 +278,17 @@
     </para>
   </section>
   
-  <section id="ChIntroPronounce">
-    <title>A rose by any other name</title>
-    <para>
-      William Shakespeare wrote: 
-      <emphasis>
-	&quot;A rose by any other name would smell as sweet.&quot;
-      </emphasis>  
-      And so it is with Wireshark, as there appears to be two different 
-      ways that people pronounce the name. 
-    </para>
-    <para>
-      Some people pronounce it ether-real, while others pronounce it 
-      e-the-real, as in ghostly, insubstantial, etc.
-    </para>
-    <para>
-      You are welcome to call it what you like, as long as you find it 
-      useful. The FAQ gives the official pronunciation as "e-the-real".
-    </para>
-  </section>
-  
   <section id="ChIntroHistory">
     <title>A brief history of Wireshark</title>
     <para>
       In late 1997, Gerald Combs needed a tool for tracking down 
       networking problems and wanted to learn more about networking, so 
-      he started writing Wireshark as a way to solve both problems.
+      he started writing Ethereal as a way to solve both problems.
     </para>
     <para>
-      Wireshark was initially released, after several pauses in development, 
+      Ethereal was initially released, after several pauses in development, 
       in July 1998 as version 0.2.0.  Within days, patches, bug reports, 
-      and words of encouragement started arriving, so Wireshark was on its 
+      and words of encouragement started arriving, so Ethereal was on its 
       way to success.
     </para>
     <para>
@@ -318,7 +298,7 @@
     <para>
       In October, 1998, Guy Harris of Network Appliance was looking for 
 	  something better than tcpview, so he started applying patches and 
-	  contributing dissectors to Wireshark.
+	  contributing dissectors to Ethereal.
     </para>
     <para>
       In late 1998, Richard Sharpe, who was giving TCP/IP courses, saw its 
@@ -328,11 +308,14 @@
       dissectors and contributing patches.
     </para>
     <para>
-      The list of people who have contributed to Wireshark has become very long 
+      The list of people who have contributed to Ethereal has become very long 
 	  since then, and almost all of them started with a protocol that they 
-	  needed that Wireshark did not already handle. So they copied an existing 
+	  needed that Ethereal did not already handle. So they copied an existing 
 	  dissector and contributed the code back to the team.
     </para>
+    <para>
+	In 2006 the project moved house and re-emerged as Wireshark.
+    </para>
   </section>
   
   <section id="ChIntroMaintenance">
@@ -444,7 +427,7 @@
 	Help/Contents and selecting the FAQ page in the upcoming dialog. 
     </para>
     <para>
-	An online version is available at the ethereal website:
+	An online version is available at the Wireshark website:
 	<ulink url="&WiresharkFAQPage;">&WiresharkFAQPage;</ulink>. You might 
 	prefer this online version, as it's typically more up to date and the HTML 
 	format is easier to use.
@@ -511,7 +494,7 @@
 	  <para>
 	    The version number of Wireshark and the dependent libraries linked with 
 		it, eg GTK+, etc. You can obtain this with the command 
-	    <command>ethereal -v</command>.
+	    <command>wireshark -v</command>.
 	  </para>
 	</listitem>
 	<listitem>
@@ -562,7 +545,7 @@
 	    You can obtain this traceback information with the following commands:
 	    <programlisting>
 <![CDATA[
-$ gdb `whereis ethereal | cut -f2 -d: | cut -d' ' -f2` core >& bt.txt
+$ gdb `whereis wireshark | cut -f2 -d: | cut -d' ' -f2` core >& bt.txt
 backtrace
 ^D
 $
diff --git a/docbook/wsug_src/WSUG_chapter_statistics.xml b/docbook/wsug_src/WSUG_chapter_statistics.xml
index 7f7c29e1bd..d56941af03 100644
--- a/docbook/wsug_src/WSUG_chapter_statistics.xml
+++ b/docbook/wsug_src/WSUG_chapter_statistics.xml
@@ -499,7 +499,7 @@
     </para>
     <para>
 	Some of these statistics are described at the 
-	<ulink url="http://wiki.wireshark.org/Statistics"/> pages.
+	<ulink url="&WiresharkWikiPage;/Statistics"/> pages.
     </para>
   </section>
   
diff --git a/docbook/wsug_src/WSUG_preface.xml b/docbook/wsug_src/WSUG_preface.xml
index 74cacf99f3..b0d501c795 100644
--- a/docbook/wsug_src/WSUG_preface.xml
+++ b/docbook/wsug_src/WSUG_preface.xml
@@ -95,7 +95,7 @@
   </para>
   <para>
     The authors would like to acknowledge those man page and README authors 
-	for the ethereal project from who sections of this document borrow heavily:
+	for the Wireshark project from who sections of this document borrow heavily:
     <itemizedlist>
       <listitem>
 	<para>