ethereal->wireshark

svn path=/trunk/; revision=18208

7 files changed, 10 insertions, 10 deletions

diff --git a/Makefile.am b/Makefile.am
index a13b6cec26..89c7b67b8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -264,7 +264,7 @@ endif		# HAVE_PLUGINS
 # linked into the ethereal executable.
 # They will also be linked into the tethereal executable; if this
 # list ever grows to include something that can't be linked with
-# tethereal, or if tethereal needs something that ethereal doesn't,
+# tethereal, or if tethereal needs something that wireshark doesn't,
 # we should probably split this into stuff needed both
 # by wireshark and tethereal and stuff needed only by one or the
 # other.
diff --git a/configure.in b/configure.in
index 3ccd64dd9e..a1aac383f5 100644
--- a/configure.in
+++ b/configure.in
@@ -815,7 +815,7 @@ else
 fi
 
 
-dnl Check if ethereal should be installed setuid
+dnl Check if wireshark should be installed setuid
 AC_ARG_ENABLE(setuid-install,
 [  --enable-setuid-install install ethereal as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
 
diff --git a/debian/changelog b/debian/changelog
index 5e49da253d..5af0c49a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -629,7 +629,7 @@ ethereal (0.9.1-6) unstable; urgency=low
 
 ethereal (0.9.1-5) unstable; urgency=low
 
-  * debian/rules: added --disable-ssl so that ethereal is not built with
+  * debian/rules: added --disable-ssl so that wireshark is not built with
     ssl support and may be uploaded to main. (closes: #134273)
 
  -- Frederic Peters <fpeters@debian.org>  Mon, 18 Feb 2002 09:33:30 +0100
diff --git a/debian/patches/04_drop-capabilities.dpatch b/debian/patches/04_drop-capabilities.dpatch
index 45a881ef17..260df311d7 100644
--- a/debian/patches/04_drop-capabilities.dpatch
+++ b/debian/patches/04_drop-capabilities.dpatch
@@ -66,7 +66,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./configure.in /tmp/dpep-work.rT2mW8/et
 +fi
 +
 +
- dnl Check if ethereal should be installed setuid
+ dnl Check if wireshark should be installed setuid
  AC_ARG_ENABLE(setuid-install,
  [  --enable-setuid-install install ethereal as setuid. DANGEROUS!!! [default=no]],enable_setuid_install=$enableval,enable_setuid_install=no)
 @@ -1322,3 +1363,4 @@
diff --git a/doc/README.plugins b/doc/README.plugins
index 5d87beaa33..1d1f60cef5 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -196,7 +196,7 @@ The good news is that if you are working on a single plugin
 then you will find recompiling the plugin MUCH faster than 
 recompiling a dissector and then linking it back into ethereal.
 
-The bad news is that ethereal will not use the plugin unless the 
+The bad news is that wireshark will not use the plugin unless the 
 plugin is installed in one of the places it expects to look.
 
 One way to deal with this problem is to set up a working root for 
diff --git a/doc/README.xml-output b/doc/README.xml-output
index 5af7e80cde..25facda09d 100644
--- a/doc/README.xml-output
+++ b/doc/README.xml-output
@@ -8,7 +8,7 @@ Ethereal has the ability to export its protocol dissection in an
 XML format, tethereal has similar functionality by using the "-Tpdml" 
 option. 
 
-The XML that ethereal produces follows the Packet Details Markup
+The XML that wireshark produces follows the Packet Details Markup
 Language (PDML) specified by the group at the Politecnico Di Torino
 working on Analyzer. The specification can be found at:
 
@@ -27,8 +27,8 @@ be ambiguous.
 
 PDML
 ====
-The PDML that ethereal produces is known not to be loadable into Analyzer.
-It causes Analyzer to crash. As such, the PDML that ethereal produces
+The PDML that wireshark produces is known not to be loadable into Analyzer.
+It causes Analyzer to crash. As such, the PDML that wireshark produces
 is be labled with a version number of "0", which means that the PDML does
 not fully follow the PDML spec. Furthemore, a creator attribute in the
 "<pdml>" tag gives the version number of [t]ethereal that produced the PDML.
@@ -94,7 +94,7 @@ Many dissectors label the undissected payload of a protocol as belonging
 to a "data" protocol, and the "data" protocol usually resided inside
 that last protocol dissected. In the PDML, The "data" protocol becomes
 a "data" field, placed exactly where the "data" protocol is in wireshark's
-protocol tree. So, if ethereal would normally show:
+protocol tree. So, if wireshark would normally show:
 
 +-- Frame
 |
diff --git a/dtds/rss.dtd b/dtds/rss.dtd
index 70e03ebeb6..b381ea9b1e 100644
--- a/dtds/rss.dtd
+++ b/dtds/rss.dtd
@@ -1,7 +1,7 @@
 <? ethereal:protocol proto_name="rss" hierarchy="yes" ?>
 
 <!--
-    this DTD is made so that ethereal can dissect RSS up to 2.0, do not try to use it for validating RSS documents
+    this DTD is made so that wireshark can dissect RSS up to 2.0, do not try to use it for validating RSS documents
     http://blogs.law.harvard.edu/tech/rss
 -->