ethereal->wireshark

svn path=/trunk/; revision=18207

8 files changed, 10 insertions, 10 deletions

diff --git a/doc/README.developer b/doc/README.developer
index ce2c00d66e..1e14507622 100644
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -185,7 +185,7 @@ and, if you're including it to get routines such as "open()", "close()",
 
 in order to declare the Windows C library routines "_open()",
 "_close()", "_read()", and "_write()".  Your file must include <glib.h>
-- which many of the Ethereal header files include, so you might not have
+- which many of the Wireshark header files include, so you might not have
 to include it explicitly - in order to get "open()", "close()",
 "read()", "write()", etc. mapped to "_open()", "_close()", "_read()",
 "_write()", etc..
@@ -301,7 +301,7 @@ mechanisms that are present in GLib 1.2[.x] and GTK+ 1.2[.x], use #if's
 to conditionally use older or newer mechanisms depending on the platform
 on which Wireshark is being built, or, if the code in GLib or GTK+ that
 implements that mechanism will build with GLib 1.2[.x]/GTK+ 1.2[.x],
-conditionally include that code as part of the Ethereal source and use
+conditionally include that code as part of the Wireshark source and use
 the included version with GLib 1.2[.x] or GTK+ 1.2[.x].  In particular,
 if the GLib 2.x or GTK+ 2.x mechanism indicates that a routine is
 deprecated and shouldn't be used in new code, and that it was renamed in
diff --git a/doc/README.packaging b/doc/README.packaging
index df866a03c0..0208a69955 100644
--- a/doc/README.packaging
+++ b/doc/README.packaging
@@ -7,7 +7,7 @@ distributing a software package containing Ethereal:
 
     http://www.ethereal.com/distribution/all-versions/ethereal-0.55.71.tar.bz2
 
-    If your packaging system downloads a copy of the Ethereal sources,
+    If your packaging system downloads a copy of the Wireshark sources,
     use this location.
 
 2.  The Wireshark web site URL is http://www.ethereal.com/ .
@@ -22,7 +22,7 @@ distributing a software package containing Ethereal:
     you use this to differentiate your package from official Ethereal
     releases.
 
-6.  Ethereal icons can be found in the "image" directory of the Ethereal 
+6.  Ethereal icons can be found in the "image" directory of the Wireshark 
     sources.  Larger versions of the logo can be found at
     http://www.ethereal.com/~gerald/ethereal_logo/povray/ .
 
diff --git a/doc/capinfos.pod b/doc/capinfos.pod
index 9848ad65ed..740462c71b 100644
--- a/doc/capinfos.pod
+++ b/doc/capinfos.pod
@@ -113,7 +113,7 @@ I<tcpdump(8)>, I<pcap(3)>, I<ethereal(1)>, I<mergecap(1)>, I<editcap(1)>, I<teth
 B<Capinfos> is part of the B<Ethereal> distribution.  The latest version
 of B<Ethereal> can be found at B<http://www.ethereal.com>.
 
-HTML versions of the Ethereal project man pages are available at:
+HTML versions of the Wireshark project man pages are available at:
 http://www.ethereal.com/docs/man-pages
 
 =head1 AUTHORS
diff --git a/doc/dumpcap.pod b/doc/dumpcap.pod
index 3ddfb24351..216f7fdefa 100644
--- a/doc/dumpcap.pod
+++ b/doc/dumpcap.pod
@@ -205,7 +205,7 @@ I<ethereal(1)>, I<tethereal(1)>, I<editcap(1)>, I<tcpdump(8)>, I<pcap(3)>
 B<Dumpcap> is part of the B<Ethereal> distribution.  The latest version
 of B<Ethereal> can be found at B<http://www.ethereal.com>.
 
-HTML versions of the Ethereal project man pages are available at:
+HTML versions of the Wireshark project man pages are available at:
 http://www.ethereal.com/docs/man-pages
 
 =head1 AUTHORS
diff --git a/doc/editcap.pod b/doc/editcap.pod
index f2b7212a7a..79127d14a1 100644
--- a/doc/editcap.pod
+++ b/doc/editcap.pod
@@ -206,7 +206,7 @@ I<tcpdump(8)>, I<pcap(3)>, I<ethereal(1)>, I<mergecap(1)>
 B<Editcap> is part of the B<Ethereal> distribution.  The latest version
 of B<Ethereal> can be found at B<http://www.ethereal.com>.
 
-HTML versions of the Ethereal project man pages are available at:
+HTML versions of the Wireshark project man pages are available at:
 http://www.ethereal.com/docs/man-pages
 
 =head1 AUTHORS
diff --git a/doc/ethereal.pod b/doc/ethereal.pod
index 674c20c069..261b514892 100644
--- a/doc/ethereal.pod
+++ b/doc/ethereal.pod
@@ -1223,7 +1223,7 @@ right mouse button (on those platforms that have a right
 mouse button) ethereal will display a popup menu offering several different 
 filter operations to apply to the capture.
 
-These statistics windows can also be invoked from the Ethereal command
+These statistics windows can also be invoked from the Wireshark command
 line using the B<-z conv> argument. 
 
 =item Statistics:Service Response Time:DCE-RPC
diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index bcbc745bf1..168117c07d 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -130,7 +130,7 @@ B<Mergecap> is based heavily upon B<editcap> by Richard Sharpe
 B<Mergecap> is part of the B<Ethereal> distribution.  The latest version
 of B<Ethereal> can be found at B<http://www.ethereal.com>.
 
-HTML versions of the Ethereal project man pages are available at:
+HTML versions of the Wireshark project man pages are available at:
 http://www.ethereal.com/docs/man-pages
 
 =head1 AUTHORS
diff --git a/doc/tethereal.pod b/doc/tethereal.pod
index b37880586a..b5bfb8188e 100644
--- a/doc/tethereal.pod
+++ b/doc/tethereal.pod
@@ -864,7 +864,7 @@ I<ethereal-filter(4)> I<ethereal(1)>, I<editcap(1)>, I<tcpdump(8)>, I<pcap(3)>
 B<Tethereal> is part of the B<Ethereal> distribution.  The latest version
 of B<Ethereal> can be found at B<http://www.ethereal.com>.
 
-HTML versions of the Ethereal project man pages are available at:
+HTML versions of the Wireshark project man pages are available at:
 http://www.ethereal.com/docs/man-pages
 
 =head1 AUTHORS