Rename the main executable to "wireshark", along with more conversions:

  ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271

14 files changed, 78 insertions, 78 deletions

diff --git a/docbook/catalog.xml b/docbook/catalog.xml
index dbfa16522b..16577f8c5b 100644
--- a/docbook/catalog.xml
+++ b/docbook/catalog.xml
@@ -46,10 +46,10 @@ Please note that if you shift any files in the directory structure you MUST adju
 	<!--
     <system
         systemId="EtherealMain1"
-        uri="./graphics/ethereal-main.jpg" />
+        uri="./graphics/wireshark-main.jpg" />
     <system
         systemId="EtherealThreePane1"
-        uri="./graphics/ethereal-main.jpg" />
+        uri="./graphics/wireshark-main.jpg" />
     <uri 
         name="chunk.xsl"
         uri="docbook-xsl-1.62.1/html/chunk.xsl" />
diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml
index 18c310722f..17c9499bb9 100644
--- a/docbook/developer-guide.xml
+++ b/docbook/developer-guide.xml
@@ -46,15 +46,15 @@ DOCUMENT SECTION
 Ethereal Info
 -->
   <!ENTITY EtherealCurrentVersion "0.10.14">
-  <!ENTITY EtherealWebSite "http://www.ethereal.com">
+  <!ENTITY EtherealWebSite "http://www.wireshark.org">
   <!ENTITY EtherealDownloadPage "&EtherealWebSite;/download.html">
   <!ENTITY EtherealAuthorsPage "&EtherealWebSite;/introduction.html#authors">
   <!ENTITY EtherealFAQPage "&EtherealWebSite;/faq.html">
-  <!ENTITY EtherealDevMailList "ethereal-dev[AT]ethereal.com">
+  <!ENTITY EtherealDevMailList "wireshark-dev[AT]wireshark.org">
   <!ENTITY EtherealDevsGuidePage "&EtherealWebSite;/docs">
   <!ENTITY EtherealUsersGuidePage "&EtherealWebSite;/docs">
-  <!ENTITY EtherealWikiSite "http://wiki.ethereal.com">
-  <!ENTITY EtherealBugsSite "http://bugs.ethereal.com">
+  <!ENTITY EtherealWikiSite "http://wiki.wireshark.org">
+  <!ENTITY EtherealBugsSite "http://bugs.wireshark.org">
 
 <!--
 Gnu info
diff --git a/docbook/edg_src/EDG_chapter_env_intro.xml b/docbook/edg_src/EDG_chapter_env_intro.xml
index d23a3c2692..3a605437ed 100644
--- a/docbook/edg_src/EDG_chapter_env_intro.xml
+++ b/docbook/edg_src/EDG_chapter_env_intro.xml
@@ -353,7 +353,7 @@
     <para>
       There are several mailing lists of specific Ethereal topics available:
       <variablelist>
-	<varlistentry><term><command>ethereal-announce</command></term>
+	<varlistentry><term><command>wireshark-announce</command></term>
 	  <listitem>
 	    <para>
 	      This mailing list will inform you about new program 
@@ -361,7 +361,7 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><command>ethereal-users</command></term>
+	<varlistentry><term><command>wireshark-users</command></term>
 	  <listitem>
 	    <para>
 	      This list is for users of Ethereal. People post 
@@ -370,7 +370,7 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><command>ethereal-dev</command></term>
+	<varlistentry><term><command>wireshark-dev</command></term>
 	  <listitem>
 	    <para>
 	      This list is for Wireshark developers. People post questions about 
@@ -379,7 +379,7 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><command>ethereal-bugs</command></term>
+	<varlistentry><term><command>wireshark-bugs</command></term>
 	  <listitem>
 	    <para>
 	      This list is for Wireshark developers. Everytime a change to the bug 
@@ -390,7 +390,7 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><command>ethereal-cvs</command></term>
+	<varlistentry><term><command>wireshark-commits</command></term>
 	  <listitem>
 	    <para>
 	      This list is for Wireshark developers. Everytime a change to the SVN 
@@ -422,7 +422,7 @@
 	The Etereal community started collecting bug reports in a Bugzilla database at
 	<ulink url="&EtherealBugsSite;">&EtherealBugsSite;</ulink>.
 	This database is filled with manually filed bug reports, usually after some 
