A few more ethereal --> wireshark

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20559 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.h.win32 b/config.h.win32
index c9f8b884acb6ff4ec0008e2054e7bec82f878038..1be2f1856ee70d555ddf0b5049a04152f14caf4b 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -40,7 +40,7 @@
 /* Plugins can also use the import library of libwireshark.dll instead
    of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE 
    for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally.
-   Thus Ethereal will be still able to load plugins using the old API. 
+   Thus Wireshark will be still able to load plugins using the old API. 
    The macro HAVE_WIN32_LIBWIRESHARK_LIB has to be defined in plugin's 
    makefile.nmake. A template is available in doc/README.plugins */
 #ifdef HAVE_WIN32_LIBWIRESHARK_LIB

diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index f5e41d232c1ebf903e8f3e6dbe8bbfde97abc437..998395d10f7b6adf614577a558dd8c0c01a7dd0b 100644 (file)
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -321,7 +321,7 @@ dissect_pft_fec_detailed(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
 
 
 /** Handle a PFT packet which has the fragmentation header. This uses the
- * standard ethereal methods for reassembling fragments. If FEC is used,
+ * standard wireshark methods for reassembling fragments. If FEC is used,
  * the FEC is handled too. For the moment, all the fragments must be
  * available but this could be improved.
  *  \param[in,out] tvb The buffer containing the current fragment

diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 55ccea197500c2a7bac18102edf6bdb97a257ceb..2cd8e0b960bc8163c2124123e590d7d5e60ce0d1 100644 (file)
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -658,7 +658,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      * packets.
      *
      * Handling the single ssl record across multiple packets
-     * may be possible using ethereal conversations, but
+     * may be possible using wireshark conversations, but
      * probably not cleanly.  May have to wait for tcp stream
      * reassembly.
      */

diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 8bcbeba2d86178557d3d5444b3e21424503e5da8..faaf29602b6e369acdaf8a1e4edd322840a4bf68 100644 (file)
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -1,4 +1,4 @@
-## Makefile for building ethereal.exe with Microsoft C and nmake
+## Makefile for building wireshark.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
 # $Id$

diff --git a/epan/wslua/template-init.lua b/epan/wslua/template-init.lua
index 8128f014097e434c20bc9fad7747dfde5ba13e3a..ad40451b7fa2467d6c8c3e225978439eac4cbeec 100644 (file)
--- a/epan/wslua/template-init.lua
+++ b/epan/wslua/template-init.lua
@@ -1,6 +1,6 @@
 -- init.lua
 --
--- initilaize ethereal's lua
+-- initialize wireshark's lua
 --
 --  This file is going to be executed before any other lua script.
 --  It can be used to load libraries, disable functions and more.

diff --git a/version_info.c b/version_info.c
index 4f7c38d8682e5a9828994dfce30aadcf795f4dc0..2cc11381bb2ee315c135eb0bec9f0aabf89cfbaa 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -165,7 +165,7 @@ get_compiled_version_info(GString *str, void (*additional_info)(GString *))
 
 /*
  * Get compile-time information used only by applications that use
- * libethereal.
+ * libwireshark.
  */
 void
 get_epan_compiled_version_info(GString *str)

diff --git a/version_info.h b/version_info.h
index 1d58787cd356fd771b14a1736a1dacbc1466e75e..6c3ef82d73f02eef3bea76dbb0dc4b90c611e7a2 100644 (file)
--- a/version_info.h
+++ b/version_info.h
@@ -49,7 +49,7 @@ void get_compiled_version_info(GString *str,
 
 /*
  * Get compile-time information used only by applications that use
- * libethereal.
+ * libwireshark.
  */
 void get_epan_compiled_version_info(GString *str);