Tethereal/tethereal -> TShark/tshark.

svn path=/trunk/; revision=18268

5 files changed, 10 insertions, 10 deletions

diff --git a/docbook/edg_src/EDG_chapter_userinterface.xml b/docbook/edg_src/EDG_chapter_userinterface.xml
index ec70457f18..4994d02e81 100644
--- a/docbook/edg_src/EDG_chapter_userinterface.xml
+++ b/docbook/edg_src/EDG_chapter_userinterface.xml
@@ -24,7 +24,7 @@
 	  Ethereal, GTK 2.x based
 	  </para></listitem>
 	  <listitem><para>
-	  Tethereal, console based
+	  TShark, console based
 	  </para></listitem>
 	</itemizedlist>
 	There are other Ethereal frontends existing, not developped nor
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml
index 6dfdd794e1..eb12804d40 100644
--- a/docbook/release-notes.xml
+++ b/docbook/release-notes.xml
@@ -146,7 +146,7 @@ Ethereal Info
 
   <section id="FileLocations"><title>File Locations</title>
     <para>
-      Ethereal and Tethereal look in several different locations for
+      Ethereal and TShark look in several different locations for
       preference files, plugins, SNMP MIBS, and RADIUS dictionaries.
       These locations vary from platform to platform.  You can use
       About->Folders to find the default locations on your system.
diff --git a/docbook/wsug_src/WSUG_app_tools.xml b/docbook/wsug_src/WSUG_app_tools.xml
index b71602aa85..0026b074fb 100644
--- a/docbook/wsug_src/WSUG_app_tools.xml
+++ b/docbook/wsug_src/WSUG_app_tools.xml
@@ -49,15 +49,15 @@ tcpdump -i &lt;interface> -s 1500 -w &lt;some-file>
 	</note>
   </section>
   
-  <section id="AppToolstethereal">
-    <title><command>tethereal</command>: Terminal-based Wireshark</title>
+  <section id="AppToolstshark">
+    <title><command>tshark</command>: Terminal-based Wireshark</title>
     <para>
-      <application>Tethereal</application> is a terminal oriented version 
+      <application>TShark</application> is a terminal oriented version 
       of ethereal 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 
-      information on <command>tethereal</command>, see the manual pages 
-      (<command>man tethereal</command>).
+      information on <command>tshark</command>, see the manual pages 
+      (<command>man tshark</command>).
     </para>
   </section>
 
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml
index 0be221e450..924552d445 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.xml
+++ b/docbook/wsug_src/WSUG_chapter_build_install.xml
@@ -554,11 +554,11 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P
 	(native Win32 look and feel, recommended).
 	</para></listitem>
 	<listitem><para>
-	<command>Tethereal</command> - Tethereal is a command-line based network 
+	<command>TShark</command> - TShark is a command-line based network 
 	protocol analyzer.
 	</para></listitem>
 	</itemizedlist>
-	The dissection extensions for Wireshark and Tethereal:
+	The dissection extensions for Wireshark and TShark:
 	<itemizedlist>
 	<listitem><para>
 	<command>Dissector Plugins</command> - Plugins with some extended dissections.
diff --git a/docbook/wsug_src/WSUG_chapter_customize.xml b/docbook/wsug_src/WSUG_chapter_customize.xml
index f97821be7a..23c333365b 100644
--- a/docbook/wsug_src/WSUG_chapter_customize.xml
+++ b/docbook/wsug_src/WSUG_chapter_customize.xml
@@ -467,7 +467,7 @@ standard libpcap format.
 	<varlistentry><term><command>-X &lt;eXtension option></command></term>
 	  <listitem>
 	    <para>
-        Specify an option to be passed to a Tethereal module. The eXtension
+        Specify an option to be passed to a TShark module. The eXtension
         option is in the form extension_key:value, where extension_key can
         be:
         </para>