ethereal->wireshark updates

svn path=/trunk/; revision=18206

8 files changed, 11 insertions, 11 deletions

diff --git a/epan/NEWS b/epan/NEWS
index 8a405279c1..1583544f6a 100644
--- a/epan/NEWS
+++ b/epan/NEWS
@@ -1,2 +1,2 @@
 epan 0.0.0:
-* Initial public release (in ethereal CVS tree)
+* Initial public release (in wireshark CVS tree)
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 390830aa8b..54945b6154 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -119,7 +119,7 @@ void get_addr_name_buf(address *addr, gchar *buf, guint size);
 /* host_name_lookup_init fires up an ADNS socket if we're using ADNS */
 extern void host_name_lookup_init(void);
 
-/* host_name_lookup_process does ADNS processing in GTK+ timeouts in Ethereal,
+/* host_name_lookup_process does ADNS processing in GTK+ timeouts in Wireshark,
    and before processing each packet in Tethereal, if we're using ADNS */
 extern gint host_name_lookup_process(gpointer data);
 
diff --git a/epan/dfilter/README.dfilter b/epan/dfilter/README.dfilter
index 4c2cb69cf9..bbec3c714d 100644
--- a/epan/dfilter/README.dfilter
+++ b/epan/dfilter/README.dfilter
@@ -92,13 +92,13 @@ Go to ethereal/epan/ftypes/
 
 Edit ftypes.h and declare the fvalue_foo(), ftype_can_foo() and fvalue_foo() methods. Add the cmp_foo() method to the struct _ftype_t.
 
-This is the first time that a make in ethereal/epan/dfilter/ can succeed. If it fails, then some code in the previously edited files must be corrected.
+This is the first time that a make in wireshark/epan/dfilter/ can succeed. If it fails, then some code in the previously edited files must be corrected.
 
 Edit ftypes.c and define the fvalue_foo() method with its associated logic. Define also the ftype_can_foo() and fvalue_foo() methods.
 
 Edit all ftype-*.c files and add the required fvalue_foo() methods.
 
-This is the point where you should be able to compile without errors in ethereal/epan/ftypes/. If not, first fix the errors.
+This is the point where you should be able to compile without errors in wireshark/epan/ftypes/. If not, first fix the errors.
 
 Go to ethereal/epan/ and run make. If this one succeeds, then we're almost done as no errors should occur here.
 
diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index 01864916d3..69c52fe1ff 100644
--- a/epan/dissectors/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
@@ -1351,7 +1351,7 @@ process_ptvc_record(ptvcursor_t *ptvc, const ptvc_record *rec,
  * of NCP request and give a sequence ID. The response, unfortunately, only
  * identifies itself via the sequence ID; you have to know what type of NCP
  * request the request packet contained in order to successfully parse the NCP
- * response. A global method for doing this does not exist in ethereal yet
+ * response. A global method for doing this does not exist in wireshark yet
  * (NFS also requires it), so for now the NCP section will keep its own hash
  * table keeping track of NCP packet types.
  *
@@ -1453,7 +1453,7 @@ ncp_req_eid_hash_cleanup(gpointer key _U_, gpointer value, gpointer user_data _U
 }
 
 /* Initializes the hash table and the mem_chunk area each time a new
- * file is loaded or re-loaded in ethereal */
+ * file is loaded or re-loaded in wireshark */
 static void
 ncp_init_protocol(void)
 {
diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l
index 8ee18560d6..25e6513fad 100644
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -199,7 +199,7 @@ squoted        ['][^\']*[']
 
 <GET_ATTR_QUOTE>. {
 	g_string_sprintfa(build_data->error,
-					"error in ethereal:protocol xmpli at %s : could not find attribute value!",
+					"error in wireshark:protocol xmpli at %s : could not find attribute value!",
 					location);
 	yyterminate();
 }
@@ -219,7 +219,7 @@ squoted        ['][^\']*[']
 	
 	if (! got_it) {
 		g_string_sprintfa(build_data->error,
-						"error in ethereal:protocol xmpli at %s : no such parameter %s!",
+						"error in wireshark:protocol xmpli at %s : no such parameter %s!",
 						location, attr_name);
 		g_free(attr_name);
 		yyterminate();
diff --git a/epan/h225-persistentdata.h b/epan/h225-persistentdata.h
index 9e60cec275..187492ea35 100644
--- a/epan/h225-persistentdata.h
+++ b/epan/h225-persistentdata.h
@@ -57,6 +57,6 @@ h225ras_call_t * find_h225ras_call(h225ras_call_info_key *h225ras_call_key ,int
 h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packet_info *pinfo, e_guid_t *guid, int category);
 h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pinfo, e_guid_t *guid, int category);
 
-void h225_init_routine(void); /* init routine, used by ethereal */
+void h225_init_routine(void); /* init routine, used by wireshark */
 
 #endif /* __h225_HASH__*/
diff --git a/epan/plugins.c b/epan/plugins.c
index 4d7b3a34ad..7d4abd5404 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -419,7 +419,7 @@ init_plugins(const char *plugin_dir)
 	 * If the program wasn't started with special privileges,
 	 * scan the users plugin directory.  (Even if we relinquish
 	 * them, plugins aren't safe unless we've *permanently*
-	 * relinquished them, and we can't do that in Ethereal as,
+	 * relinquished them, and we can't do that in Wireshark as,
 	 * if we need privileges to start capturing, we'd need to
 	 * reclaim them before each time we start capturing.)
 	 */
diff --git a/epan/timestamp.h b/epan/timestamp.h
index ac06c6b63c..03dbf70403 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -34,7 +34,7 @@ typedef enum {
 	TS_ABSOLUTE_WITH_DATE,
 	TS_DELTA,
 /*
- * Special value used for the command-line setting in Ethereal, to indicate
+ * Special value used for the command-line setting in Wireshark, to indicate
  * that no value has been set from the command line.
  */
 	TS_NOT_SET