-	discussion on ethereal-dev, and bug reports from the QA build tooling.
+	discussion on wireshark-dev, and bug reports from the QA build tooling.
 	</para>
 	</section>
 		
diff --git a/docbook/edg_src/EDG_chapter_libraries.xml b/docbook/edg_src/EDG_chapter_libraries.xml
index af9d95b669..afa4994a92 100644
--- a/docbook/edg_src/EDG_chapter_libraries.xml
+++ b/docbook/edg_src/EDG_chapter_libraries.xml
@@ -31,7 +31,7 @@
 	<para>
 	Win32: All required libraries for the MSVC
 	generation are available at: 
-	<ulink	url="http://www.ethereal.com/distribution/win32/development/"/>,
+	<ulink	url="http://www.wireshark.org/distribution/win32/development/"/>,
 	but see <xref linkend="ChLibsSetup"/> for an easier way to install the 
 	libraries.
 	</para>
@@ -107,7 +107,7 @@
 	</note>
 	<para>
 	By default the libraries will be downloaded and installed into 
-	<filename>C:\ethereal-win32-libs</filename>.
+	<filename>C:\wireshark-win32-libs</filename>.
 	You can change this to any other location by editing the file
 	<filename>config.nmake</filename> and changing the line containing 
 	the WIRESHARK_LIBS setting to your favourite place (use an absolute path 
@@ -247,7 +247,7 @@
 	Then libsnmp is compiled with the "libsnmp - Win32 Release" project 
 	using MSVC++ 6.0. A file called "README.ethereal" has been placed in the 
 	net-snmp zip archive at <ulink 
-	url="http://anonsvn.ethereal.com/ethereal-win32-libs/trunk/packages/"/>
+	url="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"/>
 	describing the changes in more detail.
 	</para>
 	</section>
diff --git a/docbook/edg_src/EDG_chapter_sources.xml b/docbook/edg_src/EDG_chapter_sources.xml
index 8bc3946b7e..de92b9d225 100644
--- a/docbook/edg_src/EDG_chapter_sources.xml
+++ b/docbook/edg_src/EDG_chapter_sources.xml
@@ -34,7 +34,7 @@
 	<para>
 	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.
+	Subversion repository located at a server at the wireshark.org domain.
 	</para>
 	<para>
 	To qoute the Subversion book about "What is Subversion?": 
@@ -119,7 +119,7 @@
 	found at: 
 	</para>
 	<para>
-	<ulink url="http://anonsvn.ethereal.com/ethereal/trunk/"/>.
+	<ulink url="http://anonsvn.wireshark.org/ethereal/trunk/"/>.
 	</para>
 	<para>
 	A <command>comprehensive view</command> of all source versions 
@@ -127,7 +127,7 @@
 	is available at:
 	</para>
 	<para>
-	<ulink url="http://anonsvn.ethereal.com/viewcvs/viewcvs.py/"/>. 
+	<ulink url="http://anonsvn.wireshark.org/viewcvs/viewcvs.py/"/>. 
 	</para>
 	<para>
 	Of special interest might be the subdirectories:
@@ -183,7 +183,7 @@
 	You can use a Subversion client to download the source code from 
 	Ethereal's anonymous Subversion repository. The URL for the repository 
 	trunk is:
-	<ulink url="http://anonsvn.ethereal.com/ethereal/trunk/"/>.
+	<ulink url="http://anonsvn.wireshark.org/ethereal/trunk/"/>.
 	</para>
 	<para>
 	See <xref linkend="ChToolsSubversion"/> how to install a Subversion client.
@@ -194,7 +194,7 @@
 	</para>
 	<para>
 	<prompt>$</prompt> 
-	<userinput>svn checkout http://anonsvn.ethereal.com/ethereal/trunk ethereal</userinput>
+	<userinput>svn checkout http://anonsvn.wireshark.org/ethereal/trunk ethereal</userinput>
 	</para>
 	<para>
 	The checkout has to be only done once. This will copy all the sources of 
@@ -215,7 +215,7 @@
 	<para>
 	 The entire source tree of the Subversion repository is available via a 
 	 web interface at:
-	 <ulink url="http://anonsvn.ethereal.com/viewcvs/viewcvs.py/"/>. 
+	 <ulink url="http://anonsvn.wireshark.org/viewcvs/viewcvs.py/"/>. 
 	 You can view 
 	 each revision of a particular file, as well as diffs between different 
 	 revisions. You can also download individual files or entire directories.
@@ -235,7 +235,7 @@
 	The buildbot server will automatically start to generate a snapshot of 
 	Ethereal's sourcetree after a source code change committed. 
 	These snapshots can be found at: <ulink
-	url="http://www.ethereal.com/distribution/buildbot-builds/source/"/>.
+	url="http://www.wireshark.org/distribution/buildbot-builds/source/"/>.
 	</para>
 	<para>
 	If anonymous Subversion access isn't possible, e.g. if the connection to 
@@ -258,7 +258,7 @@
 	</para>
 	<para>
 	The officially released source files can be found at: <ulink
-	url="http://www.ethereal.com/download.html"/>.
+	url="http://www.wireshark.org/download.html"/>.
 	You should use these sources if you want to build Ethereal on your
 	platform for productive use.
 	</para>
@@ -542,8 +542,8 @@ make
 	Here is a small example of a patch file (XXX - generate a better example):
 	<programlisting>
 <![CDATA[
-diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/packet-dcerpc.c
---- ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c	2004-08-12 15:42:26.000000000 -0700
+diff -ur ../wireshark-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/packet-dcerpc.c
+--- ../wireshark-0.10.6/epan/dissectors/packet-dcerpc.c	2004-08-12 15:42:26.000000000 -0700
 +++ ./epan/dissectors/packet-dcerpc.c	2004-08-19 18:48:32.000000000 -0700
 @@ -282,6 +282,7 @@
  /* we need to keep track of what transport were used, ie what handle we came
@@ -625,7 +625,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa
 	do a diff, you should
 	have two source trees on your computer, one with your working copy
 	(containing your changes), and one with the "official" source tree
-	(hopefully the latest SVN files) from www.ethereal.com.
+	(hopefully the latest SVN files) from www.wireshark.org.
 	</para>
 	<para>
 	If you have only changed a single file, you could type something like
@@ -781,7 +781,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa
 	  and the fuzz test randomly change bytes in this file, so unconditional 
 	  code paths in your dissector are passed. There are tools available to 
 	  automatically do this on any number of input files, see: 
-	  <ulink url="http://wiki.ethereal.com/FuzzTesting"/> for details.
+	  <ulink url="http://wiki.wireshark.org/FuzzTesting"/> for details.
 	  </para>
 	  </listitem>
 	</itemizedlist>
@@ -796,7 +796,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa
 	</para>
 	<para>
 	You should send an email to <ulink
-	url="mailto:ethereal-dev[AT]ethereal.com"/> containing: 
+	url="mailto:wireshark-dev[AT]wireshark.org"/> containing: 
 	<itemizedlist>
 	  <listitem><para>
 	  subject: [PATCH] and a short description of your changes
@@ -1077,7 +1077,7 @@ $Id$
 	</tip>
 	<para>
 	If everything went well, you will now find something like:
-	<filename>ethereal-setup-&EtherealCurrentVersion;.exe</filename> in
+	<filename>wireshark-setup-&EtherealCurrentVersion;.exe</filename> in
 	the <filename>packaging/nsis</filename> directory.
 	</para>
 	</section>
diff --git a/docbook/edg_src/EDG_chapter_tools.xml b/docbook/edg_src/EDG_chapter_tools.xml
index 0a68c29e73..a5cf1e5957 100644
--- a/docbook/edg_src/EDG_chapter_tools.xml
+++ b/docbook/edg_src/EDG_chapter_tools.xml
@@ -201,7 +201,7 @@
 	  <entry>-</entry>
 	  <entry><ulink url="http://nsis.sourceforge.net">NSIS</ulink></entry>
 	  <entry>Only needed if you want to build your own 
-	  ethereal-setup.exe.</entry>
+	  wireshark-setup.exe.</entry>
 	</row>
 	</tbody>
 	</tgroup>
@@ -347,7 +347,7 @@
 	<section>
 	<title>Nullsoft Scriptable Install System (NSIS)</title>
 	<para>
-	If you want to build your own ethereal-setup.exe, you'll need NSIS. 
+	If you want to build your own wireshark-setup.exe, you'll need NSIS. 
 	You can download the NSIS setup from 
 	<ulink url="http://nsis.sourceforge.net"/> and simply install it.
 	</para>
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index eb12804d40..fc67b34122 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -101,8 +101,8 @@ Ethereal Info
   <section id="GettingEthereal"><title>Getting Ethereal</title>
     <section><title>Microsoft Windows</title>
       <para>
-	Download ethereal-setup-&EtherealCurrentVersion;.exe from the
-	<ulink url="http://www.ethereal.com/distribution/win32/">Windows
+	Download wireshark-setup-&EtherealCurrentVersion;.exe from the
+	<ulink url="http://www.wireshark.org/distribution/win32/">Windows
 	download area</ulink> on the main web site.  Double-click the
 	installer executable.
       </para>
@@ -111,7 +111,7 @@ Ethereal Info
     <section><title>Sun Solaris</title>
       <para>
 	Download the appropriate package from the
-	<ulink url="http://www.ethereal.com/distribution/solaris/">Solaris
+	<ulink url="http://www.wireshark.org/distribution/solaris/">Solaris
 	download area</ulink> on the main web site.  Uncompress the package
 	using bzip2, and install it using pkgadd.
       </para>
@@ -119,8 +119,8 @@ Ethereal Info
 
     <section><title>Source Code</title>
       <para>
-	Download ethereal-&EtherealCurrentVersion;.tar.gz from the
-	<ulink url="http://www.ethereal.com/distribution/">main
+	Download wireshark-&EtherealCurrentVersion;.tar.gz from the
+	<ulink url="http://www.wireshark.org/distribution/">main
 	download area</ulink> on the web site.  Extract the package
 	using tar and gzip.  Run "configure ; make ; make install".
       </para>
@@ -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 Wireshark web site.
+        can be found on the <ulink url="http://www.wireshark.org/download.html#otherplat">download page</ulink> on the Wireshark web site.
       </para>
     </section>
 
@@ -159,7 +159,7 @@ Ethereal Info
       On Windows systems the packet list scroll bar can sometimes disappear
       or become unusable.  Until the problem is fixed you can work around it
       by resizing the packet list or the main window.
-      (<ulink url="http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=220">Bug
+      (<ulink url="http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=220">Bug
       #220</ulink>)
     </para>
 
@@ -170,25 +170,25 @@ Ethereal Info
 
     <para>
       Trying to save flow data may crash Ethereal.
-      (<ulink url="http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=396">Bug
+      (<ulink url="http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=396">Bug
       #396</ulink>)
     </para>
 
     <para>
       It may not be possible to re-order coloring rules under Windows.
-      (<ulink url="http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=699">Bug
+      (<ulink url="http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=699">Bug
       #699</ulink>)
     </para>
 
     <para>
       Multiple tap interfaces may cause a crash under FreeBSD.
-      (<ulink url="http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=757">Bug
+      (<ulink url="http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=757">Bug
       #757</ulink>)
     </para>
 
     <para>
       Ethereal may crash while viewing TCP streams.
-      (<ulink url="http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=852">Bug
+      (<ulink url="http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=852">Bug
       #852</ulink>)
     </para>
 
@@ -196,9 +196,9 @@ Ethereal Info
 
   <section id="GettingHelp"><title>Getting Help</title>
     <para>
-    Community support is available on the ethereal-users mailing list.
+    Community support is available on the wireshark-users mailing list.
     Subscription information and archives for all of Ethereal's mailing
-    lists can be found on <ulink url="http://www.ethereal.com/lists/">the
+    lists can be found on <ulink url="http://www.wireshark.org/lists/">the
     web site</ulink>. There is also an <ulink url="irc://irc.freenode.net/ethereal">IRC channel dedicated to Ethereal</ulink>.
     </para>
     <para>
@@ -210,7 +210,7 @@ Ethereal Info
   <section id="FAQ"><title>Frequently Asked Questions</title>
     <para>
     A complete FAQ is available on the
-    <ulink url="http://www.ethereal.com/faq.html">Ethereal web site</ulink>.
+    <ulink url="http://www.wireshark.org/faq.html">Ethereal web site</ulink>.
     </para>
   </section>
 
diff --git a/docbook/wsug_src/WSUG_app_files.xml b/docbook/wsug_src/WSUG_app_files.xml
index 9dda2e2708..7c0fe73e63 100644
--- a/docbook/wsug_src/WSUG_app_files.xml
+++ b/docbook/wsug_src/WSUG_app_files.xml
@@ -39,7 +39,7 @@
 		<entry><command>preferences</command></entry>
 		<entry>Settings from the Preferences dialog box.</entry>
 		<entry>/etc/ethereal.conf, $HOME/.ethereal/preferences</entry>
-		<entry>%ETHEREAL%\ethereal.conf, %APPDATA%\Wireshark\preferences</entry>
+		<entry>%WIRESHARK%\ethereal.conf, %APPDATA%\Wireshark\preferences</entry>
 	      </row>
 	      <row>
 		<entry><command>recent</command></entry>
@@ -51,37 +51,37 @@
 		<entry><command>cfilters</command></entry>
 		<entry>Capture filters.</entry>
 		<entry>$HOME/.ethereal/cfilters</entry>
-		<entry>%ETHEREAL%\cfilters, %APPDATA%\Wireshark\cfilters</entry>
+		<entry>%WIRESHARK%\cfilters, %APPDATA%\Wireshark\cfilters</entry>
 	      </row>
 	      <row>
 		<entry><command>dfilters</command></entry>
 		<entry>Display filters.</entry>
 		<entry>$HOME/.ethereal/dfilters</entry>
-		<entry>%ETHEREAL%\dfilters, %APPDATA%\Wireshark\dfilters</entry>
+		<entry>%WIRESHARK%\dfilters, %APPDATA%\Wireshark\dfilters</entry>
 	      </row>
 	      <row>
 		<entry><command>colorfilters</command></entry>
 		<entry>Coloring rules.</entry>
 		<entry>$HOME/.ethereal/colorfilters</entry>
-		<entry>%ETHEREAL%\colorfilters, %APPDATA%\Wireshark\colorfilters</entry>
+		<entry>%WIRESHARK%\colorfilters, %APPDATA%\Wireshark\colorfilters</entry>
 	      </row>
 	      <row>
 		<entry><command>disabled_protos</command></entry>
 		<entry>Disabled protocols.</entry>
 		<entry>$HOME/.ethereal/disabled_protos</entry>
-		<entry>%ETHEREAL%\disabled_protos, %APPDATA%\Wireshark\disabled_protos</entry>
+		<entry>%WIRESHARK%\disabled_protos, %APPDATA%\Wireshark\disabled_protos</entry>
 	      </row>
 	      <row>
 		<entry><command>ethers</command></entry>
 		<entry>Ethernet name resolution.</entry>
 		<entry>/etc/ethers, $HOME/.ethereal/ethers</entry>
-		<entry>%ETHEREAL%\ethers, %APPDATA%\Wireshark\ethers</entry>
+		<entry>%WIRESHARK%\ethers, %APPDATA%\Wireshark\ethers</entry>
 	      </row>
 	      <row>
 		<entry><command>manuf</command></entry>
 		<entry>Ethernet name resolution.</entry>
 		<entry>/etc/manuf</entry>
-		<entry>%ETHEREAL%\manuf</entry>
+		<entry>%WIRESHARK%\manuf</entry>
 	      </row>
 	      <row>
 		<entry><command>hosts</command></entry>
@@ -93,7 +93,7 @@
 		<entry><command>ipxnets</command></entry>
 		<entry>IPX name resolution.</entry>
 		<entry>$HOME/.ethereal/ipxnets</entry>
-		<entry>%ETHEREAL%\ipxnets</entry>
+		<entry>%WIRESHARK%\ipxnets</entry>
 	      </row>
 	      <row>
 		<entry><command>plugins</command></entry>
@@ -102,7 +102,7 @@
 	      /usr/local/share/ethereal/plugins, 
 	      $HOME/.ethereal/plugins
 		</entry>
-		<entry>%ETHEREAL%\plugins\&lt;version&gt;, 
+		<entry>%WIRESHARK%\plugins\&lt;version&gt;, 
 		%APPDATA%\Wireshark\plugins</entry>
 	      </row>
 	      <row>
@@ -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 Wireshark program folder, typically 
+	%WIRESHARK% points to the Wireshark program folder, typically 
 	<filename>C:\Program Files\Wireshark</filename>
 	</para>
 	</note>
diff --git a/docbook/wsug_src/WSUG_app_tools.xml b/docbook/wsug_src/WSUG_app_tools.xml
index 0026b074fb..8fdb6abd5d 100644
--- a/docbook/wsug_src/WSUG_app_tools.xml
+++ b/docbook/wsug_src/WSUG_app_tools.xml
@@ -813,7 +813,7 @@ 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.ethereal.com">http://www.ethereal.com</ulink>
+	<ulink url="http://www.wireshark.org">http://www.wireshark.org</ulink>
 	)
       </para>
     </section>
diff --git a/docbook/wsug_src/WSUG_chapter_advanced.xml b/docbook/wsug_src/WSUG_chapter_advanced.xml
index edf1975cb5..eec9b786f5 100644
--- a/docbook/wsug_src/WSUG_chapter_advanced.xml
+++ b/docbook/wsug_src/WSUG_chapter_advanced.xml
@@ -683,7 +683,7 @@
     <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.ethereal.com). The DNS service is using 
+	(e.g. 65.208.228.223 -> www.wireshark.org). 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).
@@ -724,7 +724,7 @@
     <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.ethereal.com).
+	user (e.g. 65.208.228.223 -> www.wireshark.org).
     </para>
 	</section>
 	
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml
index 924552d445..321e55ee14 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.xml
+++ b/docbook/wsug_src/WSUG_chapter_build_install.xml
@@ -285,22 +285,22 @@ apt-get install ethereal
 	    version of UNIX uses GNU <command>tar</command>, you can use the 
 	    following command:
 	    <programlisting>
-tar zxvf ethereal-&WiresharkCurrentVersion;-tar.gz
+tar zxvf wireshark-&WiresharkCurrentVersion;-tar.gz
 	    </programlisting>
 	  </para>
 	  <para>
 	    For other versions of UNIX, You will want to use the following 
 	    commands:
 	    <programlisting>
-gzip -d ethereal-&WiresharkCurrentVersion;-tar.gz
-tar xvf ethereal-&WiresharkCurrentVersion;-tar
+gzip -d wireshark-&WiresharkCurrentVersion;-tar.gz
+tar xvf wireshark-&WiresharkCurrentVersion;-tar
 	    </programlisting>
 	    <note>
 	      <title>Note!</title>
 	      <para>
 		The pipeline 
 		<command>
-		  gzip -dc ethereal-&WiresharkCurrentVersion;-tar.gz | tar xvf -
+		  gzip -dc wireshark-&WiresharkCurrentVersion;-tar.gz | tar xvf -
 		</command> will work here as well.
 	      </para>
 	    </note>
@@ -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 ethereal-0.10.5-0.2.2.i386.rpm
+rpm -ivh wireshark-0.10.5-0.2.2.i386.rpm
       </programlisting>
       If the above step fails because of missing dependencies, install the 
       dependencies first, and then retry the step above.  See 
@@ -426,7 +426,7 @@ apt-get install ethereal
     </para>
     <para>
       If you cannot determine what the problems are, send mail to the 
-      <command>ethereal-dev</command> mailing list explaining your problem, 
+      <command>wireshark-dev</command> mailing list explaining your problem, 
       and including the output from <filename>config.log</filename> and 
       anything else you think is relevant, like a trace of the 
       <command>make</command> stage.
@@ -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.ethereal.com/Development">http://wiki.ethereal.com/Development</ulink>
+	  <ulink url="http://wiki.wireshark.org/Development">http://wiki.wireshark.org/Development</ulink>
 	  for the latest available development documentation.
     </para>
   </section>
@@ -457,7 +457,7 @@ apt-get install ethereal
     <title>Install Wireshark</title>
 	<para>
 		You may acquire a binary installer of Wireshark named something like: 
-		<filename>ethereal-setup-x.y.z.exe</filename>.
+		<filename>wireshark-setup-x.y.z.exe</filename>.
 	</para>
 	<para>
 	    Simply download the Wireshark installer from:
@@ -522,7 +522,7 @@ apt-get install ethereal
 	</itemizedlist>
 	<para> Example:
     <programlisting>
-ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\Program Files\Foo
+wireshark-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\Program Files\Foo
 	</programlisting>
 	</para>
   </section>
@@ -569,7 +569,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P
 	<listitem><para>
 	<command>Mate - Meta Analysis and Tracing Engine</command> - user 
 	configurable extension(s) of the display filter engine, see 
-	<ulink url="http://wiki.ethereal.com/Mate">http://wiki.ethereal.com/Mate</ulink>
+	<ulink url="http://wiki.wireshark.org/Mate">http://wiki.wireshark.org/Mate</ulink>
 	for details.
 	</para></listitem>
 	<listitem><para>
@@ -639,7 +639,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P
 	<itemizedlist>
 	<listitem><para>
 	Wireshark related:
-	<ulink url="http://wiki.ethereal.com/WinPcap">http://wiki.ethereal.com/WinPcap</ulink>
+	<ulink url="http://wiki.wireshark.org/WinPcap">http://wiki.wireshark.org/WinPcap</ulink>
 	</para></listitem>
 	<listitem><para>
 	General WinPcap info: 
@@ -663,9 +663,9 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P
 	<ulink url="&WinPcapWebsite;">&WinPcapWebsite;</ulink>
 	</para></listitem>
 	<listitem><para>
-    The ethereal.com mirror:
-	<ulink url="http://winpcap.mirror.ethereal.com">
-	http://winpcap.mirror.ethereal.com</ulink>
+    The wireshark.org mirror:
+	<ulink url="http://winpcap.mirror.wireshark.org">
+	http://winpcap.mirror.wireshark.org</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 636fc3fb49..975b522bff 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.ethereal.com/CaptureSetup">http://wiki.ethereal.com/CaptureSetup</ulink>.
+	<ulink url="http://wiki.wireshark.org/CaptureSetup">http://wiki.wireshark.org/CaptureSetup</ulink>.
 	</para></tip>
 	<para>
 	Here are some common pitfalls:
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index e55c4480f8..5f59f99903 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -273,7 +273,7 @@
     </para>
     <para>
 	If you want to be notified about new Wireshark releases, you should 
-	subscribe to the ethereal-announce mailing list. You will find more 
+	subscribe to the wireshark-announce mailing list. You will find more 
 	details in <xref linkend="ChIntroMailingLists"/>.
     </para>
   </section>
@@ -455,7 +455,7 @@
     <para>
       There are several mailing lists of specific Wireshark topics available:
       <variablelist>
-	<varlistentry><term><command>ethereal-announce</command></term>
+	<varlistentry><term><command>wireshark-announce</command></term>
 	  <listitem>
 	    <para>
 	      This mailing list will inform you about new program 
@@ -463,7 +463,7 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><command>ethereal-users</command></term>
+	<varlistentry><term><command>wireshark-users</command></term>
 	  <listitem>
 	    <para>
 	      This list is for users of Wireshark.  People post 
@@ -472,7 +472,7 @@
 	    </para>
 	  </listitem>
 	</varlistentry>
-	<varlistentry><term><command>ethereal-dev</command></term>
+	<varlistentry><term><command>wireshark-dev</command></term>
 	  <listitem>
 	    <para>
 	      This list is for Wireshark developers. If you want to start 
diff --git a/docbook/wsug_src/WSUG_chapter_statistics.xml b/docbook/wsug_src/WSUG_chapter_statistics.xml
index 11f9d8532f..7f7c29e1bd 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.ethereal.com/Statistics"/> pages.
+	<ulink url="http://wiki.wireshark.org/Statistics"/> pages.
     </para>
   </section>