summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am4
-rw-r--r--plugins/acn/Makefile.am4
-rw-r--r--plugins/acn/Makefile.common4
-rw-r--r--plugins/acn/packet-acn.c4
-rw-r--r--plugins/agentx/Makefile.am4
-rw-r--r--plugins/agentx/Makefile.common4
-rw-r--r--plugins/agentx/packet-agentx.c4
-rw-r--r--plugins/artnet/Makefile.am4
-rw-r--r--plugins/artnet/Makefile.common4
-rw-r--r--plugins/artnet/packet-artnet.c4
-rw-r--r--plugins/asn1/Makefile.am4
-rw-r--r--plugins/asn1/Makefile.common4
-rw-r--r--plugins/asn1/packet-asn1.c4
-rw-r--r--plugins/ciscosm/Makefile.am4
-rw-r--r--plugins/ciscosm/Makefile.common4
-rw-r--r--plugins/ciscosm/packet-sm.c4
-rw-r--r--plugins/docsis/Makefile.am4
-rw-r--r--plugins/docsis/Makefile.common4
-rw-r--r--plugins/docsis/packet-bpkmattr.c4
-rw-r--r--plugins/docsis/packet-bpkmreq.c4
-rw-r--r--plugins/docsis/packet-bpkmrsp.c4
-rw-r--r--plugins/docsis/packet-dccack.c4
-rw-r--r--plugins/docsis/packet-dccreq.c4
-rw-r--r--plugins/docsis/packet-dccrsp.c4
-rw-r--r--plugins/docsis/packet-dcd.c4
-rw-r--r--plugins/docsis/packet-docsis.c4
-rw-r--r--plugins/docsis/packet-docsis.h4
-rw-r--r--plugins/docsis/packet-dsaack.c4
-rw-r--r--plugins/docsis/packet-dsareq.c4
-rw-r--r--plugins/docsis/packet-dsarsp.c4
-rw-r--r--plugins/docsis/packet-dscack.c4
-rw-r--r--plugins/docsis/packet-dscreq.c4
-rw-r--r--plugins/docsis/packet-dscrsp.c4
-rw-r--r--plugins/docsis/packet-dsdreq.c4
-rw-r--r--plugins/docsis/packet-dsdrsp.c4
-rw-r--r--plugins/docsis/packet-intrngreq.c4
-rw-r--r--plugins/docsis/packet-macmgmt.c4
-rw-r--r--plugins/docsis/packet-map.c4
-rw-r--r--plugins/docsis/packet-regack.c4
-rw-r--r--plugins/docsis/packet-regreq.c4
-rw-r--r--plugins/docsis/packet-regrsp.c4
-rw-r--r--plugins/docsis/packet-rngreq.c4
-rw-r--r--plugins/docsis/packet-rngrsp.c4
-rw-r--r--plugins/docsis/packet-tlv.c4
-rw-r--r--plugins/docsis/packet-tlv.h4
-rw-r--r--plugins/docsis/packet-type29ucd.c4
-rw-r--r--plugins/docsis/packet-uccreq.c4
-rw-r--r--plugins/docsis/packet-uccrsp.c4
-rw-r--r--plugins/docsis/packet-ucd.c4
-rw-r--r--plugins/docsis/packet-vendor.c4
-rw-r--r--plugins/enttec/Makefile.am4
-rw-r--r--plugins/enttec/Makefile.common4
-rw-r--r--plugins/enttec/packet-enttec.c4
-rw-r--r--plugins/giop/Makefile.am4
-rw-r--r--plugins/giop/packet-coseventcomm.c2
-rw-r--r--plugins/giop/packet-cosnaming.c2
-rw-r--r--plugins/giop/packet-parlay.c2
-rw-r--r--plugins/giop/packet-tango.c2
-rw-r--r--plugins/gryphon/Makefile.am4
-rw-r--r--plugins/gryphon/Makefile.common4
-rw-r--r--plugins/gryphon/packet-gryphon.c4
-rw-r--r--plugins/gryphon/packet-gryphon.h2
-rw-r--r--plugins/h223/Makefile.am4
-rw-r--r--plugins/h223/Makefile.common4
-rw-r--r--plugins/h223/golay.c4
-rw-r--r--plugins/h223/golay.h4
-rw-r--r--plugins/h223/packet-h223.c4
-rw-r--r--plugins/h223/packet-h223.h4
-rw-r--r--plugins/h223/packet-srp.c4
-rw-r--r--plugins/h223/packet-srp.h4
-rw-r--r--plugins/irda/Makefile.am4
-rw-r--r--plugins/irda/Makefile.common4
-rw-r--r--plugins/irda/irda-appl.h2
-rw-r--r--plugins/irda/packet-ircomm.c2
-rw-r--r--plugins/irda/packet-irda.c4
-rw-r--r--plugins/lua/Makefile.am4
-rw-r--r--plugins/lua/elua.c4
-rw-r--r--plugins/lua/elua.h4
-rw-r--r--plugins/lua/elua_dumper.c4
-rw-r--r--plugins/lua/elua_field.c4
-rw-r--r--plugins/lua/elua_gui.c4
-rwxr-xr-xplugins/lua/elua_makedoc.pl4
-rwxr-xr-xplugins/lua/elua_makereg.pl4
-rw-r--r--plugins/lua/elua_pinfo.c4
-rw-r--r--plugins/lua/elua_plugin.c4
-rw-r--r--plugins/lua/elua_proto.c4
-rw-r--r--plugins/lua/elua_tap.c4
-rw-r--r--plugins/lua/elua_tree.c4
-rw-r--r--plugins/lua/elua_tvb.c4
-rw-r--r--plugins/lua/elua_util.c4
-rwxr-xr-xplugins/lua/make-init-lua.pl4
-rw-r--r--plugins/lua/template-init.lua4
-rw-r--r--plugins/lwres/Makefile.am2
-rw-r--r--plugins/lwres/Makefile.common4
-rw-r--r--plugins/lwres/packet-lwres.c4
-rw-r--r--plugins/mate/Makefile.am4
-rw-r--r--plugins/mate/mate.h4
-rw-r--r--plugins/mate/mate_grammar.lemon4
-rw-r--r--plugins/mate/mate_parser.l4
-rw-r--r--plugins/mate/mate_plugin.c4
-rw-r--r--plugins/mate/mate_runtime.c4
-rw-r--r--plugins/mate/mate_setup.c4
-rw-r--r--plugins/mate/mate_util.c4
-rw-r--r--plugins/mate/mate_util.h4
-rw-r--r--plugins/mate/packet-mate.c4
-rw-r--r--plugins/megaco/Makefile.am4
-rw-r--r--plugins/megaco/Makefile.common4
-rw-r--r--plugins/megaco/packet-megaco.c4
-rw-r--r--plugins/mgcp/Makefile.am4
-rw-r--r--plugins/mgcp/Makefile.common4
-rw-r--r--plugins/mgcp/packet-mgcp.c4
-rw-r--r--plugins/mgcp/packet-mgcp.h4
-rw-r--r--plugins/opsi/Makefile.am4
-rw-r--r--plugins/opsi/Makefile.common4
-rw-r--r--plugins/opsi/packet-opsi.c4
-rw-r--r--plugins/opsi/packet-opsi.h4
-rw-r--r--plugins/pcli/Makefile.am4
-rw-r--r--plugins/pcli/Makefile.common4
-rw-r--r--plugins/pcli/packet-pcli.c4
-rw-r--r--plugins/profinet/Makefile.am4
-rw-r--r--plugins/profinet/Makefile.common4
-rw-r--r--plugins/profinet/packet-dcerpc-pn-io.c4
-rw-r--r--plugins/profinet/packet-pn-dcp.c4
-rw-r--r--plugins/profinet/packet-pn-ptcp.c4
-rw-r--r--plugins/rdm/Makefile.am4
-rw-r--r--plugins/rdm/Makefile.common4
-rw-r--r--plugins/rdm/packet-rdm.c4
-rw-r--r--plugins/rlm/Makefile.am4
-rw-r--r--plugins/rlm/Makefile.common4
-rw-r--r--plugins/rlm/packet-rlm.c4
-rw-r--r--plugins/rtnet/Makefile.am4
-rw-r--r--plugins/rtnet/Makefile.common4
-rw-r--r--plugins/rtnet/packet-rtnet.c4
-rw-r--r--plugins/rudp/Makefile.am4
-rw-r--r--plugins/rudp/Makefile.common4
-rw-r--r--plugins/rudp/packet-rudp.c4
-rw-r--r--plugins/stats_tree/Makefile.am4
-rw-r--r--plugins/stats_tree/pinfo_stats_tree.c4
-rw-r--r--plugins/stats_tree/pinfo_stats_tree.h4
-rw-r--r--plugins/stats_tree/stats_tree_plugin.c4
-rw-r--r--plugins/tpg/Makefile.am4
-rw-r--r--plugins/tpg/http.tpg4
-rw-r--r--plugins/v5ua/Makefile.am4
-rw-r--r--plugins/v5ua/Makefile.common4
-rw-r--r--plugins/v5ua/packet-v5ua.c4
145 files changed, 282 insertions, 282 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 7e36571163..1db25ae747 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/acn/Makefile.am b/plugins/acn/Makefile.am
index f088a1b0be..5c394c5117 100644
--- a/plugins/acn/Makefile.am
+++ b/plugins/acn/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/acn/Makefile.common b/plugins/acn/Makefile.common
index 3c2c446a5b..dbf9cf175e 100644
--- a/plugins/acn/Makefile.common
+++ b/plugins/acn/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/acn/packet-acn.c b/plugins/acn/packet-acn.c
index c572affc52..9fcea45853 100644
--- a/plugins/acn/packet-acn.c
+++ b/plugins/acn/packet-acn.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/agentx/Makefile.am b/plugins/agentx/Makefile.am
index b632b9f7e2..f7741325f4 100644
--- a/plugins/agentx/Makefile.am
+++ b/plugins/agentx/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/agentx/Makefile.common b/plugins/agentx/Makefile.common
index 27d567ccff..ce510465ba 100644
--- a/plugins/agentx/Makefile.common
+++ b/plugins/agentx/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/agentx/packet-agentx.c b/plugins/agentx/packet-agentx.c
index 2700087de1..0149d89a07 100644
--- a/plugins/agentx/packet-agentx.c
+++ b/plugins/agentx/packet-agentx.c
@@ -6,8 +6,8 @@
*
* Copyright (c) 2005 by Oleg Terletsky <oleg.terletsky@comverse.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am
index eeae82c615..0d7aef1b1c 100644
--- a/plugins/artnet/Makefile.am
+++ b/plugins/artnet/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/artnet/Makefile.common b/plugins/artnet/Makefile.common
index b4b40a8f44..392d7a7aa5 100644
--- a/plugins/artnet/Makefile.common
+++ b/plugins/artnet/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c
index 3a7a4ec394..91ea4b7ef9 100644
--- a/plugins/artnet/packet-artnet.c
+++ b/plugins/artnet/packet-artnet.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
index c5f802c7df..3a54237d6f 100644
--- a/plugins/asn1/Makefile.am
+++ b/plugins/asn1/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/asn1/Makefile.common b/plugins/asn1/Makefile.common
index 38e08cee00..29a9de3cee 100644
--- a/plugins/asn1/Makefile.common
+++ b/plugins/asn1/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 0e8a35b2d1..762794ae10 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -7,8 +7,8 @@
*
* A plugin for:
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/ciscosm/Makefile.am b/plugins/ciscosm/Makefile.am
index 110d689306..bd29735537 100644
--- a/plugins/ciscosm/Makefile.am
+++ b/plugins/ciscosm/Makefile.am
@@ -4,8 +4,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/ciscosm/Makefile.common b/plugins/ciscosm/Makefile.common
index 3db4adbb53..1667b3f54a 100644
--- a/plugins/ciscosm/Makefile.common
+++ b/plugins/ciscosm/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/ciscosm/packet-sm.c b/plugins/ciscosm/packet-sm.c
index 977d410548..9f600e41c4 100644
--- a/plugins/ciscosm/packet-sm.c
+++ b/plugins/ciscosm/packet-sm.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from WHATEVER_FILE_YOU_USED (where "WHATEVER_FILE_YOU_USED"
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index 863213d152..bc887b3361 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/Makefile.common b/plugins/docsis/Makefile.common
index 28cff17603..6061280d6c 100644
--- a/plugins/docsis/Makefile.common
+++ b/plugins/docsis/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c
index 483a0a35c3..4652d62dd5 100644
--- a/plugins/docsis/packet-bpkmattr.c
+++ b/plugins/docsis/packet-bpkmattr.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c
index eaa2be39b5..e87c2f62f8 100644
--- a/plugins/docsis/packet-bpkmreq.c
+++ b/plugins/docsis/packet-bpkmreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c
index e615b702d3..ee2ad21aad 100644
--- a/plugins/docsis/packet-bpkmrsp.c
+++ b/plugins/docsis/packet-bpkmrsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index ad16ce0fde..e55296cdea 100644
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index 2b76da30da..1f3c74d77e 100644
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index d0c15608be..d43891eecd 100644
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index 5269ee755c..1bfa44e845 100644
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 5571a6370a..29c31109b5 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-docsis.h b/plugins/docsis/packet-docsis.h
index 76fe232152..1bdb07919c 100644
--- a/plugins/docsis/packet-docsis.h
+++ b/plugins/docsis/packet-docsis.h
@@ -2,8 +2,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c
index e20c9afc09..a0841dba3f 100644
--- a/plugins/docsis/packet-dsaack.c
+++ b/plugins/docsis/packet-dsaack.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c
index 8c495fed14..ae74928360 100644
--- a/plugins/docsis/packet-dsareq.c
+++ b/plugins/docsis/packet-dsareq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c
index 725f227e58..a8a963b3a9 100644
--- a/plugins/docsis/packet-dsarsp.c
+++ b/plugins/docsis/packet-dsarsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c
index 150a2efd0b..eaa6e448f6 100644
--- a/plugins/docsis/packet-dscack.c
+++ b/plugins/docsis/packet-dscack.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c
index ae09452717..091104cfee 100644
--- a/plugins/docsis/packet-dscreq.c
+++ b/plugins/docsis/packet-dscreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c
index 8534371b13..5f126cd139 100644
--- a/plugins/docsis/packet-dscrsp.c
+++ b/plugins/docsis/packet-dscrsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c
index 4ceabf8674..586fb56ffd 100644
--- a/plugins/docsis/packet-dsdreq.c
+++ b/plugins/docsis/packet-dsdreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c
index 01460c3718..2185a44bd6 100644
--- a/plugins/docsis/packet-dsdrsp.c
+++ b/plugins/docsis/packet-dsdrsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c
index 5dc3e9063a..94504ed2d4 100644
--- a/plugins/docsis/packet-intrngreq.c
+++ b/plugins/docsis/packet-intrngreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index 62cf75128d..fbf6c2cdea 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c
index ad9b3a634a..f65be587ad 100644
--- a/plugins/docsis/packet-map.c
+++ b/plugins/docsis/packet-map.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c
index f7e87f4024..1ef5d1e26b 100644
--- a/plugins/docsis/packet-regack.c
+++ b/plugins/docsis/packet-regack.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c
index 21565aba9e..b4bceb2b74 100644
--- a/plugins/docsis/packet-regreq.c
+++ b/plugins/docsis/packet-regreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c
index 75fec0801a..36c238b938 100644
--- a/plugins/docsis/packet-regrsp.c
+++ b/plugins/docsis/packet-regrsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c
index 682f1cdc88..c0dfe477ca 100644
--- a/plugins/docsis/packet-rngreq.c
+++ b/plugins/docsis/packet-rngreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c
index 601376afca..0c5551343f 100644
--- a/plugins/docsis/packet-rngrsp.c
+++ b/plugins/docsis/packet-rngrsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index c54ef5e389..2f2836af16 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-tlv.h b/plugins/docsis/packet-tlv.h
index 16ec280419..c8a1381abf 100644
--- a/plugins/docsis/packet-tlv.h
+++ b/plugins/docsis/packet-tlv.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c
index a89e05f279..3295c86a55 100644
--- a/plugins/docsis/packet-type29ucd.c
+++ b/plugins/docsis/packet-type29ucd.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c
index d03b42b37d..d9dafd30e9 100644
--- a/plugins/docsis/packet-uccreq.c
+++ b/plugins/docsis/packet-uccreq.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c
index 2b3cf37c13..5efb27c2a5 100644
--- a/plugins/docsis/packet-uccrsp.c
+++ b/plugins/docsis/packet-uccrsp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c
index 30d2cf2aa0..d0f27bde68 100644
--- a/plugins/docsis/packet-ucd.c
+++ b/plugins/docsis/packet-ucd.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c
index 3712963ad8..7c89fde427 100644
--- a/plugins/docsis/packet-vendor.c
+++ b/plugins/docsis/packet-vendor.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/enttec/Makefile.am b/plugins/enttec/Makefile.am
index f2d5a9094f..b0e44a3cd0 100644
--- a/plugins/enttec/Makefile.am
+++ b/plugins/enttec/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/enttec/Makefile.common b/plugins/enttec/Makefile.common
index 98203ecd4e..7df0757ce6 100644
--- a/plugins/enttec/Makefile.common
+++ b/plugins/enttec/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/enttec/packet-enttec.c b/plugins/enttec/packet-enttec.c
index 86d66ad28e..727fe6f2c2 100644
--- a/plugins/enttec/packet-enttec.c
+++ b/plugins/enttec/packet-enttec.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2003,2004 by Erwin Rol <erwin@erwinrol.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am
index dc3d68f15b..3ce21a01d2 100644
--- a/plugins/giop/Makefile.am
+++ b/plugins/giop/Makefile.am
@@ -6,8 +6,8 @@
# Copyright 2001, Ericsson Inc.
# Frank Singleton <frank.singleton@ericsson.com>
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c
index 6e3404e189..1e66c82ade 100644
--- a/plugins/giop/packet-coseventcomm.c
+++ b/plugins/giop/packet-coseventcomm.c
@@ -7,7 +7,7 @@
/*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
*/
diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c
index a26f657b02..42d2fee19a 100644
--- a/plugins/giop/packet-cosnaming.c
+++ b/plugins/giop/packet-cosnaming.c
@@ -7,7 +7,7 @@
/*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
*/
diff --git a/plugins/giop/packet-parlay.c b/plugins/giop/packet-parlay.c
index 810c77b702..e28e414fa1 100644
--- a/plugins/giop/packet-parlay.c
+++ b/plugins/giop/packet-parlay.c
@@ -7,7 +7,7 @@
/*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
*/
diff --git a/plugins/giop/packet-tango.c b/plugins/giop/packet-tango.c
index a7cabec6b0..a6f443aa76 100644
--- a/plugins/giop/packet-tango.c
+++ b/plugins/giop/packet-tango.c
@@ -7,7 +7,7 @@
/*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
*/
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index dacd3125b9..0c7f436201 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/gryphon/Makefile.common b/plugins/gryphon/Makefile.common
index 0ed9798987..687889622f 100644
--- a/plugins/gryphon/Makefile.common
+++ b/plugins/gryphon/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index cfe50083fd..753a271cb4 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/gryphon/packet-gryphon.h b/plugins/gryphon/packet-gryphon.h
index 01f3f25fab..8bba0ea9d4 100644
--- a/plugins/gryphon/packet-gryphon.h
+++ b/plugins/gryphon/packet-gryphon.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Steve Limkemann <stevelim@dgtech.com>
* Copyright 1998 Steve Limkemann
*
diff --git a/plugins/h223/Makefile.am b/plugins/h223/Makefile.am
index 26e8bb7df1..1956cd88af 100644
--- a/plugins/h223/Makefile.am
+++ b/plugins/h223/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/h223/Makefile.common b/plugins/h223/Makefile.common
index 08c5f54adf..c691c816a0 100644
--- a/plugins/h223/Makefile.common
+++ b/plugins/h223/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/h223/golay.c b/plugins/h223/golay.c
index 85eb540635..3de2062269 100644
--- a/plugins/h223/golay.c
+++ b/plugins/h223/golay.c
@@ -6,8 +6,8 @@
* This implementation will detect up to 4 errors in a codeword (without
* being able to correct them); it will correct up to 3 errors.
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/h223/golay.h b/plugins/h223/golay.h
index 4413c673bc..1a6e7994a8 100644
--- a/plugins/h223/golay.h
+++ b/plugins/h223/golay.h
@@ -10,8 +10,8 @@
* the bottom 12 bits and the parity in bits 12-23.
*
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/h223/packet-h223.c b/plugins/h223/packet-h223.c
index 495e790a7c..9b6a532769 100644
--- a/plugins/h223/packet-h223.c
+++ b/plugins/h223/packet-h223.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/h223/packet-h223.h b/plugins/h223/packet-h223.h
index 513f162306..9f00cfdeb6 100644
--- a/plugins/h223/packet-h223.h
+++ b/plugins/h223/packet-h223.h
@@ -3,8 +3,8 @@
* Routines for H.223 packet dissection
* 2004 Richard van der Hoff <richardv@mxtelecom.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/h223/packet-srp.c b/plugins/h223/packet-srp.c
index bf0d33a1b7..f79d5692f7 100644
--- a/plugins/h223/packet-srp.c
+++ b/plugins/h223/packet-srp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/h223/packet-srp.h b/plugins/h223/packet-srp.h
index be0906e7f5..1402e3f4ab 100644
--- a/plugins/h223/packet-srp.h
+++ b/plugins/h223/packet-srp.h
@@ -4,8 +4,8 @@
*
* 2004 Richard van der Hoff <richardv@mxtelecom.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
index 773a6ea450..3b48264d50 100644
--- a/plugins/irda/Makefile.am
+++ b/plugins/irda/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/irda/Makefile.common b/plugins/irda/Makefile.common
index 92b0a50ba3..1a6445f2b0 100644
--- a/plugins/irda/Makefile.common
+++ b/plugins/irda/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/irda/irda-appl.h b/plugins/irda/irda-appl.h
index 038be597a3..b171f81f46 100644
--- a/plugins/irda/irda-appl.h
+++ b/plugins/irda/irda-appl.h
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
* Copyright 1998 Gerald Combs
*
diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c
index 20f2c96ded..062797b4fb 100644
--- a/plugins/irda/packet-ircomm.c
+++ b/plugins/irda/packet-ircomm.c
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@unicom.net>
* Copyright 1998 Gerald Combs
*
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index db757e60be..def83e109a 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -8,8 +8,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/Makefile.am b/plugins/lua/Makefile.am
index 929cf166ae..9f30246adb 100644
--- a/plugins/lua/Makefile.am
+++ b/plugins/lua/Makefile.am
@@ -2,8 +2,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua.c b/plugins/lua/elua.c
index f39d563812..6564688237 100644
--- a/plugins/lua/elua.c
+++ b/plugins/lua/elua.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua.h b/plugins/lua/elua.h
index 17a9f5ae9d..03d4b588c9 100644
--- a/plugins/lua/elua.h
+++ b/plugins/lua/elua.h
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_dumper.c b/plugins/lua/elua_dumper.c
index 6f667cd5c3..202bcacf09 100644
--- a/plugins/lua/elua_dumper.c
+++ b/plugins/lua/elua_dumper.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_field.c b/plugins/lua/elua_field.c
index 34cda992bd..37d3fed17b 100644
--- a/plugins/lua/elua_field.c
+++ b/plugins/lua/elua_field.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_gui.c b/plugins/lua/elua_gui.c
index 719ab52d8d..fd9b384137 100644
--- a/plugins/lua/elua_gui.c
+++ b/plugins/lua/elua_gui.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_makedoc.pl b/plugins/lua/elua_makedoc.pl
index 891996496c..e0814cb77d 100755
--- a/plugins/lua/elua_makedoc.pl
+++ b/plugins/lua/elua_makedoc.pl
@@ -7,8 +7,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_makereg.pl b/plugins/lua/elua_makereg.pl
index a7807fcde7..a4a9021f99 100755
--- a/plugins/lua/elua_makereg.pl
+++ b/plugins/lua/elua_makereg.pl
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_pinfo.c b/plugins/lua/elua_pinfo.c
index af870ca861..37b2e85688 100644
--- a/plugins/lua/elua_pinfo.c
+++ b/plugins/lua/elua_pinfo.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_plugin.c b/plugins/lua/elua_plugin.c
index b9b7caee2e..6f646c23a5 100644
--- a/plugins/lua/elua_plugin.c
+++ b/plugins/lua/elua_plugin.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_proto.c b/plugins/lua/elua_proto.c
index 7819741a59..5a3c4bd6f8 100644
--- a/plugins/lua/elua_proto.c
+++ b/plugins/lua/elua_proto.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_tap.c b/plugins/lua/elua_tap.c
index 4f62a7b3ab..3ed4eb5fd8 100644
--- a/plugins/lua/elua_tap.c
+++ b/plugins/lua/elua_tap.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_tree.c b/plugins/lua/elua_tree.c
index f6694656af..e2d8e23074 100644
--- a/plugins/lua/elua_tree.c
+++ b/plugins/lua/elua_tree.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_tvb.c b/plugins/lua/elua_tvb.c
index 5e867a90e9..1cbb61badb 100644
--- a/plugins/lua/elua_tvb.c
+++ b/plugins/lua/elua_tvb.c
@@ -7,8 +7,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/elua_util.c b/plugins/lua/elua_util.c
index 68b86f4c67..f8790f413f 100644
--- a/plugins/lua/elua_util.c
+++ b/plugins/lua/elua_util.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/make-init-lua.pl b/plugins/lua/make-init-lua.pl
index 35ef3c507d..67d9599664 100755
--- a/plugins/lua/make-init-lua.pl
+++ b/plugins/lua/make-init-lua.pl
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/lua/template-init.lua b/plugins/lua/template-init.lua
index 3bd105dade..d1b139f4af 100644
--- a/plugins/lua/template-init.lua
+++ b/plugins/lua/template-init.lua
@@ -7,8 +7,8 @@
--
-- $Id$
--
--- Ethereal - Network traffic analyzer
--- By Gerald Combs <gerald@ethereal.com>
+-- Wireshark - Network traffic analyzer
+-- By Gerald Combs <gerald@wireshark.org>
-- Copyright 1998 Gerald Combs
--
-- This program is free software; you can redistribute it and/or
diff --git a/plugins/lwres/Makefile.am b/plugins/lwres/Makefile.am
index 858065f3b5..4d5b653f8e 100644
--- a/plugins/lwres/Makefile.am
+++ b/plugins/lwres/Makefile.am
@@ -3,7 +3,7 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer / light waight resolver (part of Bind9)
+# Wireshark - Network traffic analyzer / light waight resolver (part of Bind9)
# By Steve Oleg Terletsky <oleg.terletsky@comverse.com>
# Copyright 2003
#
diff --git a/plugins/lwres/Makefile.common b/plugins/lwres/Makefile.common
index c094695285..a7364840bd 100644
--- a/plugins/lwres/Makefile.common
+++ b/plugins/lwres/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/lwres/packet-lwres.c b/plugins/lwres/packet-lwres.c
index 2fd5f2de05..721a5c9961 100644
--- a/plugins/lwres/packet-lwres.c
+++ b/plugins/lwres/packet-lwres.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2003 by Oleg Terletsky <oleg.terletsky@comverse.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 45a4d56dbc..c4f45378b6 100644
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate.h b/plugins/mate/mate.h
index 7b12625aa0..efadd1c512 100644
--- a/plugins/mate/mate.h
+++ b/plugins/mate/mate.h
@@ -5,8 +5,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate_grammar.lemon b/plugins/mate/mate_grammar.lemon
index e9b542cdff..b575b49634 100644
--- a/plugins/mate/mate_grammar.lemon
+++ b/plugins/mate/mate_grammar.lemon
@@ -7,8 +7,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index 5d8818e331..aa4fdf3cf9 100644
--- a/plugins/mate/mate_parser.l
+++ b/plugins/mate/mate_parser.l
@@ -12,8 +12,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate_plugin.c b/plugins/mate/mate_plugin.c
index af8ecba96a..6e6da421d3 100644
--- a/plugins/mate/mate_plugin.c
+++ b/plugins/mate/mate_plugin.c
@@ -5,8 +5,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate_runtime.c b/plugins/mate/mate_runtime.c
index 6de9024466..99bea688de 100644
--- a/plugins/mate/mate_runtime.c
+++ b/plugins/mate/mate_runtime.c
@@ -5,8 +5,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c
index 89752be8cd..95ccd8e26d 100644
--- a/plugins/mate/mate_setup.c
+++ b/plugins/mate/mate_setup.c
@@ -5,8 +5,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate_util.c b/plugins/mate/mate_util.c
index 1856f34d4d..7108c215e4 100644
--- a/plugins/mate/mate_util.c
+++ b/plugins/mate/mate_util.c
@@ -6,8 +6,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/mate_util.h b/plugins/mate/mate_util.h
index 01eb9fa9bb..3f6f7daf51 100644
--- a/plugins/mate/mate_util.h
+++ b/plugins/mate/mate_util.h
@@ -4,8 +4,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c
index bdfd371bbe..3de641a568 100644
--- a/plugins/mate/packet-mate.c
+++ b/plugins/mate/packet-mate.c
@@ -5,8 +5,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/megaco/Makefile.am b/plugins/megaco/Makefile.am
index 1183201f77..51db06c6d1 100644
--- a/plugins/megaco/Makefile.am
+++ b/plugins/megaco/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/megaco/Makefile.common b/plugins/megaco/Makefile.common
index 79df353589..cd8d723ad4 100644
--- a/plugins/megaco/Makefile.common
+++ b/plugins/megaco/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c
index 6f59a49825..c66498e571 100644
--- a/plugins/megaco/packet-megaco.c
+++ b/plugins/megaco/packet-megaco.c
@@ -18,8 +18,8 @@
* <karl.knoebl@siemens.com>
* provide info to COL_INFO and some "prettification"
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mgcp/Makefile.am b/plugins/mgcp/Makefile.am
index 206ac4da4a..cf8f67fac9 100644
--- a/plugins/mgcp/Makefile.am
+++ b/plugins/mgcp/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/mgcp/Makefile.common b/plugins/mgcp/Makefile.common
index fcac38b9cb..75302c2380 100644
--- a/plugins/mgcp/Makefile.common
+++ b/plugins/mgcp/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index 2377ed8c74..956504c41c 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -14,8 +14,8 @@
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
* Copyright (c) 2004 by Thomas Anders <thomas.anders [AT] blue-cable.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/mgcp/packet-mgcp.h b/plugins/mgcp/packet-mgcp.h
index e01adce9ac..65f4a72198 100644
--- a/plugins/mgcp/packet-mgcp.h
+++ b/plugins/mgcp/packet-mgcp.h
@@ -6,8 +6,8 @@
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/opsi/Makefile.am b/plugins/opsi/Makefile.am
index ea833222e7..4d5f42c97f 100644
--- a/plugins/opsi/Makefile.am
+++ b/plugins/opsi/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/opsi/Makefile.common b/plugins/opsi/Makefile.common
index d9e6877e19..65d2da38b1 100644
--- a/plugins/opsi/Makefile.common
+++ b/plugins/opsi/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/opsi/packet-opsi.c b/plugins/opsi/packet-opsi.c
index a985746dad..6be06c57a4 100644
--- a/plugins/opsi/packet-opsi.c
+++ b/plugins/opsi/packet-opsi.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/opsi/packet-opsi.h b/plugins/opsi/packet-opsi.h
index c83da77b35..de2fae21f6 100644
--- a/plugins/opsi/packet-opsi.h
+++ b/plugins/opsi/packet-opsi.h
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/pcli/Makefile.am b/plugins/pcli/Makefile.am
index 2fcdd070b7..bb7b70e4e9 100644
--- a/plugins/pcli/Makefile.am
+++ b/plugins/pcli/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/pcli/Makefile.common b/plugins/pcli/Makefile.common
index ccd47a16ca..c3f546dee2 100644
--- a/plugins/pcli/Makefile.common
+++ b/plugins/pcli/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/pcli/packet-pcli.c b/plugins/pcli/packet-pcli.c
index cb75364b64..2ea26b07b9 100644
--- a/plugins/pcli/packet-pcli.c
+++ b/plugins/pcli/packet-pcli.c
@@ -8,8 +8,8 @@
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
index 191c1578b8..5648640510 100644
--- a/plugins/profinet/Makefile.am
+++ b/plugins/profinet/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/profinet/Makefile.common b/plugins/profinet/Makefile.common
index b6a92bc785..1a8cbb4507 100644
--- a/plugins/profinet/Makefile.common
+++ b/plugins/profinet/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 17b470501e..f146a8f02b 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -3,8 +3,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index b4214f4371..c8f662b380 100644
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index f21794caac..7c26266d0b 100644
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/rdm/Makefile.am b/plugins/rdm/Makefile.am
index e19e104ca0..f63f99556f 100644
--- a/plugins/rdm/Makefile.am
+++ b/plugins/rdm/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rdm/Makefile.common b/plugins/rdm/Makefile.common
index 698e9b6a90..7c61698bfc 100644
--- a/plugins/rdm/Makefile.common
+++ b/plugins/rdm/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rdm/packet-rdm.c b/plugins/rdm/packet-rdm.c
index 7482c84e8c..1effef215b 100644
--- a/plugins/rdm/packet-rdm.c
+++ b/plugins/rdm/packet-rdm.c
@@ -5,8 +5,8 @@
*
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/rlm/Makefile.am b/plugins/rlm/Makefile.am
index 2ef1e642e1..f8a668f3df 100644
--- a/plugins/rlm/Makefile.am
+++ b/plugins/rlm/Makefile.am
@@ -4,8 +4,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rlm/Makefile.common b/plugins/rlm/Makefile.common
index d1a26db3b9..37e1329980 100644
--- a/plugins/rlm/Makefile.common
+++ b/plugins/rlm/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rlm/packet-rlm.c b/plugins/rlm/packet-rlm.c
index e813b4c626..cbe18d69e4 100644
--- a/plugins/rlm/packet-rlm.c
+++ b/plugins/rlm/packet-rlm.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/rtnet/Makefile.am b/plugins/rtnet/Makefile.am
index acb836b7bf..d849b18ffc 100644
--- a/plugins/rtnet/Makefile.am
+++ b/plugins/rtnet/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rtnet/Makefile.common b/plugins/rtnet/Makefile.common
index a129077cba..7dad68d582 100644
--- a/plugins/rtnet/Makefile.common
+++ b/plugins/rtnet/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rtnet/packet-rtnet.c b/plugins/rtnet/packet-rtnet.c
index 72bf9ebd6d..5801752e95 100644
--- a/plugins/rtnet/packet-rtnet.c
+++ b/plugins/rtnet/packet-rtnet.c
@@ -6,8 +6,8 @@
* Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com>
* Copyright (c) 2004 by Jan Kiszka <jan.kiszka@web.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/rudp/Makefile.am b/plugins/rudp/Makefile.am
index e360d9b401..d3aed66b50 100644
--- a/plugins/rudp/Makefile.am
+++ b/plugins/rudp/Makefile.am
@@ -4,8 +4,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rudp/Makefile.common b/plugins/rudp/Makefile.common
index 4d95f0b63f..c75f987170 100644
--- a/plugins/rudp/Makefile.common
+++ b/plugins/rudp/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/rudp/packet-rudp.c b/plugins/rudp/packet-rudp.c
index cb45972501..21b332f8c9 100644
--- a/plugins/rudp/packet-rudp.c
+++ b/plugins/rudp/packet-rudp.c
@@ -4,8 +4,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* Copied from packet-data.c, README.developer, and various other files.
diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index f1b46882f2..00d0faba14 100644
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c
index 1a9aea6e25..4706c77609 100644
--- a/plugins/stats_tree/pinfo_stats_tree.c
+++ b/plugins/stats_tree/pinfo_stats_tree.c
@@ -5,8 +5,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/stats_tree/pinfo_stats_tree.h b/plugins/stats_tree/pinfo_stats_tree.h
index 33d81f03ec..6dbe23bcfe 100644
--- a/plugins/stats_tree/pinfo_stats_tree.h
+++ b/plugins/stats_tree/pinfo_stats_tree.h
@@ -5,8 +5,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c
index b3b8b36ce1..4230190690 100644
--- a/plugins/stats_tree/stats_tree_plugin.c
+++ b/plugins/stats_tree/stats_tree_plugin.c
@@ -4,8 +4,8 @@
*
* $Id$
*
-* Ethereal - Network traffic analyzer
-* By Gerald Combs <gerald@ethereal.com>
+* Wireshark - Network traffic analyzer
+* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am
index 6d30985476..7482d0cc7e 100644
--- a/plugins/tpg/Makefile.am
+++ b/plugins/tpg/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/tpg/http.tpg b/plugins/tpg/http.tpg
index 8b9b65cd3d..7ca1de2912 100644
--- a/plugins/tpg/http.tpg
+++ b/plugins/tpg/http.tpg
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 2004 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/v5ua/Makefile.am b/plugins/v5ua/Makefile.am
index 0a683e06f9..0506e246ca 100644
--- a/plugins/v5ua/Makefile.am
+++ b/plugins/v5ua/Makefile.am
@@ -3,8 +3,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/v5ua/Makefile.common b/plugins/v5ua/Makefile.common
index 4cc220a67d..e5ce9f541b 100644
--- a/plugins/v5ua/Makefile.common
+++ b/plugins/v5ua/Makefile.common
@@ -5,8 +5,8 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald@ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/plugins/v5ua/packet-v5ua.c b/plugins/v5ua/packet-v5ua.c
index a87ae634cb..45e3084312 100644
--- a/plugins/v5ua/packet-v5ua.c
+++ b/plugins/v5ua/packet-v5ua.c
@@ -6,8 +6,8 @@
*
* Christoph Neusch <christoph.neusch@nortelnetworks.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or