aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.common4
-rw-r--r--alert_box.c4
-rw-r--r--alert_box.h4
-rw-r--r--asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c4
-rw-r--r--asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.h4
-rw-r--r--asn1/acp133/packet-acp133-template.c4
-rw-r--r--asn1/acp133/packet-acp133-template.h4
-rw-r--r--asn1/acse/packet-acse-template.c4
-rw-r--r--asn1/acse/packet-acse-template.h4
-rw-r--r--asn1/ansi_map/packet-ansi_map-template.c4
-rw-r--r--asn1/ansi_map/packet-ansi_map-template.h4
-rw-r--r--asn1/camel/packet-camel-template.c4
-rw-r--r--asn1/camel/packet-camel-template.h6
-rw-r--r--asn1/cdt/packet-cdt-template.c4
-rw-r--r--asn1/cdt/packet-cdt-template.h4
-rw-r--r--asn1/cmip/packet-cmip-template.c4
-rw-r--r--asn1/cmip/packet-cmip-template.h4
-rw-r--r--asn1/cms/packet-cms-template.c4
-rw-r--r--asn1/cms/packet-cms-template.h4
-rw-r--r--asn1/dap/packet-dap-template.c4
-rw-r--r--asn1/dap/packet-dap-template.h4
-rw-r--r--asn1/disp/packet-disp-template.c4
-rw-r--r--asn1/disp/packet-disp-template.h4
-rw-r--r--asn1/dop/packet-dop-template.c4
-rw-r--r--asn1/dop/packet-dop-template.h4
-rw-r--r--asn1/dsp/packet-dsp-template.c4
-rw-r--r--asn1/dsp/packet-dsp-template.h4
-rw-r--r--asn1/ess/packet-ess-template.c4
-rw-r--r--asn1/ess/packet-ess-template.h4
-rw-r--r--asn1/ftam/packet-ftam-template.c4
-rw-r--r--asn1/ftam/packet-ftam-template.h4
-rw-r--r--asn1/ftbp/packet-ftbp-template.c4
-rw-r--r--asn1/ftbp/packet-ftbp-template.h4
-rw-r--r--asn1/gnm/packet-gnm-template.c4
-rw-r--r--asn1/gnm/packet-gnm-template.h4
-rw-r--r--asn1/gsm_ss/packet-gsm_ss-template.c4
-rw-r--r--asn1/gsm_ss/packet-gsm_ss-template.h4
-rw-r--r--asn1/gsmmap/packet-gsm_map-template.c4
-rw-r--r--asn1/gsmmap/packet-gsm_map-template.h4
-rw-r--r--asn1/h225/packet-h225-template.c4
-rw-r--r--asn1/h225/packet-h225-template.h4
-rw-r--r--asn1/h235/packet-h235-template.c4
-rw-r--r--asn1/h235/packet-h235-template.h4
-rw-r--r--asn1/h245/packet-h245-template.c4
-rw-r--r--asn1/h245/packet-h245-template.h4
-rw-r--r--asn1/h248/packet-h248-template.c4
-rw-r--r--asn1/h248/packet-h248-template.h4
-rw-r--r--asn1/h450/packet-h450-template.c4
-rw-r--r--asn1/h450/packet-h450-template.h4
-rw-r--r--asn1/inap/packet-inap-template.c4
-rw-r--r--asn1/inap/packet-inap-template.h4
-rw-r--r--asn1/ldap/packet-ldap-template.c4
-rw-r--r--asn1/ldap/packet-ldap-template.h4
-rw-r--r--asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c4
-rw-r--r--asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h4
-rw-r--r--asn1/mms/packet-mms-template.c4
-rw-r--r--asn1/mms/packet-mms-template.h4
-rw-r--r--asn1/nbap/packet-nbap-template.c4
-rw-r--r--asn1/nbap/packet-nbap-template.h4
-rw-r--r--asn1/ns-cert-exts/packet-ns_cert_exts-template.c4
-rw-r--r--asn1/ns-cert-exts/packet-ns_cert_exts-template.h4
-rw-r--r--asn1/ocsp/packet-ocsp-template.c4
-rw-r--r--asn1/ocsp/packet-ocsp-template.h4
-rw-r--r--asn1/pkcs1/packet-pkcs1-template.c4
-rw-r--r--asn1/pkcs1/packet-pkcs1-template.h4
-rw-r--r--asn1/pkinit/packet-pkinit-template.c4
-rw-r--r--asn1/pkinit/packet-pkinit-template.h4
-rw-r--r--asn1/pkix1explicit/packet-pkix1explicit-template.c4
-rw-r--r--asn1/pkix1explicit/packet-pkix1explicit-template.h4
-rw-r--r--asn1/pkix1implicit/packet-pkix1implicit-template.c4
-rw-r--r--asn1/pkix1implicit/packet-pkix1implicit-template.h4
-rw-r--r--asn1/pkixcmp/packet-cmp-template.c4
-rw-r--r--asn1/pkixcmp/packet-cmp-template.h4
-rw-r--r--asn1/pkixcrmf/packet-crmf-template.c4
-rw-r--r--asn1/pkixcrmf/packet-crmf-template.h4
-rw-r--r--asn1/pkixproxy/packet-pkixproxy-template.c4
-rw-r--r--asn1/pkixproxy/packet-pkixproxy-template.h4
-rw-r--r--asn1/pkixqualified/packet-pkixqualified-template.c4
-rw-r--r--asn1/pkixqualified/packet-pkixqualified-template.h4
-rw-r--r--asn1/pkixtsp/packet-pkixtsp-template.c4
-rw-r--r--asn1/pkixtsp/packet-pkixtsp-template.h4
-rw-r--r--asn1/pres/packet-pres-template.c4
-rw-r--r--asn1/pres/packet-pres-template.h4
-rw-r--r--asn1/ranap/packet-ranap-template.c4
-rw-r--r--asn1/ranap/packet-ranap-template.h4
-rw-r--r--asn1/rnsap/packet-rnsap-template.c4
-rw-r--r--asn1/rnsap/packet-rnsap-template.h4
-rw-r--r--asn1/ros/packet-ros-template.c4
-rw-r--r--asn1/ros/packet-ros-template.h4
-rw-r--r--asn1/rrlp/packet-rrlp-template.c4
-rw-r--r--asn1/rrlp/packet-rrlp-template.h4
-rw-r--r--asn1/rtse/packet-rtse-template.c4
-rw-r--r--asn1/rtse/packet-rtse-template.h4
-rw-r--r--asn1/s4406/packet-s4406-template.c4
-rw-r--r--asn1/s4406/packet-s4406-template.h4
-rw-r--r--asn1/smrse/packet-smrse-template.c4
-rw-r--r--asn1/smrse/packet-smrse-template.h4
-rw-r--r--asn1/snmp/packet-snmp-template.c4
-rw-r--r--asn1/snmp/packet-snmp-template.h4
-rw-r--r--asn1/spnego/packet-spnego-template.c4
-rw-r--r--asn1/spnego/packet-spnego-template.h4
-rw-r--r--asn1/tcap/packet-tcap-template.c4
-rw-r--r--asn1/tcap/packet-tcap-template.h4
-rw-r--r--asn1/ulp/packet-ulp-template.c4
-rw-r--r--asn1/ulp/packet-ulp-template.h4
-rw-r--r--asn1/wlancertextn/packet-wlancertextn-template.c4
-rw-r--r--asn1/wlancertextn/packet-wlancertextn-template.h4
-rw-r--r--asn1/x411/packet-x411-template.c4
-rw-r--r--asn1/x411/packet-x411-template.h4
-rw-r--r--asn1/x420/packet-x420-template.c4
-rw-r--r--asn1/x420/packet-x420-template.h4
-rw-r--r--asn1/x509af/packet-x509af-template.c4
-rw-r--r--asn1/x509af/packet-x509af-template.h4
-rw-r--r--asn1/x509ce/packet-x509ce-template.c4
-rw-r--r--asn1/x509ce/packet-x509ce-template.h4
-rw-r--r--asn1/x509if/packet-x509if-template.c4
-rw-r--r--asn1/x509if/packet-x509if-template.h4
-rw-r--r--asn1/x509sat/packet-x509sat-template.c4
-rw-r--r--asn1/x509sat/packet-x509sat-template.h4
-rw-r--r--capinfos.c4
-rw-r--r--capture-pcap-util-int.h4
-rw-r--r--capture-pcap-util-unix.c4
-rw-r--r--capture-pcap-util.c4
-rw-r--r--capture-pcap-util.h4
-rw-r--r--capture-wpcap.c4
-rw-r--r--capture-wpcap.h2
-rw-r--r--capture.c4
-rw-r--r--capture.h4
-rw-r--r--capture_errs.c4
-rw-r--r--capture_errs.h4
-rw-r--r--capture_info.c4
-rw-r--r--capture_info.h4
-rw-r--r--capture_opts.c4
-rw-r--r--capture_opts.h4
-rw-r--r--capture_stop_conditions.c4
-rw-r--r--capture_stop_conditions.h4
-rw-r--r--capture_sync.c4
-rw-r--r--capture_sync.h4
-rw-r--r--capture_ui_utils.c4
-rw-r--r--capture_ui_utils.h4
-rw-r--r--capture_wpcap_packet.c4
-rw-r--r--capture_wpcap_packet.h2
-rw-r--r--cfile.c4
-rw-r--r--cfile.h4
-rw-r--r--clopts_common.c4
-rw-r--r--clopts_common.h4
-rw-r--r--cmdarg_err.h4
-rw-r--r--color.h4
-rw-r--r--color_filters.c4
-rw-r--r--color_filters.h4
-rw-r--r--conditions.c4
-rw-r--r--conditions.h4
-rw-r--r--debian/copyright2
-rw-r--r--debian/patches/01_idl2deb.dpatch4
-rw-r--r--debian/patches/02_asn2deb.dpatch4
-rw-r--r--dftest.c4
-rw-r--r--disabled_protos.c4
-rw-r--r--disabled_protos.h2
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/Makefile.nmake4
-rw-r--r--doc/README.developer6
-rw-r--r--doc/README.stats_tree2
-rw-r--r--docbook/eug_src/EUG_chapter_customize.xml2
-rw-r--r--dumpcap.c4
-rw-r--r--epan/Makefile.am4
-rw-r--r--epan/Makefile.common4
-rw-r--r--epan/addr_and_mask.c4
-rw-r--r--epan/addr_and_mask.h4
-rw-r--r--epan/addr_resolv.c4
-rw-r--r--epan/addr_resolv.h4
-rw-r--r--epan/address.h4
-rw-r--r--epan/adler32.c4
-rw-r--r--epan/adler32.h4
-rw-r--r--epan/afn.c4
-rw-r--r--epan/afn.h4
-rw-r--r--epan/aftypes.h4
-rw-r--r--epan/arcnet_pids.h4
-rw-r--r--epan/arptypes.h4
-rw-r--r--epan/asn1.c4
-rw-r--r--epan/asn1.h4
-rw-r--r--epan/base64.c4
-rw-r--r--epan/base64.h4
-rw-r--r--epan/bitswap.c2
-rw-r--r--epan/bitswap.h2
-rw-r--r--epan/bridged_pids.h4
-rw-r--r--epan/charsets.c4
-rw-r--r--epan/charsets.h4
-rw-r--r--epan/chdlctypes.h4
-rw-r--r--epan/circuit.c4
-rw-r--r--epan/circuit.h4
-rw-r--r--epan/column-utils.c4
-rw-r--r--epan/column-utils.h4
-rw-r--r--epan/column.c4
-rw-r--r--epan/column.h4
-rw-r--r--epan/column_info.h4
-rw-r--r--epan/conversation.c4
-rw-r--r--epan/conversation.h4
-rw-r--r--epan/crc16.c2
-rw-r--r--epan/crc16.h2
-rw-r--r--epan/crc32.c4
-rw-r--r--epan/crc32.h4
-rw-r--r--epan/dfilter/Makefile.am2
-rw-r--r--epan/dfilter/dfilter-int.h4
-rw-r--r--epan/dfilter/dfilter.c4
-rw-r--r--epan/dfilter/dfilter.h4
-rw-r--r--epan/dfilter/dfunctions.c2
-rw-r--r--epan/dfilter/dfunctions.h2
-rw-r--r--epan/dfilter/dfvm.c4
-rw-r--r--epan/dfilter/dfvm.h4
-rw-r--r--epan/dfilter/drange.c2
-rw-r--r--epan/dfilter/drange.h2
-rw-r--r--epan/dfilter/gencode.c4
-rw-r--r--epan/dfilter/scanner.l4
-rw-r--r--epan/dfilter/semcheck.c4
-rw-r--r--epan/dfilter/semcheck.h2
-rw-r--r--epan/dfilter/sttype-function.c2
-rw-r--r--epan/dfilter/sttype-function.h2
-rw-r--r--epan/dfilter/sttype-integer.c2
-rw-r--r--epan/dfilter/sttype-pointer.c2
-rw-r--r--epan/dfilter/sttype-range.c4
-rw-r--r--epan/dfilter/sttype-range.h2
-rw-r--r--epan/dfilter/sttype-string.c2
-rw-r--r--epan/dfilter/sttype-test.c2
-rw-r--r--epan/dfilter/sttype-test.h2
-rw-r--r--epan/dfilter/syntax-tree.c4
-rw-r--r--epan/dfilter/syntax-tree.h4
-rw-r--r--epan/dissectors/Makefile.am4
-rw-r--r--epan/dissectors/Makefile.common4
-rw-r--r--epan/dissectors/dcerpc/budb/template.c4
-rw-r--r--epan/dissectors/dcerpc/budb/template.h4
-rw-r--r--epan/dissectors/dcerpc/butc/template.c4
-rw-r--r--epan/dissectors/dcerpc/butc/template.h4
-rw-r--r--epan/dissectors/dcerpc/drsuapi/template.c4
-rw-r--r--epan/dissectors/dcerpc/drsuapi/template.h4
-rw-r--r--epan/dissectors/dcerpc/efs/template.c4
-rw-r--r--epan/dissectors/dcerpc/efs/template.h4
-rw-r--r--epan/dissectors/packet-ncp2222.inc4
-rw-r--r--epan/dissectors/process-x11-fields.pl4
-rw-r--r--epan/dissectors/x11-fields4
-rw-r--r--epan/dtd.h4
-rw-r--r--epan/dtd_grammar.lemon4
-rw-r--r--epan/dtd_parse.h4
-rw-r--r--epan/dtd_parse.l4
-rw-r--r--epan/dtd_preparse.l4
-rw-r--r--epan/emem.c4
-rw-r--r--epan/emem.h4
-rw-r--r--epan/epan.c2
-rw-r--r--epan/epan.h4
-rw-r--r--epan/epan_dissect.h4
-rw-r--r--epan/etypes.h4
-rw-r--r--epan/ex-opt.c4
-rw-r--r--epan/ex-opt.h4
-rw-r--r--epan/expert.c4
-rw-r--r--epan/expert.h4
-rw-r--r--epan/filesystem.c6
-rw-r--r--epan/filesystem.h4
-rw-r--r--epan/follow.c4
-rw-r--r--epan/follow.h6
-rw-r--r--epan/frame_data.c2
-rw-r--r--epan/frame_data.h4
-rw-r--r--epan/ftypes/Makefile.am2
-rw-r--r--epan/ftypes/ftype-bytes.c4
-rw-r--r--epan/ftypes/ftype-double.c4
-rw-r--r--epan/ftypes/ftype-guid.c4
-rw-r--r--epan/ftypes/ftype-integer.c4
-rw-r--r--epan/ftypes/ftype-ipv4.c4
-rw-r--r--epan/ftypes/ftype-none.c4
-rw-r--r--epan/ftypes/ftype-pcre.c4
-rw-r--r--epan/ftypes/ftype-string.c4
-rw-r--r--epan/ftypes/ftype-time.c4
-rw-r--r--epan/ftypes/ftype-tvbuff.c4
-rw-r--r--epan/ftypes/ftypes-int.h4
-rw-r--r--epan/ftypes/ftypes.c4
-rw-r--r--epan/ftypes/ftypes.h4
-rw-r--r--epan/funnel.c4
-rw-r--r--epan/funnel.h4
-rw-r--r--epan/gnuc_format_check.h4
-rw-r--r--epan/greproto.h4
-rw-r--r--epan/guid-utils.h4
-rw-r--r--epan/h225-persistentdata.c8
-rw-r--r--epan/h225-persistentdata.h6
-rw-r--r--epan/iax2_codec_type.h4
-rw-r--r--epan/inet_aton.h2
-rw-r--r--epan/inet_v6defs.h4
-rw-r--r--epan/ip_opts.h4
-rw-r--r--epan/ipproto.c4
-rw-r--r--epan/ipproto.h4
-rw-r--r--epan/ipv4.c4
-rw-r--r--epan/ipv4.h4
-rw-r--r--epan/ipv6-utils.h4
-rw-r--r--epan/lapd_sapi.h4
-rw-r--r--epan/llcsaps.h4
-rwxr-xr-xepan/make-sminmpec.pl4
-rw-r--r--epan/nlpid.h4
-rw-r--r--epan/nstime.c4
-rw-r--r--epan/nstime.h4
-rw-r--r--epan/oid_resolv.c4
-rw-r--r--epan/oid_resolv.h4
-rw-r--r--epan/osi-utils.c4
-rw-r--r--epan/osi-utils.h4
-rw-r--r--epan/oui.h4
-rw-r--r--epan/packet.c4
-rw-r--r--epan/packet.h4
-rw-r--r--epan/packet_info.h4
-rw-r--r--epan/pint.h2
-rw-r--r--epan/plugins.c10
-rw-r--r--epan/plugins.h4
-rw-r--r--epan/ppptypes.h4
-rw-r--r--epan/prefs-int.h6
-rw-r--r--epan/prefs.c14
-rw-r--r--epan/prefs.h4
-rw-r--r--epan/privileges.c4
-rw-r--r--epan/privileges.h4
-rw-r--r--epan/proto.c8
-rw-r--r--epan/proto.h16
-rw-r--r--epan/ptvcursor.h4
-rw-r--r--epan/radius_dict.l4
-rw-r--r--epan/range.c4
-rw-r--r--epan/range.h4
-rw-r--r--epan/reassemble.c4
-rw-r--r--epan/reassemble.h4
-rw-r--r--epan/report_err.h4
-rw-r--r--epan/req_resp_hdrs.c4
-rw-r--r--epan/req_resp_hdrs.h4
-rw-r--r--epan/rtp_pt.h4
-rw-r--r--epan/sctpppids.h4
-rw-r--r--epan/sigcomp-udvm.c4
-rw-r--r--epan/sigcomp-udvm.h4
-rw-r--r--epan/sigcomp_state_hdlr.c4
-rw-r--r--epan/sigcomp_state_hdlr.h4
-rw-r--r--epan/slab.h4
-rw-r--r--epan/sminmpec.h4
-rw-r--r--epan/sna-utils.c4
-rw-r--r--epan/stat_cmd_args.c4
-rw-r--r--epan/stat_cmd_args.h4
-rw-r--r--epan/stats_tree.c4
-rw-r--r--epan/stats_tree.h4
-rw-r--r--epan/stats_tree_priv.h4
-rw-r--r--epan/stream.c4
-rw-r--r--epan/stream.h4
-rw-r--r--epan/strutil.c4
-rw-r--r--epan/strutil.h4
-rw-r--r--epan/t35.c4
-rw-r--r--epan/t35.h4
-rw-r--r--epan/tap.c6
-rw-r--r--epan/tap.h6
-rw-r--r--epan/timestamp.c4
-rw-r--r--epan/timestamp.h4
-rw-r--r--epan/to_str.c4
-rw-r--r--epan/to_str.h4
-rw-r--r--epan/tpg.c4
-rw-r--r--epan/tpg.h4
-rw-r--r--epan/tvbparse.c4
-rw-r--r--epan/tvbparse.h4
-rw-r--r--epan/tvbuff.c16
-rw-r--r--epan/tvbuff.h6
-rw-r--r--epan/value_string.c4
-rw-r--r--epan/value_string.h4
-rw-r--r--epan/x264_prt_id.h4
-rw-r--r--epan/xdlc.c4
-rw-r--r--epan/xdlc.h4
-rw-r--r--epan/xmlstub.c4
-rw-r--r--ethereal_gen.py2
-rw-r--r--file.c4
-rw-r--r--file.h4
-rw-r--r--fileset.c4
-rw-r--r--fileset.h4
-rw-r--r--filters.c4
-rw-r--r--filters.h2
-rw-r--r--g711.h4
-rw-r--r--globals.h4
-rw-r--r--gtk/Makefile.am4
-rw-r--r--gtk/Makefile.common4
-rw-r--r--gtk/about_dlg.c8
-rw-r--r--gtk/about_dlg.h4
-rw-r--r--gtk/afp_stat.c4
-rw-r--r--gtk/ansi_a_stat.c4
-rw-r--r--gtk/ansi_map_stat.c4
-rw-r--r--gtk/bootp_stat.c4
-rw-r--r--gtk/capture_dlg.c4
-rw-r--r--gtk/capture_dlg.h2
-rw-r--r--gtk/capture_file_dlg.c4
-rw-r--r--gtk/capture_file_dlg.h4
-rw-r--r--gtk/capture_if_details_dlg.c4
-rw-r--r--gtk/capture_if_details_dlg.h4
-rw-r--r--gtk/capture_if_dlg.c4
-rw-r--r--gtk/capture_info_dlg.c4
-rw-r--r--gtk/capture_prefs.c4
-rw-r--r--gtk/capture_prefs.h4
-rw-r--r--gtk/cfilter_combo_utils.c4
-rw-r--r--gtk/cfilter_combo_utils.h4
-rw-r--r--gtk/color_dlg.c4
-rw-r--r--gtk/color_dlg.h4
-rw-r--r--gtk/color_utils.c4
-rw-r--r--gtk/colors.c4
-rw-r--r--gtk/colors.h4
-rw-r--r--gtk/column_prefs.c4
-rw-r--r--gtk/column_prefs.h2
-rw-r--r--gtk/compat_macros.h4
-rw-r--r--gtk/conversations_eth.c4
-rw-r--r--gtk/conversations_fc.c4
-rw-r--r--gtk/conversations_fddi.c4
-rw-r--r--gtk/conversations_ip.c4
-rw-r--r--gtk/conversations_ipx.c4
-rw-r--r--gtk/conversations_jxta.c4
-rw-r--r--gtk/conversations_ncp.c4
-rw-r--r--gtk/conversations_rsvp.c4
-rw-r--r--gtk/conversations_sctp.c4
-rw-r--r--gtk/conversations_table.c4
-rw-r--r--gtk/conversations_table.h4
-rw-r--r--gtk/conversations_tcpip.c4
-rw-r--r--gtk/conversations_tr.c4
-rw-r--r--gtk/conversations_udpip.c4
-rw-r--r--gtk/conversations_wlan.c4
-rw-r--r--gtk/dcerpc_stat.c4
-rw-r--r--gtk/dfilter_expr_dlg.c4
-rw-r--r--gtk/dfilter_expr_dlg.h2
-rw-r--r--gtk/dlg_utils.c4
-rw-r--r--gtk/dlg_utils.h4
-rw-r--r--gtk/drag_and_drop.c4
-rw-r--r--gtk/expert_comp_dlg.c4
-rw-r--r--gtk/expert_comp_table.c4
-rw-r--r--gtk/expert_comp_table.h4
-rw-r--r--gtk/expert_dlg.c4
-rw-r--r--gtk/fc_stat.c4
-rw-r--r--gtk/file_dlg.c4
-rw-r--r--gtk/file_dlg.h4
-rw-r--r--gtk/fileset_dlg.c4
-rw-r--r--gtk/fileset_dlg.h4
-rw-r--r--gtk/filter_dlg.c4
-rw-r--r--gtk/filter_dlg.h4
-rw-r--r--gtk/find_dlg.c4
-rw-r--r--gtk/find_dlg.h2
-rw-r--r--gtk/flow_graph.c4
-rw-r--r--gtk/follow_dlg.c4
-rw-r--r--gtk/follow_dlg.h2
-rw-r--r--gtk/font_utils.c4
-rw-r--r--gtk/font_utils.h4
-rw-r--r--gtk/funnel_stat.c4
-rw-r--r--gtk/goto_dlg.c4
-rw-r--r--gtk/goto_dlg.h2
-rw-r--r--gtk/graph_analysis.c4
-rw-r--r--gtk/graph_analysis.h4
-rw-r--r--gtk/gsm_a_stat.c4
-rw-r--r--gtk/gsm_map_stat.c4
-rw-r--r--gtk/gsm_map_stat.h4
-rw-r--r--gtk/gsm_map_summary.c4
-rw-r--r--gtk/gtkglobals.h4
-rw-r--r--gtk/gui_prefs.c4
-rw-r--r--gtk/gui_prefs.h2
-rw-r--r--gtk/gui_stat_menu.h4
-rw-r--r--gtk/gui_stat_util.c4
-rw-r--r--gtk/gui_stat_util.h4
-rw-r--r--gtk/gui_utils.c4
-rw-r--r--gtk/gui_utils.h4
-rw-r--r--gtk/h225_counter.c4
-rw-r--r--gtk/h225_ras_srt.c4
-rw-r--r--gtk/help_dlg.c4
-rw-r--r--gtk/help_dlg.h2
-rw-r--r--gtk/hostlist_eth.c4
-rw-r--r--gtk/hostlist_fc.c4
-rw-r--r--gtk/hostlist_fddi.c4
-rw-r--r--gtk/hostlist_ip.c4
-rw-r--r--gtk/hostlist_ipx.c4
-rw-r--r--gtk/hostlist_jxta.c4
-rw-r--r--gtk/hostlist_ncp.c4
-rw-r--r--gtk/hostlist_rsvp.c4
-rw-r--r--gtk/hostlist_table.c4
-rw-r--r--gtk/hostlist_table.h4
-rw-r--r--gtk/hostlist_tcpip.c4
-rw-r--r--gtk/hostlist_tr.c4
-rw-r--r--gtk/hostlist_udpip.c4
-rw-r--r--gtk/hostlist_wlan.c4
-rw-r--r--gtk/io_stat.c4
-rw-r--r--gtk/isprint.h4
-rw-r--r--gtk/keys.h4
-rw-r--r--gtk/layout_prefs.c4
-rw-r--r--gtk/layout_prefs.h4
-rw-r--r--gtk/ldap_stat.c4
-rw-r--r--gtk/main.c4
-rw-r--r--gtk/main.h4
-rw-r--r--gtk/mcast_stream.c4
-rw-r--r--gtk/mcast_stream.h4
-rw-r--r--gtk/mcast_stream_dlg.c4
-rw-r--r--gtk/mcast_stream_dlg.h4
-rw-r--r--gtk/menu.c4
-rw-r--r--gtk/menu.h4
-rw-r--r--gtk/mgcp_stat.c4
-rw-r--r--gtk/mtp3_stat.c4
-rw-r--r--gtk/mtp3_stat.h4
-rw-r--r--gtk/mtp3_summary.c4
-rw-r--r--gtk/nameres_prefs.c4
-rw-r--r--gtk/nameres_prefs.h4
-rw-r--r--gtk/ncp_stat.c4
-rw-r--r--gtk/packet_history.c4
-rw-r--r--gtk/packet_history.h4
-rw-r--r--gtk/packet_list.c4
-rw-r--r--gtk/packet_list.h4
-rw-r--r--gtk/packet_win.c4
-rw-r--r--gtk/packet_win.h2
-rw-r--r--gtk/plugins_dlg.c4
-rw-r--r--gtk/plugins_dlg.h4
-rw-r--r--gtk/prefs_dlg.c4
-rw-r--r--gtk/prefs_dlg.h4
-rw-r--r--gtk/print_dlg.c4
-rw-r--r--gtk/print_mswin.c4
-rw-r--r--gtk/print_mswin.h4
-rw-r--r--gtk/print_prefs.c4
-rw-r--r--gtk/print_prefs.h2
-rw-r--r--gtk/progress_dlg.c4
-rw-r--r--gtk/proto_dlg.c4
-rw-r--r--gtk/proto_dlg.h2
-rw-r--r--gtk/proto_draw.c4
-rw-r--r--gtk/proto_draw.h4
-rw-r--r--gtk/proto_hier_stats_dlg.c4
-rw-r--r--gtk/proto_hier_stats_dlg.h2
-rw-r--r--gtk/range_utils.c4
-rw-r--r--gtk/range_utils.h4
-rw-r--r--gtk/recent.c4
-rw-r--r--gtk/recent.h4
-rw-r--r--gtk/rpc_progs.c4
-rw-r--r--gtk/rpc_stat.c4
-rw-r--r--gtk/rtp_analysis.c4
-rw-r--r--gtk/rtp_analysis.h4
-rw-r--r--gtk/rtp_stream.c4
-rw-r--r--gtk/rtp_stream.h4
-rw-r--r--gtk/rtp_stream_dlg.c4
-rw-r--r--gtk/rtp_stream_dlg.h4
-rw-r--r--gtk/sat.h4
-rw-r--r--gtk/scsi_stat.c4
-rw-r--r--gtk/sctp_assoc_analyse.c4
-rw-r--r--gtk/sctp_byte_graph_dlg.c4
-rw-r--r--gtk/sctp_chunk_stat.c4
-rw-r--r--gtk/sctp_chunk_stat_dlg.c4
-rw-r--r--gtk/sctp_error_dlg.c4
-rw-r--r--gtk/sctp_graph_dlg.c4
-rw-r--r--gtk/sctp_stat.c4
-rw-r--r--gtk/sctp_stat.h4
-rw-r--r--gtk/sctp_stat_dlg.c4
-rw-r--r--gtk/service_response_time_table.c4
-rw-r--r--gtk/service_response_time_table.h4
-rw-r--r--gtk/simple_dialog.c4
-rw-r--r--gtk/sip_stat.c4
-rw-r--r--gtk/smb2_stat.c4
-rw-r--r--gtk/smb_stat.c4
-rw-r--r--gtk/ssl-dlg.h4
-rw-r--r--gtk/stats_tree_stat.c4
-rw-r--r--gtk/stream_prefs.c4
-rw-r--r--gtk/stream_prefs.h2
-rw-r--r--gtk/summary_dlg.c4
-rw-r--r--gtk/summary_dlg.h2
-rw-r--r--gtk/supported_protos_dlg.c4
-rw-r--r--gtk/supported_protos_dlg.h2
-rw-r--r--gtk/t38_analysis.c4
-rw-r--r--gtk/tap_dfilter_dlg.c4
-rw-r--r--gtk/tcp_graph.c4
-rw-r--r--gtk/text_page.c4
-rw-r--r--gtk/text_page.h4
-rw-r--r--gtk/toolbar.c4
-rw-r--r--gtk/toolbar.h4
-rw-r--r--gtk/voip_calls.c4
-rw-r--r--gtk/voip_calls.h4
-rw-r--r--gtk/voip_calls_dlg.c4
-rw-r--r--gtk/voip_calls_dlg.h4
-rw-r--r--gtk/webbrowser.h4
-rw-r--r--gtk/win32-file-dlg.c4
-rw-r--r--gtk/wsp_stat.c4
-rw-r--r--help/Makefile.am4
-rw-r--r--image/capinfos.rc.in2
-rw-r--r--image/dumpcap.rc.in2
-rw-r--r--image/editcap.rc.in2
-rw-r--r--image/ethereal.rc.in2
-rw-r--r--image/libethereal.rc.in2
-rw-r--r--image/mergecap.rc.in2
-rw-r--r--image/tethereal.rc.in2
-rw-r--r--image/wiretap.rc.in2
-rw-r--r--isprint.h4
-rw-r--r--log.h4
-rw-r--r--main_window.h4
-rwxr-xr-xmake-version.pl4
-rw-r--r--manuf4
-rw-r--r--manuf.tmpl2
-rw-r--r--menu.h4
-rw-r--r--merge.h4
-rw-r--r--packaging/svr4/pkginfo.in2
-rw-r--r--packet-range.c4
-rw-r--r--packet-range.h4
-rw-r--r--pcapio.c4
-rw-r--r--pcapio.h4
-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
-rw-r--r--print.c4
-rw-r--r--print.h4
-rw-r--r--print.ps4
-rw-r--r--progress_dlg.h4
-rw-r--r--proto_hier_stats.c4
-rw-r--r--proto_hier_stats.h4
-rw-r--r--ps.h4
-rw-r--r--rdps.c4
-rw-r--r--register.h4
-rw-r--r--ringbuffer.c4
-rw-r--r--ringbuffer.h4
-rw-r--r--simple_dialog.h4
-rw-r--r--stat_menu.h4
-rw-r--r--statusbar.h4
-rw-r--r--strerror.c4
-rw-r--r--strerror.h2
-rw-r--r--strptime.h4
-rw-r--r--summary.c4
-rw-r--r--summary.h4
-rw-r--r--sync_pipe.h4
-rw-r--r--sync_pipe_write.c4
-rw-r--r--tap-afpstat.c4
-rw-r--r--tap-ansi_astat.c4
-rw-r--r--tap-bootpstat.c4
-rw-r--r--tap-dcerpcstat.c4
-rw-r--r--tap-gsm_astat.c4
-rw-r--r--tap-h225counter.c4
-rw-r--r--tap-h225rassrt.c4
-rw-r--r--tap-httpstat.c4
-rw-r--r--tap-iostat.c4
-rw-r--r--tap-iousers.c4
-rw-r--r--tap-mgcpstat.c4
-rw-r--r--tap-protocolinfo.c4
-rw-r--r--tap-protohierstat.c4
-rw-r--r--tap-rpcprogs.c4
-rw-r--r--tap-rpcstat.c4
-rw-r--r--tap-sctpchunkstat.c4
-rw-r--r--tap-sipstat.c4
-rw-r--r--tap-smbsids.c4
-rw-r--r--tap-smbstat.c4
-rw-r--r--tap-stats_tree.c4
-rw-r--r--tap-wspstat.c4
-rw-r--r--tap_dfilter_dlg.h4
-rw-r--r--tempfile.c4
-rw-r--r--tempfile.h4
-rw-r--r--test/config.sh4
-rw-r--r--test/suite-capture.sh4
-rw-r--r--test/suite-clopts.sh4
-rw-r--r--test/suite-io.sh4
-rw-r--r--test/test-backend.sh4
-rw-r--r--test/test.sh4
-rw-r--r--tethereal.c4
-rw-r--r--text2pcap-scanner.l4
-rw-r--r--text2pcap.c4
-rw-r--r--text2pcap.h4
-rw-r--r--timestats.c4
-rw-r--r--timestats.h4
-rw-r--r--tools/Makefile.am4
-rwxr-xr-xtools/checkhf.pl4
-rw-r--r--tools/lemon/Makefile.am2
-rw-r--r--tools/tpg/Makefile.am2
-rw-r--r--tools/tpg/V2P.pm4
-rw-r--r--tools/tpg/tpg.pl4
-rw-r--r--tools/tpg/tpg.yp4
-rwxr-xr-xtools/unix2dos.pl4
-rw-r--r--ui_util.h4
-rw-r--r--util.c4
-rw-r--r--util.h4
-rw-r--r--version_info.c6
-rw-r--r--version_info.h4
-rw-r--r--wiretap/Makefile.am4
-rw-r--r--wiretap/Makefile.common4
-rw-r--r--wiretap/ascend-int.h4
-rw-r--r--wiretap/file_util.h4
-rw-r--r--wka.tmpl2
810 files changed, 1588 insertions, 1588 deletions
diff --git a/Makefile.am b/Makefile.am
index 6a54fa280f..3089533a3d 100644
--- a/Makefile.am
+++ b/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/Makefile.common b/Makefile.common
index 36f8ef43a2..c8615a6dc5 100644
--- a/Makefile.common
+++ b/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/alert_box.c b/alert_box.c
index 911ae255e5..966b002e57 100644
--- a/alert_box.c
+++ b/alert_box.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/alert_box.h b/alert_box.h
index 0cac35bd71..53531e8455 100644
--- a/alert_box.h
+++ b/alert_box.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/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
index be76663a90..067f182a9e 100644
--- a/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.c
+++ b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.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/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.h b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.h
index 211faff321..1342d5609d 100644
--- a/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.h
+++ b/asn1/MAP_Dialogue/packet-MAP-DialoguePDU-template.h
@@ -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/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
index 6443a5d0ea..c3d47d6dfe 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.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/asn1/acp133/packet-acp133-template.h b/asn1/acp133/packet-acp133-template.h
index 31e8e29425..f90fd5262c 100644
--- a/asn1/acp133/packet-acp133-template.h
+++ b/asn1/acp133/packet-acp133-template.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/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index 7218dff4c2..a341d33164 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -15,8 +15,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/asn1/acse/packet-acse-template.h b/asn1/acse/packet-acse-template.h
index 6b9622eff5..2c81eff7e7 100644
--- a/asn1/acse/packet-acse-template.h
+++ b/asn1/acse/packet-acse-template.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/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index ce8758c02d..c397c5f3a0 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -9,8 +9,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/asn1/ansi_map/packet-ansi_map-template.h b/asn1/ansi_map/packet-ansi_map-template.h
index 6510966321..53caf12a60 100644
--- a/asn1/ansi_map/packet-ansi_map-template.h
+++ b/asn1/ansi_map/packet-ansi_map-template.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/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index 1fa73d9a98..7a3c5e3fbc 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -9,8 +9,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/asn1/camel/packet-camel-template.h b/asn1/camel/packet-camel-template.h
index f042634246..90314d26e7 100644
--- a/asn1/camel/packet-camel-template.h
+++ b/asn1/camel/packet-camel-template.h
@@ -4,10 +4,10 @@
* Copyright 2005, Olivier Jacques <olivier.jacques@hp.com>
* Built from the gsm-map dissector Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
- * $Id:$
+ * $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/asn1/cdt/packet-cdt-template.c b/asn1/cdt/packet-cdt-template.c
index f8a7fb090f..3a9750dcbb 100644
--- a/asn1/cdt/packet-cdt-template.c
+++ b/asn1/cdt/packet-cdt-template.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/asn1/cdt/packet-cdt-template.h b/asn1/cdt/packet-cdt-template.h
index 8ec0fc596c..ade487413b 100644
--- a/asn1/cdt/packet-cdt-template.h
+++ b/asn1/cdt/packet-cdt-template.h
@@ -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/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index 4799c55980..a69354ea76 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.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/asn1/cmip/packet-cmip-template.h b/asn1/cmip/packet-cmip-template.h
index 4b0cfa5e00..b7cd653849 100644
--- a/asn1/cmip/packet-cmip-template.h
+++ b/asn1/cmip/packet-cmip-template.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/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index 62b4b7bf45..5fcde83df6 100644
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.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/asn1/cms/packet-cms-template.h b/asn1/cms/packet-cms-template.h
index 6284c15eef..f840dcac86 100644
--- a/asn1/cms/packet-cms-template.h
+++ b/asn1/cms/packet-cms-template.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/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index 70a3ce74ac..d2fb2049f0 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.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/asn1/dap/packet-dap-template.h b/asn1/dap/packet-dap-template.h
index 536eca33dd..fef18c9aa7 100644
--- a/asn1/dap/packet-dap-template.h
+++ b/asn1/dap/packet-dap-template.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/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 3870a42ca2..ab4a1055e8 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.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/asn1/disp/packet-disp-template.h b/asn1/disp/packet-disp-template.h
index bb6f8f3503..75e3ddb5a0 100644
--- a/asn1/disp/packet-disp-template.h
+++ b/asn1/disp/packet-disp-template.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/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c
index 701d2b26ea..6b371a3c16 100644
--- a/asn1/dop/packet-dop-template.c
+++ b/asn1/dop/packet-dop-template.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/asn1/dop/packet-dop-template.h b/asn1/dop/packet-dop-template.h
index 198f056a41..502d41cdc6 100644
--- a/asn1/dop/packet-dop-template.h
+++ b/asn1/dop/packet-dop-template.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/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
index 29a118b513..085b24331b 100644
--- a/asn1/dsp/packet-dsp-template.c
+++ b/asn1/dsp/packet-dsp-template.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/asn1/dsp/packet-dsp-template.h b/asn1/dsp/packet-dsp-template.h
index b72a44789b..5505b892be 100644
--- a/asn1/dsp/packet-dsp-template.h
+++ b/asn1/dsp/packet-dsp-template.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/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c
index 477522e0fd..4fe269da24 100644
--- a/asn1/ess/packet-ess-template.c
+++ b/asn1/ess/packet-ess-template.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/asn1/ess/packet-ess-template.h b/asn1/ess/packet-ess-template.h
index 076ed8c2bf..15243f330a 100644
--- a/asn1/ess/packet-ess-template.h
+++ b/asn1/ess/packet-ess-template.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/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c
index 131136e1f3..66d33238ef 100644
--- a/asn1/ftam/packet-ftam-template.c
+++ b/asn1/ftam/packet-ftam-template.c
@@ -9,8 +9,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/asn1/ftam/packet-ftam-template.h b/asn1/ftam/packet-ftam-template.h
index 1ee4af8288..6bb42cceba 100644
--- a/asn1/ftam/packet-ftam-template.h
+++ b/asn1/ftam/packet-ftam-template.h
@@ -9,8 +9,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/asn1/ftbp/packet-ftbp-template.c b/asn1/ftbp/packet-ftbp-template.c
index e4f24acc3f..68139d4ba4 100644
--- a/asn1/ftbp/packet-ftbp-template.c
+++ b/asn1/ftbp/packet-ftbp-template.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/asn1/ftbp/packet-ftbp-template.h b/asn1/ftbp/packet-ftbp-template.h
index 4a7b064dce..1be9ea6837 100644
--- a/asn1/ftbp/packet-ftbp-template.h
+++ b/asn1/ftbp/packet-ftbp-template.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/asn1/gnm/packet-gnm-template.c b/asn1/gnm/packet-gnm-template.c
index 2194feadd4..96c231b3ea 100644
--- a/asn1/gnm/packet-gnm-template.c
+++ b/asn1/gnm/packet-gnm-template.c
@@ -4,8 +4,8 @@
* Copyright 2005 , Anders Broman <anders.broman [AT] ericsson.com>
* $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/asn1/gnm/packet-gnm-template.h b/asn1/gnm/packet-gnm-template.h
index 5688725eae..453d1a1add 100644
--- a/asn1/gnm/packet-gnm-template.h
+++ b/asn1/gnm/packet-gnm-template.h
@@ -4,8 +4,8 @@
* Copyright 2005 , Anders Broman <anders.broman [AT] ericsson.com>
* $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/asn1/gsm_ss/packet-gsm_ss-template.c b/asn1/gsm_ss/packet-gsm_ss-template.c
index b8cf5bdff6..9f12c90344 100644
--- a/asn1/gsm_ss/packet-gsm_ss-template.c
+++ b/asn1/gsm_ss/packet-gsm_ss-template.c
@@ -13,8 +13,8 @@
* (3GPP TS 24.080 version )
* $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/asn1/gsm_ss/packet-gsm_ss-template.h b/asn1/gsm_ss/packet-gsm_ss-template.h
index 558a468a2d..d46bf8eedc 100644
--- a/asn1/gsm_ss/packet-gsm_ss-template.h
+++ b/asn1/gsm_ss/packet-gsm_ss-template.h
@@ -12,8 +12,8 @@
* Formats and coding
* (3GPP TS 24.080 version )
* $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/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index a83694468d..143fcdadf5 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.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/asn1/gsmmap/packet-gsm_map-template.h b/asn1/gsmmap/packet-gsm_map-template.h
index 31bcbff8f0..526c8890fb 100644
--- a/asn1/gsmmap/packet-gsm_map-template.h
+++ b/asn1/gsmmap/packet-gsm_map-template.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/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index f817d984af..0a34bd9a0a 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.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/asn1/h225/packet-h225-template.h b/asn1/h225/packet-h225-template.h
index e2387c5ae5..ce5c22181a 100644
--- a/asn1/h225/packet-h225-template.h
+++ b/asn1/h225/packet-h225-template.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/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c
index faea4c4e28..2a8f3206e0 100644
--- a/asn1/h235/packet-h235-template.c
+++ b/asn1/h235/packet-h235-template.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/asn1/h235/packet-h235-template.h b/asn1/h235/packet-h235-template.h
index 4dbee63285..503a8af723 100644
--- a/asn1/h235/packet-h235-template.h
+++ b/asn1/h235/packet-h235-template.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/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 3d5350dbad..88e402a3fe 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.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/asn1/h245/packet-h245-template.h b/asn1/h245/packet-h245-template.h
index 78ab1415c6..57cf092550 100644
--- a/asn1/h245/packet-h245-template.h
+++ b/asn1/h245/packet-h245-template.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/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 9e881f23c1..7bb5fe43c1 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.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/asn1/h248/packet-h248-template.h b/asn1/h248/packet-h248-template.h
index 5f85132f24..001049006f 100644
--- a/asn1/h248/packet-h248-template.h
+++ b/asn1/h248/packet-h248-template.h
@@ -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/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 0e44ce50fe..6006314137 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.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/asn1/h450/packet-h450-template.h b/asn1/h450/packet-h450-template.h
index dc07425d4f..d5ef3020be 100644
--- a/asn1/h450/packet-h450-template.h
+++ b/asn1/h450/packet-h450-template.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/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c
index 1ac35696d6..9a90a5de42 100644
--- a/asn1/inap/packet-inap-template.c
+++ b/asn1/inap/packet-inap-template.c
@@ -4,8 +4,8 @@
* Built from the gsm-map dissector Copyright 2004, Anders Broman <anders.broman@ericsson.com>
*
* $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/asn1/inap/packet-inap-template.h b/asn1/inap/packet-inap-template.h
index ca318db38a..cb7ce01477 100644
--- a/asn1/inap/packet-inap-template.h
+++ b/asn1/inap/packet-inap-template.h
@@ -4,8 +4,8 @@
*
* Copyright 2004, Tim Endean <endeant@hotmail.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/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 1f31cf2340..ebccb55818 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.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/asn1/ldap/packet-ldap-template.h b/asn1/ldap/packet-ldap-template.h
index de6465e2ec..75850cfbe9 100644
--- a/asn1/ldap/packet-ldap-template.h
+++ b/asn1/ldap/packet-ldap-template.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/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c
index 4273e14e4d..086fc70999 100644
--- a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.c
+++ b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.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/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h
index e9a2f760ef..a62df63001 100644
--- a/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.h
+++ b/asn1/logotype-cert-extn/packet-logotype-cert-extn-template.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/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c
index 51c3ee32ae..b3567c3e1b 100644
--- a/asn1/mms/packet-mms-template.c
+++ b/asn1/mms/packet-mms-template.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/asn1/mms/packet-mms-template.h b/asn1/mms/packet-mms-template.h
index f5d6e33964..5f0ad25593 100644
--- a/asn1/mms/packet-mms-template.h
+++ b/asn1/mms/packet-mms-template.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/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c
index 6c3e443099..a459927795 100644
--- a/asn1/nbap/packet-nbap-template.c
+++ b/asn1/nbap/packet-nbap-template.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/asn1/nbap/packet-nbap-template.h b/asn1/nbap/packet-nbap-template.h
index bf4c5195fa..663b816d1b 100644
--- a/asn1/nbap/packet-nbap-template.h
+++ b/asn1/nbap/packet-nbap-template.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/asn1/ns-cert-exts/packet-ns_cert_exts-template.c b/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
index 87bba37dcd..938ffd639b 100644
--- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.c
+++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.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/asn1/ns-cert-exts/packet-ns_cert_exts-template.h b/asn1/ns-cert-exts/packet-ns_cert_exts-template.h
index b1ea1fc128..baa802c40e 100644
--- a/asn1/ns-cert-exts/packet-ns_cert_exts-template.h
+++ b/asn1/ns-cert-exts/packet-ns_cert_exts-template.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/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index 45b513c329..f79d020172 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.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/asn1/ocsp/packet-ocsp-template.h b/asn1/ocsp/packet-ocsp-template.h
index 8aaab354d2..9ee7bcd8dd 100644
--- a/asn1/ocsp/packet-ocsp-template.h
+++ b/asn1/ocsp/packet-ocsp-template.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/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c
index a8a80d874a..70539c8146 100644
--- a/asn1/pkcs1/packet-pkcs1-template.c
+++ b/asn1/pkcs1/packet-pkcs1-template.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/asn1/pkcs1/packet-pkcs1-template.h b/asn1/pkcs1/packet-pkcs1-template.h
index 6cdd04fb54..7982160834 100644
--- a/asn1/pkcs1/packet-pkcs1-template.h
+++ b/asn1/pkcs1/packet-pkcs1-template.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/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c
index 462214abc6..cb43ed3e46 100644
--- a/asn1/pkinit/packet-pkinit-template.c
+++ b/asn1/pkinit/packet-pkinit-template.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/asn1/pkinit/packet-pkinit-template.h b/asn1/pkinit/packet-pkinit-template.h
index 6b924cef4d..3344db32c3 100644
--- a/asn1/pkinit/packet-pkinit-template.h
+++ b/asn1/pkinit/packet-pkinit-template.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/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c
index 5074eb1846..e874aa77c2 100644
--- a/asn1/pkix1explicit/packet-pkix1explicit-template.c
+++ b/asn1/pkix1explicit/packet-pkix1explicit-template.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/asn1/pkix1explicit/packet-pkix1explicit-template.h b/asn1/pkix1explicit/packet-pkix1explicit-template.h
index 62cc8adcae..48e8105fc2 100644
--- a/asn1/pkix1explicit/packet-pkix1explicit-template.h
+++ b/asn1/pkix1explicit/packet-pkix1explicit-template.h
@@ -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/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c
index 97b932cb15..39e816f5d3 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.c
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.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/asn1/pkix1implicit/packet-pkix1implicit-template.h b/asn1/pkix1implicit/packet-pkix1implicit-template.h
index f60670cf10..8ce33f6d94 100644
--- a/asn1/pkix1implicit/packet-pkix1implicit-template.h
+++ b/asn1/pkix1implicit/packet-pkix1implicit-template.h
@@ -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/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c
index a6c31ad044..0c3712e8c7 100644
--- a/asn1/pkixcmp/packet-cmp-template.c
+++ b/asn1/pkixcmp/packet-cmp-template.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/asn1/pkixcmp/packet-cmp-template.h b/asn1/pkixcmp/packet-cmp-template.h
index e9fed8ad7d..b743bd5429 100644
--- a/asn1/pkixcmp/packet-cmp-template.h
+++ b/asn1/pkixcmp/packet-cmp-template.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/asn1/pkixcrmf/packet-crmf-template.c b/asn1/pkixcrmf/packet-crmf-template.c
index 29b60fbc4b..f8ad6b5b2f 100644
--- a/asn1/pkixcrmf/packet-crmf-template.c
+++ b/asn1/pkixcrmf/packet-crmf-template.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/asn1/pkixcrmf/packet-crmf-template.h b/asn1/pkixcrmf/packet-crmf-template.h
index a646e95597..50f78cc52c 100644
--- a/asn1/pkixcrmf/packet-crmf-template.h
+++ b/asn1/pkixcrmf/packet-crmf-template.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/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c
index 8af481cbeb..1bc6d1053a 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.c
+++ b/asn1/pkixproxy/packet-pkixproxy-template.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/asn1/pkixproxy/packet-pkixproxy-template.h b/asn1/pkixproxy/packet-pkixproxy-template.h
index b238a0d898..838047f06e 100644
--- a/asn1/pkixproxy/packet-pkixproxy-template.h
+++ b/asn1/pkixproxy/packet-pkixproxy-template.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/asn1/pkixqualified/packet-pkixqualified-template.c b/asn1/pkixqualified/packet-pkixqualified-template.c
index b7d0f75244..801d21032c 100644
--- a/asn1/pkixqualified/packet-pkixqualified-template.c
+++ b/asn1/pkixqualified/packet-pkixqualified-template.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/asn1/pkixqualified/packet-pkixqualified-template.h b/asn1/pkixqualified/packet-pkixqualified-template.h
index 3f62982dd3..24a40276a7 100644
--- a/asn1/pkixqualified/packet-pkixqualified-template.h
+++ b/asn1/pkixqualified/packet-pkixqualified-template.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/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c
index b2867e1a41..826b97554b 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.c
+++ b/asn1/pkixtsp/packet-pkixtsp-template.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/asn1/pkixtsp/packet-pkixtsp-template.h b/asn1/pkixtsp/packet-pkixtsp-template.h
index 328d92034a..e1365a4365 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.h
+++ b/asn1/pkixtsp/packet-pkixtsp-template.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/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index 9120c4b9c3..2afed32f14 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.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/asn1/pres/packet-pres-template.h b/asn1/pres/packet-pres-template.h
index 00590f3a03..a572951f86 100644
--- a/asn1/pres/packet-pres-template.h
+++ b/asn1/pres/packet-pres-template.h
@@ -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/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c
index 5a20f740c4..325ec0a877 100644
--- a/asn1/ranap/packet-ranap-template.c
+++ b/asn1/ranap/packet-ranap-template.c
@@ -3,8 +3,8 @@
* Copyright 2005 - 2006, Anders Broman <anders.broman@ericsson.com>
* Based on the dissector by Martin Held <Martin.Held@icn.siemens.de>
*
- * 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/asn1/ranap/packet-ranap-template.h b/asn1/ranap/packet-ranap-template.h
index ddbf06a588..287afcede8 100644
--- a/asn1/ranap/packet-ranap-template.h
+++ b/asn1/ranap/packet-ranap-template.h
@@ -2,8 +2,8 @@
* Routines for GSM Supplementary Services dissection
* Copyright 2005, Anders Broman <anders.broman@ericsson.com>
* $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/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index 8b35bd6395..66cc56b771 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.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/asn1/rnsap/packet-rnsap-template.h b/asn1/rnsap/packet-rnsap-template.h
index 1b1e2c884e..544a09dc1e 100644
--- a/asn1/rnsap/packet-rnsap-template.h
+++ b/asn1/rnsap/packet-rnsap-template.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/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 8fc592e33e..f363aabf38 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.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/asn1/ros/packet-ros-template.h b/asn1/ros/packet-ros-template.h
index a5fd4385e9..11c7c6d702 100644
--- a/asn1/ros/packet-ros-template.h
+++ b/asn1/ros/packet-ros-template.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/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c
index 8a23a5ff7b..97191d3759 100644
--- a/asn1/rrlp/packet-rrlp-template.c
+++ b/asn1/rrlp/packet-rrlp-template.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/asn1/rrlp/packet-rrlp-template.h b/asn1/rrlp/packet-rrlp-template.h
index a5016d9877..5c34608fca 100644
--- a/asn1/rrlp/packet-rrlp-template.h
+++ b/asn1/rrlp/packet-rrlp-template.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/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c
index cbe514952c..0bbd504ea3 100644
--- a/asn1/rtse/packet-rtse-template.c
+++ b/asn1/rtse/packet-rtse-template.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/asn1/rtse/packet-rtse-template.h b/asn1/rtse/packet-rtse-template.h
index aa6d6244cd..47ada2ccaf 100644
--- a/asn1/rtse/packet-rtse-template.h
+++ b/asn1/rtse/packet-rtse-template.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/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c
index a3fa7f5dbc..ff8bb0d368 100644
--- a/asn1/s4406/packet-s4406-template.c
+++ b/asn1/s4406/packet-s4406-template.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/asn1/s4406/packet-s4406-template.h b/asn1/s4406/packet-s4406-template.h
index 1bb5ee6f59..bff84f15cd 100644
--- a/asn1/s4406/packet-s4406-template.h
+++ b/asn1/s4406/packet-s4406-template.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/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c
index ee88c94de9..4549f55eca 100644
--- a/asn1/smrse/packet-smrse-template.c
+++ b/asn1/smrse/packet-smrse-template.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/asn1/smrse/packet-smrse-template.h b/asn1/smrse/packet-smrse-template.h
index 08f308fbeb..8faf44290c 100644
--- a/asn1/smrse/packet-smrse-template.h
+++ b/asn1/smrse/packet-smrse-template.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/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 9d3663a1cd..a6ed72e7ad 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -15,8 +15,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
*
* Some stuff from:
diff --git a/asn1/snmp/packet-snmp-template.h b/asn1/snmp/packet-snmp-template.h
index 645c041594..60db62ca31 100644
--- a/asn1/snmp/packet-snmp-template.h
+++ b/asn1/snmp/packet-snmp-template.h
@@ -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/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index cf2dfd52c5..7b5f981a9d 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -9,8 +9,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/asn1/spnego/packet-spnego-template.h b/asn1/spnego/packet-spnego-template.h
index 8b8130f8d9..3d8011c7d5 100644
--- a/asn1/spnego/packet-spnego-template.h
+++ b/asn1/spnego/packet-spnego-template.h
@@ -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/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index cd96fb271e..352f5c1427 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -4,8 +4,8 @@
* Built from the gsm-map dissector Copyright 2004 - 2005, Anders Broman <anders.broman@ericsson.com>
*
* $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/asn1/tcap/packet-tcap-template.h b/asn1/tcap/packet-tcap-template.h
index 8186877df7..b97e0c8c89 100644
--- a/asn1/tcap/packet-tcap-template.h
+++ b/asn1/tcap/packet-tcap-template.h
@@ -4,8 +4,8 @@
*
* Copyright 2004, Tim Endean <endeant@hotmail.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/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c
index 45ccb32bc9..b2c25744f6 100644
--- a/asn1/ulp/packet-ulp-template.c
+++ b/asn1/ulp/packet-ulp-template.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/asn1/ulp/packet-ulp-template.h b/asn1/ulp/packet-ulp-template.h
index 70dbb221c4..53802c798d 100644
--- a/asn1/ulp/packet-ulp-template.h
+++ b/asn1/ulp/packet-ulp-template.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/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c
index 85da6df4c4..d1a5de13e0 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/asn1/wlancertextn/packet-wlancertextn-template.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/asn1/wlancertextn/packet-wlancertextn-template.h b/asn1/wlancertextn/packet-wlancertextn-template.h
index 8d1bbade88..928b8e2d5d 100644
--- a/asn1/wlancertextn/packet-wlancertextn-template.h
+++ b/asn1/wlancertextn/packet-wlancertextn-template.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/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index afa1266aa4..ce92684fea 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.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/asn1/x411/packet-x411-template.h b/asn1/x411/packet-x411-template.h
index 50efaeb61d..26ee0ee798 100644
--- a/asn1/x411/packet-x411-template.h
+++ b/asn1/x411/packet-x411-template.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/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c
index d1ca50cbb1..290f389c70 100644
--- a/asn1/x420/packet-x420-template.c
+++ b/asn1/x420/packet-x420-template.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/asn1/x420/packet-x420-template.h b/asn1/x420/packet-x420-template.h
index bf603bb4f8..4a1ce6809b 100644
--- a/asn1/x420/packet-x420-template.h
+++ b/asn1/x420/packet-x420-template.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/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index bcb4955c7a..50c0feb05a 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.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/asn1/x509af/packet-x509af-template.h b/asn1/x509af/packet-x509af-template.h
index e7dec405c6..c7285a1971 100644
--- a/asn1/x509af/packet-x509af-template.h
+++ b/asn1/x509af/packet-x509af-template.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/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c
index 1f563af558..1ec0206261 100644
--- a/asn1/x509ce/packet-x509ce-template.c
+++ b/asn1/x509ce/packet-x509ce-template.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/asn1/x509ce/packet-x509ce-template.h b/asn1/x509ce/packet-x509ce-template.h
index cc6c44e5fa..bf11cec3a2 100644
--- a/asn1/x509ce/packet-x509ce-template.h
+++ b/asn1/x509ce/packet-x509ce-template.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/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c
index 754dff9b0b..9a65111720 100644
--- a/asn1/x509if/packet-x509if-template.c
+++ b/asn1/x509if/packet-x509if-template.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/asn1/x509if/packet-x509if-template.h b/asn1/x509if/packet-x509if-template.h
index 6936986057..dd9022eeed 100644
--- a/asn1/x509if/packet-x509if-template.h
+++ b/asn1/x509if/packet-x509if-template.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/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c
index 96d8b427c2..3ee2ecdc26 100644
--- a/asn1/x509sat/packet-x509sat-template.c
+++ b/asn1/x509sat/packet-x509sat-template.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/asn1/x509sat/packet-x509sat-template.h b/asn1/x509sat/packet-x509sat-template.h
index fde2edce5f..1afcb15c7a 100644
--- a/asn1/x509sat/packet-x509sat-template.h
+++ b/asn1/x509sat/packet-x509sat-template.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/capinfos.c b/capinfos.c
index 865e8d4f23..4aa6b69b20 100644
--- a/capinfos.c
+++ b/capinfos.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/capture-pcap-util-int.h b/capture-pcap-util-int.h
index fb55568369..5eb98d9690 100644
--- a/capture-pcap-util-int.h
+++ b/capture-pcap-util-int.h
@@ -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/capture-pcap-util-unix.c b/capture-pcap-util-unix.c
index ad563995ea..255c33fc15 100644
--- a/capture-pcap-util-unix.c
+++ b/capture-pcap-util-unix.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/capture-pcap-util.c b/capture-pcap-util.c
index 1499696756..ed7b2f3d13 100644
--- a/capture-pcap-util.c
+++ b/capture-pcap-util.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/capture-pcap-util.h b/capture-pcap-util.h
index c52cddde06..96873ed1d8 100644
--- a/capture-pcap-util.h
+++ b/capture-pcap-util.h
@@ -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/capture-wpcap.c b/capture-wpcap.c
index 5d0902bb2c..ebff52e05e 100644
--- a/capture-wpcap.c
+++ b/capture-wpcap.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 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/capture-wpcap.h b/capture-wpcap.h
index d53f22b3d2..5c953e9476 100644
--- a/capture-wpcap.h
+++ b/capture-wpcap.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/capture.c b/capture.c
index 2285299be5..6e9e39d061 100644
--- a/capture.c
+++ b/capture.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/capture.h b/capture.h
index 0bc6ed75e6..c362dae5e5 100644
--- a/capture.h
+++ b/capture.h
@@ -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/capture_errs.c b/capture_errs.c
index 6850d2502e..ddbd847810 100644
--- a/capture_errs.c
+++ b/capture_errs.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/capture_errs.h b/capture_errs.h
index b96adac6ad..80c4c2c5aa 100644
--- a/capture_errs.h
+++ b/capture_errs.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/capture_info.c b/capture_info.c
index 084856d322..c2e66fb13a 100644
--- a/capture_info.c
+++ b/capture_info.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/capture_info.h b/capture_info.h
index 107d9ea931..be77e03803 100644
--- a/capture_info.h
+++ b/capture_info.h
@@ -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/capture_opts.c b/capture_opts.c
index c8302dc05d..81be81a59b 100644
--- a/capture_opts.c
+++ b/capture_opts.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/capture_opts.h b/capture_opts.h
index 8bf3d14a33..3f88ebe791 100644
--- a/capture_opts.h
+++ b/capture_opts.h
@@ -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/capture_stop_conditions.c b/capture_stop_conditions.c
index 6c1b9e83c7..59e44f5d23 100644
--- a/capture_stop_conditions.c
+++ b/capture_stop_conditions.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/capture_stop_conditions.h b/capture_stop_conditions.h
index 1dc1a49758..f57d371550 100644
--- a/capture_stop_conditions.h
+++ b/capture_stop_conditions.h
@@ -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/capture_sync.c b/capture_sync.c
index 091c782a97..65109da4af 100644
--- a/capture_sync.c
+++ b/capture_sync.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/capture_sync.h b/capture_sync.h
index b7e515ad37..be1ca3710b 100644
--- a/capture_sync.h
+++ b/capture_sync.h
@@ -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/capture_ui_utils.c b/capture_ui_utils.c
index 4cf77e51d2..a684e16805 100644
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.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/capture_ui_utils.h b/capture_ui_utils.h
index 7f450e0b36..637c6ccc28 100644
--- a/capture_ui_utils.h
+++ b/capture_ui_utils.h
@@ -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/capture_wpcap_packet.c b/capture_wpcap_packet.c
index d72cec8f3c..686911e476 100644
--- a/capture_wpcap_packet.c
+++ b/capture_wpcap_packet.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 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/capture_wpcap_packet.h b/capture_wpcap_packet.h
index 5e700e9038..3a6a2ae52d 100644
--- a/capture_wpcap_packet.h
+++ b/capture_wpcap_packet.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/cfile.c b/cfile.c
index 6ebf3d6d85..0fe615d8cd 100644
--- a/cfile.c
+++ b/cfile.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/cfile.h b/cfile.h
index e2642010c8..d70dd7d69c 100644
--- a/cfile.h
+++ b/cfile.h
@@ -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/clopts_common.c b/clopts_common.c
index 6b3187eaad..a653c495f5 100644
--- a/clopts_common.c
+++ b/clopts_common.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/clopts_common.h b/clopts_common.h
index 461fad4bb3..261e8bf792 100644
--- a/clopts_common.h
+++ b/clopts_common.h
@@ -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/cmdarg_err.h b/cmdarg_err.h
index 0d7670f9cf..be18da281b 100644
--- a/cmdarg_err.h
+++ b/cmdarg_err.h
@@ -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/color.h b/color.h
index 6806e897e1..622b6ab7f1 100644
--- a/color.h
+++ b/color.h
@@ -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/color_filters.c b/color_filters.c
index 8d7fcbb4c7..61f4a462ef 100644
--- a/color_filters.c
+++ b/color_filters.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/color_filters.h b/color_filters.h
index 17ab753e08..d253517af0 100644
--- a/color_filters.h
+++ b/color_filters.h
@@ -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/conditions.c b/conditions.c
index 941fbae02b..b6276e7ca2 100644
--- a/conditions.c
+++ b/conditions.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/conditions.h b/conditions.h
index 7fbcdf7546..e3691608fd 100644
--- a/conditions.h
+++ b/conditions.h
@@ -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/debian/copyright b/debian/copyright
index d412409e40..1c570e0eff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Sun, 13 Sep 1998 23:05:47 +0200
It was downloaded from http://www.ethereal.com/distribution/
Upstream Authors:
- Gerald Combs <gerald@ethereal.com>
+ Gerald Combs <gerald@wireshark.org>
(as well as many contributors)
Copyright:
diff --git a/debian/patches/01_idl2deb.dpatch b/debian/patches/01_idl2deb.dpatch
index 400b853fde..576af123de 100644
--- a/debian/patches/01_idl2deb.dpatch
+++ b/debian/patches/01_idl2deb.dpatch
@@ -19,8 +19,8 @@ diff -urNad --exclude=CVS --exclude=.svn ./idl2deb /tmp/dpep-work.K2bQz4/etherea
+# 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/debian/patches/02_asn2deb.dpatch b/debian/patches/02_asn2deb.dpatch
index e2bbcf3abd..d4a0d39830 100644
--- a/debian/patches/02_asn2deb.dpatch
+++ b/debian/patches/02_asn2deb.dpatch
@@ -18,8 +18,8 @@ diff -urNad --exclude=CVS --exclude=.svn ./asn2deb /tmp/dpep-work.5BSR7A/etherea
+# ASN.1 module for Ethereal, use of snacc type table:
+# Copyright 2003, Matthijs Melchior <matthijs.melchior@xs4all.nl>
+#
-+# 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/dftest.c b/dftest.c
index a0d21997b4..5be160feee 100644
--- a/dftest.c
+++ b/dftest.c
@@ -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
*
* Shows display filter byte-code, for debugging dfilter routines.
diff --git a/disabled_protos.c b/disabled_protos.c
index 4ce7e73c12..8c08ea3714 100644
--- a/disabled_protos.c
+++ b/disabled_protos.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/disabled_protos.h b/disabled_protos.h
index 47ef105a3a..7280f179b8 100644
--- a/disabled_protos.h
+++ b/disabled_protos.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4ac5b3dbe3..02b40ba716 100644
--- a/doc/Makefile.am
+++ b/doc/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/doc/Makefile.nmake b/doc/Makefile.nmake
index 63b203031c..e44d45d4ac 100644
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -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/doc/README.developer b/doc/README.developer
index faf73b3e91..fcb50db1c6 100644
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -583,8 +583,8 @@ SVN repository (checked in).
*
* $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"
@@ -3336,5 +3336,5 @@ Gilbert Ramirez <gram@alumni.rice.edu>
Jeff Foster <jfoste@woodward.com>
Olivier Abad <oabad@cybercable.fr>
Laurent Deniel <laurent.deniel@free.fr>
-Gerald Combs <gerald@ethereal.com>
+Gerald Combs <gerald@wireshark.org>
Guy Harris <guy@alum.mit.edu>
diff --git a/doc/README.stats_tree b/doc/README.stats_tree
index 612ae47d32..7ea2f7bbf9 100644
--- a/doc/README.stats_tree
+++ b/doc/README.stats_tree
@@ -46,7 +46,7 @@ A small example of a very basic stats_tree plugin follows.
*
* $ ~Id: $
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.org>
* Copyright 1998 Gerald Combs
*
diff --git a/docbook/eug_src/EUG_chapter_customize.xml b/docbook/eug_src/EUG_chapter_customize.xml
index 66d363158b..e8c4df2fb5 100644
--- a/docbook/eug_src/EUG_chapter_customize.xml
+++ b/docbook/eug_src/EUG_chapter_customize.xml
@@ -51,7 +51,7 @@
<title>Help information available from Ethereal</title>
<programlisting>
This is ethereal 0.10.13
- (C) 1998-2005 Gerald Combs &lt;gerald@ethereal.com>
+ (C) 1998-2005 Gerald Combs &lt;gerald@wireshark.org>
Compiled with GTK+ 2.6.9, with GLib 2.6.6, with WinPcap (version unknown),
with libz 1.2.3, with libpcre 6.3, with Net-SNMP 5.2.1.2, with ADNS.
diff --git a/dumpcap.c b/dumpcap.c
index c11d1f74a5..e358f84432 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -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/epan/Makefile.am b/epan/Makefile.am
index da3561ecce..f5155a2b27 100644
--- a/epan/Makefile.am
+++ b/epan/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/epan/Makefile.common b/epan/Makefile.common
index 8fc886f440..5cf487a0ed 100644
--- a/epan/Makefile.common
+++ b/epan/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/epan/addr_and_mask.c b/epan/addr_and_mask.c
index 26cb16c417..d793290047 100644
--- a/epan/addr_and_mask.c
+++ b/epan/addr_and_mask.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/epan/addr_and_mask.h b/epan/addr_and_mask.h
index 30e54bd70e..7498179ac5 100644
--- a/epan/addr_and_mask.h
+++ b/epan/addr_and_mask.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/epan/addr_resolv.c b/epan/addr_resolv.c
index 1db6b2b0c5..d79003eb5e 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -5,8 +5,8 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * 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/epan/addr_resolv.h b/epan/addr_resolv.h
index 8a924d82cf..390830aa8b 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -5,8 +5,8 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * 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/epan/address.h b/epan/address.h
index db204a1445..2e7c7a56ad 100644
--- a/epan/address.h
+++ b/epan/address.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/epan/adler32.c b/epan/adler32.c
index 5981c7b6ab..82cf7b6a00 100644
--- a/epan/adler32.c
+++ b/epan/adler32.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/epan/adler32.h b/epan/adler32.h
index 090d6322de..0e6f4a5dc7 100644
--- a/epan/adler32.h
+++ b/epan/adler32.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/epan/afn.c b/epan/afn.c
index bf5b6a7144..7cad4f3e95 100644
--- a/epan/afn.c
+++ b/epan/afn.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/epan/afn.h b/epan/afn.h
index 7e892f4581..a8f25bb5f7 100644
--- a/epan/afn.h
+++ b/epan/afn.h
@@ -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/epan/aftypes.h b/epan/aftypes.h
index d49cb10d59..5899671ff0 100644
--- a/epan/aftypes.h
+++ b/epan/aftypes.h
@@ -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>
*
* This file created and by Mike Hall <mlh@io.com>
* Copyright 1998
diff --git a/epan/arcnet_pids.h b/epan/arcnet_pids.h
index 59b815f29d..ec0024d34e 100644
--- a/epan/arcnet_pids.h
+++ b/epan/arcnet_pids.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/epan/arptypes.h b/epan/arptypes.h
index 6f6ba29bb7..af4e527496 100644
--- a/epan/arptypes.h
+++ b/epan/arptypes.h
@@ -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/epan/asn1.c b/epan/asn1.c
index a8c0e1ae45..26c59c6ae6 100644
--- a/epan/asn1.c
+++ b/epan/asn1.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>
*
* Based on "g_asn1.c" from:
*
diff --git a/epan/asn1.h b/epan/asn1.h
index fd9a378698..d967779434 100644
--- a/epan/asn1.h
+++ b/epan/asn1.h
@@ -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>
*
* Based on "g_asn1.h" from:
*
diff --git a/epan/base64.c b/epan/base64.c
index 2d7f034871..c3bc53faa2 100644
--- a/epan/base64.c
+++ b/epan/base64.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/epan/base64.h b/epan/base64.h
index 7ce9b6f8fb..46d060eadc 100644
--- a/epan/base64.h
+++ b/epan/base64.h
@@ -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/epan/bitswap.c b/epan/bitswap.c
index 0fa8198f9f..8d1d62e7df 100644
--- a/epan/bitswap.c
+++ b/epan/bitswap.c
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/bitswap.h b/epan/bitswap.h
index 57aef9c773..cc7efd4aa9 100644
--- a/epan/bitswap.h
+++ b/epan/bitswap.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/bridged_pids.h b/epan/bridged_pids.h
index 27e11bff0b..e3c0384a0a 100644
--- a/epan/bridged_pids.h
+++ b/epan/bridged_pids.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 - 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/charsets.c b/epan/charsets.c
index fb17c779d1..40ae56a8c4 100644
--- a/epan/charsets.c
+++ b/epan/charsets.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/epan/charsets.h b/epan/charsets.h
index af6670b723..a943d4cfe5 100644
--- a/epan/charsets.h
+++ b/epan/charsets.h
@@ -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/epan/chdlctypes.h b/epan/chdlctypes.h
index 4237cfe4ca..552fd3040b 100644
--- a/epan/chdlctypes.h
+++ b/epan/chdlctypes.h
@@ -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/epan/circuit.c b/epan/circuit.c
index cc6741e6c8..73dbbce2c6 100644
--- a/epan/circuit.c
+++ b/epan/circuit.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/epan/circuit.h b/epan/circuit.h
index e273a0002c..7e802ba62b 100644
--- a/epan/circuit.h
+++ b/epan/circuit.h
@@ -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/epan/column-utils.c b/epan/column-utils.c
index 776fb82de9..e4635a1bcb 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.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/epan/column-utils.h b/epan/column-utils.h
index c80706084d..3f84a7dcc3 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -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/epan/column.c b/epan/column.c
index b3d956aa96..44c22ec9df 100644
--- a/epan/column.c
+++ b/epan/column.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/epan/column.h b/epan/column.h
index 3cd972d2b7..621fac03dc 100644
--- a/epan/column.h
+++ b/epan/column.h
@@ -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/epan/column_info.h b/epan/column_info.h
index 3796f42658..4980e1af9a 100644
--- a/epan/column_info.h
+++ b/epan/column_info.h
@@ -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/epan/conversation.c b/epan/conversation.c
index ad08ac818c..777a4e5268 100644
--- a/epan/conversation.c
+++ b/epan/conversation.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/epan/conversation.h b/epan/conversation.h
index bdf31b8519..f00ff93e46 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -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/epan/crc16.c b/epan/crc16.c
index a371ffe77c..553ac03c0c 100644
--- a/epan/crc16.c
+++ b/epan/crc16.c
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxxxxxx>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/crc16.h b/epan/crc16.h
index 8df7b47a32..19ceb90aa5 100644
--- a/epan/crc16.h
+++ b/epan/crc16.h
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@xxxxxxxxxxxx>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/crc32.c b/epan/crc32.c
index 18362d7ca9..9775a3be48 100644
--- a/epan/crc32.c
+++ b/epan/crc32.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
*
* Copied from README.developer
diff --git a/epan/crc32.h b/epan/crc32.h
index 291302c06e..5396204263 100644
--- a/epan/crc32.h
+++ b/epan/crc32.h
@@ -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
*
* Copied from README.developer
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 7e1614320d..283d8573b4 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
# Copyright 2001 Gerald Combs
#
diff --git a/epan/dfilter/dfilter-int.h b/epan/dfilter/dfilter-int.h
index 410aba44ee..059a6b75af 100644
--- a/epan/dfilter/dfilter-int.h
+++ b/epan/dfilter/dfilter-int.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index aded30f365..a2bb2ecd61 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index f2f16d783f..370d73865a 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfunctions.c b/epan/dfilter/dfunctions.c
index 1b949b2ea5..485ab5bc4d 100644
--- a/epan/dfilter/dfunctions.c
+++ b/epan/dfilter/dfunctions.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/epan/dfilter/dfunctions.h b/epan/dfilter/dfunctions.h
index 3e7ca3f0de..8abf520ecc 100644
--- a/epan/dfilter/dfunctions.h
+++ b/epan/dfilter/dfunctions.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* Copyright 2006 Gilbert Ramirez <gram@alumni.rice.edu>
*
diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c
index ad3a467243..9d368abb18 100644
--- a/epan/dfilter/dfvm.c
+++ b/epan/dfilter/dfvm.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h
index da773b7759..cdc8f96453 100644
--- a/epan/dfilter/dfvm.h
+++ b/epan/dfilter/dfvm.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/drange.c b/epan/dfilter/drange.c
index 5a374ea786..13a52f5ad4 100644
--- a/epan/dfilter/drange.c
+++ b/epan/dfilter/drange.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/drange.h b/epan/dfilter/drange.h
index 6a139681fc..e5d5be1f22 100644
--- a/epan/dfilter/drange.h
+++ b/epan/dfilter/drange.h
@@ -5,7 +5,7 @@
*
* Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index 5da0b1c2ad..e7ac516fd4 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l
index 545c923c85..4697c891cb 100644
--- a/epan/dfilter/scanner.l
+++ b/epan/dfilter/scanner.l
@@ -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 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 9e91bff0e5..9949f9f021 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/semcheck.h b/epan/dfilter/semcheck.h
index fec5d80e96..14851a4bfd 100644
--- a/epan/dfilter/semcheck.h
+++ b/epan/dfilter/semcheck.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-function.c b/epan/dfilter/sttype-function.c
index c6c8a5af83..0cbdb3fd70 100644
--- a/epan/dfilter/sttype-function.c
+++ b/epan/dfilter/sttype-function.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2006 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/dfilter/sttype-function.h b/epan/dfilter/sttype-function.h
index b93f2e3273..fb8e7085a7 100644
--- a/epan/dfilter/sttype-function.h
+++ b/epan/dfilter/sttype-function.h
@@ -1,7 +1,7 @@
/*
* $Id: sttype-test.h 11400 2004-07-18 00:24:25Z guy $
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-integer.c b/epan/dfilter/sttype-integer.c
index c8765dac0f..5017fc4ac9 100644
--- a/epan/dfilter/sttype-integer.c
+++ b/epan/dfilter/sttype-integer.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-pointer.c b/epan/dfilter/sttype-pointer.c
index 3879fdae14..a5e90bb396 100644
--- a/epan/dfilter/sttype-pointer.c
+++ b/epan/dfilter/sttype-pointer.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-range.c b/epan/dfilter/sttype-range.c
index c1be33af6c..775ec51412 100644
--- a/epan/dfilter/sttype-range.c
+++ b/epan/dfilter/sttype-range.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/sttype-range.h b/epan/dfilter/sttype-range.h
index b4fc480148..66c97bf349 100644
--- a/epan/dfilter/sttype-range.h
+++ b/epan/dfilter/sttype-range.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-string.c b/epan/dfilter/sttype-string.c
index bc92d8ae8b..c24c1609e7 100644
--- a/epan/dfilter/sttype-string.c
+++ b/epan/dfilter/sttype-string.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-test.c b/epan/dfilter/sttype-test.c
index 9a0408efaf..b8a9668779 100644
--- a/epan/dfilter/sttype-test.c
+++ b/epan/dfilter/sttype-test.c
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/sttype-test.h b/epan/dfilter/sttype-test.h
index ad615f0a4d..855e0dd79f 100644
--- a/epan/dfilter/sttype-test.h
+++ b/epan/dfilter/sttype-test.h
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2001 Gerald Combs
*
diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c
index 62b54d97fe..51bb0879f3 100644
--- a/epan/dfilter/syntax-tree.c
+++ b/epan/dfilter/syntax-tree.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h
index d57c850f90..635feeda32 100644
--- a/epan/dfilter/syntax-tree.h
+++ b/epan/dfilter/syntax-tree.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 5847115d8c..d4d9bcb529 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/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 2004 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index ac8820ad18..b7abad07a5 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/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/epan/dissectors/dcerpc/budb/template.c b/epan/dissectors/dcerpc/budb/template.c
index 0c1edc9787..3b266eeb40 100644
--- a/epan/dissectors/dcerpc/budb/template.c
+++ b/epan/dissectors/dcerpc/budb/template.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/epan/dissectors/dcerpc/budb/template.h b/epan/dissectors/dcerpc/budb/template.h
index d0059850c9..8b26f8b9a0 100644
--- a/epan/dissectors/dcerpc/budb/template.h
+++ b/epan/dissectors/dcerpc/budb/template.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/epan/dissectors/dcerpc/butc/template.c b/epan/dissectors/dcerpc/butc/template.c
index 5f84bedbdf..9d1982c7c5 100644
--- a/epan/dissectors/dcerpc/butc/template.c
+++ b/epan/dissectors/dcerpc/butc/template.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/epan/dissectors/dcerpc/butc/template.h b/epan/dissectors/dcerpc/butc/template.h
index 9bc9698aba..4c8c77ac5a 100644
--- a/epan/dissectors/dcerpc/butc/template.h
+++ b/epan/dissectors/dcerpc/butc/template.h
@@ -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/epan/dissectors/dcerpc/drsuapi/template.c b/epan/dissectors/dcerpc/drsuapi/template.c
index 98e121a440..b057a93356 100644
--- a/epan/dissectors/dcerpc/drsuapi/template.c
+++ b/epan/dissectors/dcerpc/drsuapi/template.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/epan/dissectors/dcerpc/drsuapi/template.h b/epan/dissectors/dcerpc/drsuapi/template.h
index ba12115e11..750b8bc261 100644
--- a/epan/dissectors/dcerpc/drsuapi/template.h
+++ b/epan/dissectors/dcerpc/drsuapi/template.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/epan/dissectors/dcerpc/efs/template.c b/epan/dissectors/dcerpc/efs/template.c
index 5b948bfb09..c0f90d5879 100644
--- a/epan/dissectors/dcerpc/efs/template.c
+++ b/epan/dissectors/dcerpc/efs/template.c
@@ -10,8 +10,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/epan/dissectors/dcerpc/efs/template.h b/epan/dissectors/dcerpc/efs/template.h
index d86cbdb3d5..2d6f6140ff 100644
--- a/epan/dissectors/dcerpc/efs/template.h
+++ b/epan/dissectors/dcerpc/efs/template.h
@@ -9,8 +9,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/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index 344dc7d4c8..01864916d3 100644
--- a/epan/dissectors/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
@@ -21,8 +21,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/dissectors/process-x11-fields.pl b/epan/dissectors/process-x11-fields.pl
index 057f9b44b7..c417668c6c 100644
--- a/epan/dissectors/process-x11-fields.pl
+++ b/epan/dissectors/process-x11-fields.pl
@@ -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/epan/dissectors/x11-fields b/epan/dissectors/x11-fields
index 51625d953e..4994e3bd41 100644
--- a/epan/dissectors/x11-fields
+++ b/epan/dissectors/x11-fields
@@ -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/epan/dtd.h b/epan/dtd.h
index 7c39041310..57e239ba70 100644
--- a/epan/dtd.h
+++ b/epan/dtd.h
@@ -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/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon
index c743d626ff..38b1908acc 100644
--- a/epan/dtd_grammar.lemon
+++ b/epan/dtd_grammar.lemon
@@ -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/epan/dtd_parse.h b/epan/dtd_parse.h
index 2e937fefe5..672272e884 100644
--- a/epan/dtd_parse.h
+++ b/epan/dtd_parse.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/epan/dtd_parse.l b/epan/dtd_parse.l
index 857f8c8ace..8ee18560d6 100644
--- a/epan/dtd_parse.l
+++ b/epan/dtd_parse.l
@@ -14,8 +14,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/epan/dtd_preparse.l b/epan/dtd_preparse.l
index e38cb46f39..b5ce8fbe84 100644
--- a/epan/dtd_preparse.l
+++ b/epan/dtd_preparse.l
@@ -19,8 +19,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/epan/emem.c b/epan/emem.c
index 391a735fa5..f2ffa9adbb 100644
--- a/epan/emem.c
+++ b/epan/emem.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/epan/emem.h b/epan/emem.h
index 60593ce273..c4c2f90e53 100644
--- a/epan/emem.h
+++ b/epan/emem.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/epan/epan.c b/epan/epan.c
index 53022a305e..dd0b1b0104 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal Protocol Analyzer Library
+ * Wireshark Protocol Analyzer Library
*/
#ifdef HAVE_CONFIG_H
diff --git a/epan/epan.h b/epan/epan.h
index e89d82fae8..e43957ccd7 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -2,9 +2,9 @@
*
* $Id$
*
- * Ethereal Protocol Analyzer Library
+ * Wireshark Protocol Analyzer Library
*
- * Copyright (c) 2001 by Gerald Combs <gerald@ethereal.com>
+ * Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h
index 160c4b4c4b..5b0f2d9345 100644
--- a/epan/epan_dissect.h
+++ b/epan/epan_dissect.h
@@ -2,9 +2,9 @@
*
* $Id$
*
- * Ethereal Protocol Analyzer Library
+ * Wireshark Protocol Analyzer Library
*
- * Copyright (c) 2001 by Gerald Combs <gerald@ethereal.com>
+ * Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/etypes.h b/epan/etypes.h
index 091a97e21b..6040f88aa2 100644
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -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/epan/ex-opt.c b/epan/ex-opt.c
index 1b720736d5..f584324c8e 100644
--- a/epan/ex-opt.c
+++ b/epan/ex-opt.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/epan/ex-opt.h b/epan/ex-opt.h
index f51f94791f..9a0f207a55 100644
--- a/epan/ex-opt.h
+++ b/epan/ex-opt.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/epan/expert.c b/epan/expert.c
index 06f1719097..edc27b37c2 100644
--- a/epan/expert.c
+++ b/epan/expert.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/epan/expert.h b/epan/expert.h
index 87c56eb097..2a3a7e8f56 100644
--- a/epan/expert.h
+++ b/epan/expert.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/epan/filesystem.c b/epan/filesystem.c
index d2b78fd13e..dd2c81c50c 100644
--- a/epan/filesystem.c
+++ b/epan/filesystem.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
@@ -479,7 +479,7 @@ get_progfile_dir(void)
* stored.
*
* XXX - if we ever make libethereal a real library, used by multiple
- * applications (more than just Tethereal and versions of Ethereal with
+ * applications (more than just Tethereal and versions of Wireshark with
* various UIs), should the configuration files belong to the library
* (and be shared by all those applications) or to the applications?
*
diff --git a/epan/filesystem.h b/epan/filesystem.h
index 650552e9a4..9a59a58e20 100644
--- a/epan/filesystem.h
+++ b/epan/filesystem.h
@@ -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/epan/follow.c b/epan/follow.c
index f1dc7ccbad..a98b7fc214 100644
--- a/epan/follow.c
+++ b/epan/follow.c
@@ -4,8 +4,8 @@
*
* Copyright 1998 Mike Hall <mlh@io.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/epan/follow.h b/epan/follow.h
index 013519d43e..af7fcb7df2 100644
--- a/epan/follow.h
+++ b/epan/follow.h
@@ -4,8 +4,8 @@
*
* Copyright 1998 Mike Hall <mlh@io.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
@@ -31,7 +31,7 @@
#define MAX_IPADDR_LEN 16
-/* With MSVC and a libethereal.dll, we need a special declaration. */
+/* With MSVC and a libwireshark.dll, we need a special declaration. */
ETH_VAR_IMPORT gboolean incomplete_tcp_stream;
typedef struct _tcp_stream_chunk {
diff --git a/epan/frame_data.c b/epan/frame_data.c
index 9e25719c0c..b60f194e57 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/frame_data.h b/epan/frame_data.h
index 6b81dc9893..15e6057191 100644
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -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/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 580970cbb5..052925a979 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -2,7 +2,7 @@
#
# $Id$
#
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
# Copyright 1998 Gerald Combs
#
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index d67883cd53..9e390c3ce4 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index 460b4c5b13..0078beedee 100644
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-guid.c b/epan/ftypes/ftype-guid.c
index 4a5e9645d5..17256c248a 100644
--- a/epan/ftypes/ftype-guid.c
+++ b/epan/ftypes/ftype-guid.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index 9656facbbf..8e354d4e67 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c
index d57894325c..045c9fbf10 100644
--- a/epan/ftypes/ftype-ipv4.c
+++ b/epan/ftypes/ftype-ipv4.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-none.c b/epan/ftypes/ftype-none.c
index 471e0a4d23..7d133f8462 100644
--- a/epan/ftypes/ftype-none.c
+++ b/epan/ftypes/ftype-none.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c
index 82bcc196de..4c4c4fdf90 100644
--- a/epan/ftypes/ftype-pcre.c
+++ b/epan/ftypes/ftype-pcre.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index d4525fc279..b24086363c 100644
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index 2427ccb5d5..38e43d0d6a 100644
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index 8e4a705059..c083ec3911 100644
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h
index 133300369c..0e8154e400 100644
--- a/epan/ftypes/ftypes-int.h
+++ b/epan/ftypes/ftypes-int.h
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c
index d48389496b..a2305f97f9 100644
--- a/epan/ftypes/ftypes.c
+++ b/epan/ftypes/ftypes.c
@@ -1,8 +1,8 @@
/*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index a21feb5291..e3f1e2aa43 100644
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -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 2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/funnel.c b/epan/funnel.c
index 126df09958..185fe3dc20 100644
--- a/epan/funnel.c
+++ b/epan/funnel.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/epan/funnel.h b/epan/funnel.h
index 9f7b37beaf..16508af124 100644
--- a/epan/funnel.h
+++ b/epan/funnel.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/epan/gnuc_format_check.h b/epan/gnuc_format_check.h
index 31dcbeea89..83e3ba4b7d 100644
--- a/epan/gnuc_format_check.h
+++ b/epan/gnuc_format_check.h
@@ -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/epan/greproto.h b/epan/greproto.h
index 88e5d0e230..ef74dcb1a4 100644
--- a/epan/greproto.h
+++ b/epan/greproto.h
@@ -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/epan/guid-utils.h b/epan/guid-utils.h
index 1448ec4ddb..8161e2b5cd 100644
--- a/epan/guid-utils.h
+++ b/epan/guid-utils.h
@@ -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
*
diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c
index 4fa043a983..3b540dabe6 100644
--- a/epan/h225-persistentdata.c
+++ b/epan/h225-persistentdata.c
@@ -1,14 +1,14 @@
/*
* h225-persistentdata.c
- * Source for lists and hash tables used in ethereal's h225 dissector
+ * Source for lists and hash tables used in wireshark's h225 dissector
* for calculation of delays in h225-calls
*
* Copyright 2003 Lars Roland
*
* $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
@@ -127,7 +127,7 @@ h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pin
/* Init routine for hash tables and delay calculation
- This routine will be called by Ethereal, before it
+ This routine will be called by Wireshark, before it
is (re-)dissecting a trace file from beginning.
We need to discard and init any state we've saved */
diff --git a/epan/h225-persistentdata.h b/epan/h225-persistentdata.h
index 5defb14874..9e60cec275 100644
--- a/epan/h225-persistentdata.h
+++ b/epan/h225-persistentdata.h
@@ -1,14 +1,14 @@
/*
* h225-persistentdata.h
- * Definitions for lists and hash tables used in ethereal's h225 dissector
+ * Definitions for lists and hash tables used in wireshark's h225 dissector
* for calculation of delays in h225-calls
*
* Copyright 2003 Lars Roland
*
* $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/epan/iax2_codec_type.h b/epan/iax2_codec_type.h
index c373a35bf8..09b8613092 100644
--- a/epan/iax2_codec_type.h
+++ b/epan/iax2_codec_type.h
@@ -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/epan/inet_aton.h b/epan/inet_aton.h
index deb7008c99..dfa043ca96 100644
--- a/epan/inet_aton.h
+++ b/epan/inet_aton.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/inet_v6defs.h b/epan/inet_v6defs.h
index 1fe7f14223..dc770f89c5 100644
--- a/epan/inet_v6defs.h
+++ b/epan/inet_v6defs.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/epan/ip_opts.h b/epan/ip_opts.h
index 997983976a..cf233466b2 100644
--- a/epan/ip_opts.h
+++ b/epan/ip_opts.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/epan/ipproto.c b/epan/ipproto.c
index 90c6843de0..77ea982156 100644
--- a/epan/ipproto.c
+++ b/epan/ipproto.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/epan/ipproto.h b/epan/ipproto.h
index f9a82d7884..3e97c35029 100644
--- a/epan/ipproto.h
+++ b/epan/ipproto.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/epan/ipv4.c b/epan/ipv4.c
index 622d1e209b..47e668dcbd 100644
--- a/epan/ipv4.c
+++ b/epan/ipv4.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/epan/ipv4.h b/epan/ipv4.h
index 4a63db6142..39ff3de00d 100644
--- a/epan/ipv4.h
+++ b/epan/ipv4.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/epan/ipv6-utils.h b/epan/ipv6-utils.h
index 79a5d37fc1..85012102b0 100644
--- a/epan/ipv6-utils.h
+++ b/epan/ipv6-utils.h
@@ -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
*
diff --git a/epan/lapd_sapi.h b/epan/lapd_sapi.h
index 7fe486dee5..cd8fcf0611 100644
--- a/epan/lapd_sapi.h
+++ b/epan/lapd_sapi.h
@@ -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/epan/llcsaps.h b/epan/llcsaps.h
index bef8c21e56..875a030e44 100644
--- a/epan/llcsaps.h
+++ b/epan/llcsaps.h
@@ -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/epan/make-sminmpec.pl b/epan/make-sminmpec.pl
index ec034a7359..dc473b1e8e 100755
--- a/epan/make-sminmpec.pl
+++ b/epan/make-sminmpec.pl
@@ -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 2004 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/epan/nlpid.h b/epan/nlpid.h
index 0b9370d9bf..d01e4b072c 100644
--- a/epan/nlpid.h
+++ b/epan/nlpid.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/epan/nstime.c b/epan/nstime.c
index e20159afcf..a60590ccc7 100644
--- a/epan/nstime.c
+++ b/epan/nstime.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/epan/nstime.h b/epan/nstime.h
index 60fec42e01..8592539cb8 100644
--- a/epan/nstime.h
+++ b/epan/nstime.h
@@ -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/epan/oid_resolv.c b/epan/oid_resolv.c
index 73e530a92c..c3de5e620f 100644
--- a/epan/oid_resolv.c
+++ b/epan/oid_resolv.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/epan/oid_resolv.h b/epan/oid_resolv.h
index 7176a65efe..d770bebb93 100644
--- a/epan/oid_resolv.h
+++ b/epan/oid_resolv.h
@@ -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/epan/osi-utils.c b/epan/osi-utils.c
index daca6afd21..df613783b9 100644
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -6,8 +6,8 @@
* Laurent Deniel <laurent.deniel@free.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
- * 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/epan/osi-utils.h b/epan/osi-utils.h
index fc8565f032..3b13539364 100644
--- a/epan/osi-utils.h
+++ b/epan/osi-utils.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/epan/oui.h b/epan/oui.h
index 1fcd7229da..59bab2f6d9 100644
--- a/epan/oui.h
+++ b/epan/oui.h
@@ -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 - 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/packet.c b/epan/packet.c
index 5e3c350c4a..6561d0724d 100644
--- a/epan/packet.c
+++ b/epan/packet.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/epan/packet.h b/epan/packet.h
index 6445928aed..9a8b15871c 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -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/epan/packet_info.h b/epan/packet_info.h
index 185ffcdb11..9376b65ccd 100644
--- a/epan/packet_info.h
+++ b/epan/packet_info.h
@@ -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/epan/pint.h b/epan/pint.h
index 400cd8d7eb..f5335caeff 100644
--- a/epan/pint.h
+++ b/epan/pint.h
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/epan/plugins.c b/epan/plugins.c
index 83c7e8998f..4d7b3a34ad 100644
--- a/epan/plugins.c
+++ b/epan/plugins.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 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -350,7 +350,7 @@ char *get_plugins_global_dir(const char *plugin_dir)
* On Windows, the data file directory is the installation
* directory; the plugins are stored under it.
*
- * Assume we're running the installed version of Ethereal;
+ * Assume we're running the installed version of Wireshark;
* on Windows, the data file directory is the directory
* in which the Ethereal binary resides.
*/
@@ -365,11 +365,11 @@ char *get_plugins_global_dir(const char *plugin_dir)
* refers to something that doesn't exist.
*
* Assume that means we're running, for example,
- * a version of Ethereal we've built in a source
+ * a version of Wireshark we've built in a source
* directory, and fall back on the default
* installation directory, so you can put the plugins
* somewhere so they can be used with this version
- * of Ethereal.
+ * of Wireshark.
*
* XXX - should we, instead, have the Windows build
* procedure create a subdirectory of the "plugins"
diff --git a/epan/plugins.h b/epan/plugins.h
index 7ae35c0615..0f1ead79ee 100644
--- a/epan/plugins.h
+++ b/epan/plugins.h
@@ -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 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/ppptypes.h b/epan/ppptypes.h
index 352470946b..65a28d9ef2 100644
--- a/epan/ppptypes.h
+++ b/epan/ppptypes.h
@@ -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
*
*
diff --git a/epan/prefs-int.h b/epan/prefs-int.h
index e3aaabddfd..04cf25d5e6 100644
--- a/epan/prefs-int.h
+++ b/epan/prefs-int.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
@@ -40,7 +40,7 @@ struct pref_module {
/*
* Module used for protocol preferences. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT module_t *protocols_module;
diff --git a/epan/prefs.c b/epan/prefs.c
index d3218ef1e4..4edd127376 100644
--- a/epan/prefs.c
+++ b/epan/prefs.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
@@ -1398,7 +1398,7 @@ prefs_set_pref(char *prefarg)
* This applies to more than just captures, so it's not "capture.name_resolve";
* "capture.name_resolve" is supported on input for backwards compatibility.
*
- * It's not a preference for a particular part of Ethereal, it's used all
+ * It's not a preference for a particular part of Wireshark, it's used all
* over the place, so its name doesn't have two components.
*/
#define PRS_NAME_RESOLVE "name_resolve"
@@ -1815,7 +1815,7 @@ set_pref(gchar *pref_name, gchar *value)
/*
* XXX - "Diameter" rather than "diameter" was used in earlier
- * versions of Ethereal; if we didn't find the module, and its name
+ * versions of Wireshark; if we didn't find the module, and its name
* was "Diameter", look for "diameter" instead.
*
* In addition, the BEEP protocol used to be the BXXP protocol,
@@ -1851,7 +1851,7 @@ set_pref(gchar *pref_name, gchar *value)
/*
* XXX - "mgcp.display raw text toggle" and "mgcp.display dissect tree"
* rather than "mgcp.display_raw_text" and "mgcp.display_dissect_tree"
- * were used in earlier versions of Ethereal; if we didn't find the
+ * were used in earlier versions of Wireshark; if we didn't find the
* preference, it was an MGCP preference, and its name was
* "display raw text toggle" or "display dissect tree", look for
* "display_raw_text" or "display_dissect_tree" instead.
@@ -2158,7 +2158,7 @@ write_pref(gpointer data, gpointer user_data)
case PREF_ENUM:
/*
* For now, we save the "description" value, so that if we
- * save the preferences older versions of Ethereal can at
+ * save the preferences older versions of Wireshark can at
* least read preferences that they supported; we support
* either the short name or the description when reading
* the preferences file or a "-o" option.
@@ -2247,7 +2247,7 @@ write_prefs(char **pf_path_return)
pf = stdout;
}
- fputs("# Configuration file for Ethereal " VERSION ".\n"
+ fputs("# Configuration file for Wireshark " VERSION ".\n"
"#\n"
"# This file is regenerated each time preferences are saved within\n"
"# Ethereal. Making manual changes should be safe, however.\n", pf);
diff --git a/epan/prefs.h b/epan/prefs.h
index a7d010a520..2f91c0233a 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -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/epan/privileges.c b/epan/privileges.c
index af4de43c3c..857a99cd82 100644
--- a/epan/privileges.c
+++ b/epan/privileges.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 2006 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/privileges.h b/epan/privileges.h
index a3fdae8691..3e82c8d813 100644
--- a/epan/privileges.h
+++ b/epan/privileges.h
@@ -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 2006 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/proto.c b/epan/proto.c
index 2095ae0654..1fe74913eb 100644
--- a/epan/proto.c
+++ b/epan/proto.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
@@ -314,7 +314,7 @@ proto_init(const char *plugin_dir
ftypes_initialize();
/* Register one special-case FT_TEXT_ONLY field for use when
- converting ethereal to new-style proto_tree. These fields
+ converting wireshark to new-style proto_tree. These fields
are merely strings on the GUI tree; they are not filterable */
proto_register_field_array(-1, hf, array_length(hf));
@@ -557,7 +557,7 @@ proto_tree_set_visible(proto_tree *tree, gboolean visible)
/* Assume dissector set only its protocol fields.
This function is called by dissectors and allowes to speed up filtering
- in ethereal, if this function returns FALSE it is safe to reset tree to NULL
+ in wireshark, if this function returns FALSE it is safe to reset tree to NULL
and thus skip calling most of the expensive proto_tree_add_...()
functions.
If the tree is visible we implicitely assume the field is referenced.
diff --git a/epan/proto.h b/epan/proto.h
index 005ad4b625..3fef7b00bf 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -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
@@ -51,7 +51,7 @@
#include "tvbuff.h"
#include "ftypes/ftypes.h"
-/** The header-field index for the special text pseudo-field. Exported by libethereal.dll */
+/** The header-field index for the special text pseudo-field. Exported by libwireshark.dll */
ETH_VAR_IMPORT int hf_text_only;
/** the maximum length of a protocol field string representation */
@@ -208,7 +208,7 @@ typedef struct field_info {
* used in field_info.flags. */
/* HIDING PROTOCOL FIELDS IS DEPRECATED, IT'S CONSIDERED TO BE BAD GUI DESIGN! */
#define FI_HIDDEN 0x0001
-/** The protocol field should be displayed as "generated by Ethereal",
+/** The protocol field should be displayed as "generated by Wireshark",
* used in field_info.flags. */
#define FI_GENERATED 0x0002
@@ -283,10 +283,10 @@ typedef proto_node proto_item;
/* HIDING PROTOCOL FIELDS IS DEPRECATED, IT'S CONSIDERED TO BE BAD GUI DESIGN! */
#define PROTO_ITEM_SET_HIDDEN(proto_item) \
((proto_item) ? FI_SET_FLAG((proto_item)->finfo, FI_HIDDEN) : 0)
-/** is this protocol field generated by Ethereal (and not read from the packet data)? */
+/** is this protocol field generated by Wireshark (and not read from the packet data)? */
#define PROTO_ITEM_IS_GENERATED(proto_item) \
((proto_item) ? FI_GET_FLAG((proto_item)->finfo, FI_GENERATED) : 0)
-/** mark this protocol field as generated by Ethereal (and not read from the packet data) */
+/** mark this protocol field as generated by Wireshark (and not read from the packet data) */
#define PROTO_ITEM_SET_GENERATED(proto_item) \
((proto_item) ? FI_SET_FLAG((proto_item)->finfo, FI_GENERATED) : 0)
@@ -1495,11 +1495,11 @@ extern void proto_registrar_dump_fields(int format);
/** Points to the first element of an array of Booleans, indexed by
a subtree item type. That array element is TRUE if subtrees of
an item of that type are to be expanded. With MSVC and a
- libethereal.dll, we need a special declaration. */
+ libwireshark.dll, we need a special declaration. */
ETH_VAR_IMPORT gboolean *tree_is_expanded;
/** Number of elements in the tree_is_expanded array. With MSVC and a
- * libethereal.dll, we need a special declaration. */
+ * libwireshark.dll, we need a special declaration. */
ETH_VAR_IMPORT int num_tree_types;
/** glib doesn't have g_ptr_array_len of all things!*/
diff --git a/epan/ptvcursor.h b/epan/ptvcursor.h
index 6467bcdea9..8c14e4c21c 100644
--- a/epan/ptvcursor.h
+++ b/epan/ptvcursor.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 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 3170272bfe..ff2bfee3ed 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -14,8 +14,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/epan/range.c b/epan/range.c
index 52af5540af..a5ede86a4f 100644
--- a/epan/range.c
+++ b/epan/range.c
@@ -6,8 +6,8 @@
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
*
- * 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/epan/range.h b/epan/range.h
index 1355c5058d..f3c3825d48 100644
--- a/epan/range.h
+++ b/epan/range.h
@@ -6,8 +6,8 @@
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
*
- * 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/epan/reassemble.c b/epan/reassemble.c
index de0105e2a1..39e9a42b3e 100644
--- a/epan/reassemble.c
+++ b/epan/reassemble.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/epan/reassemble.h b/epan/reassemble.h
index 9c37cf058d..2937b8f1cf 100644
--- a/epan/reassemble.h
+++ b/epan/reassemble.h
@@ -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/epan/report_err.h b/epan/report_err.h
index f3440bb141..c9686413c8 100644
--- a/epan/report_err.h
+++ b/epan/report_err.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/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c
index fe34b820b4..cbc861de3e 100644
--- a/epan/req_resp_hdrs.c
+++ b/epan/req_resp_hdrs.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/epan/req_resp_hdrs.h b/epan/req_resp_hdrs.h
index 841fbc390c..17d3ee35cb 100644
--- a/epan/req_resp_hdrs.h
+++ b/epan/req_resp_hdrs.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/epan/rtp_pt.h b/epan/rtp_pt.h
index 890c433707..f684ff9e9a 100644
--- a/epan/rtp_pt.h
+++ b/epan/rtp_pt.h
@@ -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/epan/sctpppids.h b/epan/sctpppids.h
index 6e213b3c85..aea8d5ecfd 100644
--- a/epan/sctpppids.h
+++ b/epan/sctpppids.h
@@ -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/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c
index 8e6a8851f2..9a12759408 100644
--- a/epan/sigcomp-udvm.c
+++ b/epan/sigcomp-udvm.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/epan/sigcomp-udvm.h b/epan/sigcomp-udvm.h
index 4cd45ad359..ac6f284649 100644
--- a/epan/sigcomp-udvm.h
+++ b/epan/sigcomp-udvm.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/epan/sigcomp_state_hdlr.c b/epan/sigcomp_state_hdlr.c
index c2e9cba110..bc21fb0f14 100644
--- a/epan/sigcomp_state_hdlr.c
+++ b/epan/sigcomp_state_hdlr.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/epan/sigcomp_state_hdlr.h b/epan/sigcomp_state_hdlr.h
index c23f24e763..96155a4b9b 100644
--- a/epan/sigcomp_state_hdlr.h
+++ b/epan/sigcomp_state_hdlr.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/epan/slab.h b/epan/slab.h
index aecb20c7e2..6bed56d6af 100644
--- a/epan/slab.h
+++ b/epan/slab.h
@@ -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/epan/sminmpec.h b/epan/sminmpec.h
index 018e5309a7..f217d9f196 100644
--- a/epan/sminmpec.h
+++ b/epan/sminmpec.h
@@ -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/epan/sna-utils.c b/epan/sna-utils.c
index 132a5cfe4b..9bfd1ebb4e 100644
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.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/epan/stat_cmd_args.c b/epan/stat_cmd_args.c
index e116032095..8ab4a5ddd9 100644
--- a/epan/stat_cmd_args.c
+++ b/epan/stat_cmd_args.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/epan/stat_cmd_args.h b/epan/stat_cmd_args.h
index 20297eb4dd..863f405add 100644
--- a/epan/stat_cmd_args.h
+++ b/epan/stat_cmd_args.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/epan/stats_tree.c b/epan/stats_tree.c
index 5eec67c807..abd4202a98 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.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/epan/stats_tree.h b/epan/stats_tree.h
index d3d81e0179..e1b005aa13 100644
--- a/epan/stats_tree.h
+++ b/epan/stats_tree.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/epan/stats_tree_priv.h b/epan/stats_tree_priv.h
index 8f1ffd6c81..b6688e028f 100644
--- a/epan/stats_tree_priv.h
+++ b/epan/stats_tree_priv.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/epan/stream.c b/epan/stream.c
index 70251011f8..ee8c561355 100644
--- a/epan/stream.c
+++ b/epan/stream.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/epan/stream.h b/epan/stream.h
index 00e5e1cf38..2b4c33744a 100644
--- a/epan/stream.h
+++ b/epan/stream.h
@@ -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/epan/strutil.c b/epan/strutil.c
index 60e653f32e..f36d48071b 100644
--- a/epan/strutil.c
+++ b/epan/strutil.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/epan/strutil.h b/epan/strutil.h
index 2bd4e59f38..7ed68367b6 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -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/epan/t35.c b/epan/t35.c
index ba718c5229..ac2b7c708f 100644
--- a/epan/t35.c
+++ b/epan/t35.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/epan/t35.h b/epan/t35.h
index a9d8abf422..45f727e859 100644
--- a/epan/t35.h
+++ b/epan/t35.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/epan/tap.c b/epan/tap.c
index b692fcd58d..7ff4cd4c71 100644
--- a/epan/tap.c
+++ b/epan/tap.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
@@ -82,7 +82,7 @@ static volatile tap_listener_t *tap_listener_queue=NULL;
/* **********************************************************************
* Init routine only called from epan at application startup
* ********************************************************************** */
-/* This function is called once when ethereal starts up and is used
+/* This function is called once when wireshark starts up and is used
to init any data structures we may need later.
*/
void
diff --git a/epan/tap.h b/epan/tap.h
index 2a8fa4cbc3..a08b39a0e1 100644
--- a/epan/tap.h
+++ b/epan/tap.h
@@ -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
@@ -27,7 +27,7 @@
#include "epan/epan.h"
-/* With MSVC and a libethereal.dll, we need a
+/* With MSVC and a libwireshark.dll, we need a
* special declaration of num_tap_filters.
*/
ETH_VAR_IMPORT int num_tap_filters;
diff --git a/epan/timestamp.c b/epan/timestamp.c
index b7cef811f6..a3d85b3c19 100644
--- a/epan/timestamp.c
+++ b/epan/timestamp.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/epan/timestamp.h b/epan/timestamp.h
index f9f953219b..ac06c6b63c 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -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/epan/to_str.c b/epan/to_str.c
index 7479ed311e..c7e03f4b05 100644
--- a/epan/to_str.c
+++ b/epan/to_str.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/epan/to_str.h b/epan/to_str.h
index 4bbe5e9447..d4cbb1145e 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -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/epan/tpg.c b/epan/tpg.c
index 5a29b8ba4a..d28325338b 100644
--- a/epan/tpg.c
+++ b/epan/tpg.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/epan/tpg.h b/epan/tpg.h
index 4f0170e755..9367a81a60 100644
--- a/epan/tpg.h
+++ b/epan/tpg.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/epan/tvbparse.c b/epan/tvbparse.c
index 5b2a02797d..7b0114ddba 100644
--- a/epan/tvbparse.c
+++ b/epan/tvbparse.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/epan/tvbparse.h b/epan/tvbparse.h
index 2afc4eecfe..ec927b2d9d 100644
--- a/epan/tvbparse.h
+++ b/epan/tvbparse.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/epan/tvbuff.c b/epan/tvbuff.c
index 39cb3e763e..3cee88e99c 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -16,8 +16,8 @@
* Code to convert IEEE floating point formats to native floating point
* derived from code Copyright (c) Ashok Narayanan, 2000
*
- * 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
@@ -1022,7 +1022,7 @@ tvb_memdup(tvbuff_t *tvb, gint offset, gint length)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
@@ -1105,9 +1105,9 @@ tvb_get_ntoh64(tvbuff_t *tvb, gint offset)
* huge surprise).
*
* I don't know whether there are any other machines that
- * could run Ethereal and that don't use IEEE format.
+ * could run Wireshark and that don't use IEEE format.
* As far as I know, all of the main commercial microprocessor
- * families on which OSes that support Ethereal can run
+ * families on which OSes that support Wireshark can run
* use IEEE format (x86, 68k, SPARC, MIPS, PA-RISC, Alpha,
* IA-64, and so on).
*/
@@ -1745,7 +1745,7 @@ tvb_fake_unicode(tvbuff_t *tvb, int offset, int len, gboolean little_endian)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
*/
char *
tvb_get_ephemeral_faked_unicode(tvbuff_t *tvb, int offset, int len, gboolean little_endian)
@@ -1853,7 +1853,7 @@ tvb_get_string(tvbuff_t *tvb, gint offset, gint length)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
@@ -1905,7 +1905,7 @@ tvb_get_stringz(tvbuff_t *tvb, gint offset, gint *lengthp)
*
* This function allocates memory from a buffer with packet lifetime.
* You do not have to free this buffer, it will be automatically freed
- * when ethereal starts decoding the next packet.
+ * when wireshark starts decoding the next packet.
* Do not use this function if you want the allocated memory to be persistent
* after the current packet has been dissected.
*/
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index 144af28666..b4f809c3a7 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -13,8 +13,8 @@
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
- * 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
@@ -414,7 +414,7 @@ extern gint tvb_strnlen(tvbuff_t*, gint offset, guint maxlength);
* be g_free() by the caller.
* tvb_get_ephemeral_faked_unicode() returns a buffer that does not need
* to be explicitely freed. Instead this buffer is
- * automatically freed when ethereal starts dissecting
+ * automatically freed when wireshark starts dissecting
* the next packet.
*/
extern char *tvb_fake_unicode(tvbuff_t *tvb, int offset, int len,
diff --git a/epan/value_string.c b/epan/value_string.c
index d42f69d682..a6fd925725 100644
--- a/epan/value_string.c
+++ b/epan/value_string.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/epan/value_string.h b/epan/value_string.h
index 5bb264a492..ff9c107ec6 100644
--- a/epan/value_string.h
+++ b/epan/value_string.h
@@ -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/epan/x264_prt_id.h b/epan/x264_prt_id.h
index 3cf75f352f..f1b273d506 100644
--- a/epan/x264_prt_id.h
+++ b/epan/x264_prt_id.h
@@ -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/epan/xdlc.c b/epan/xdlc.c
index cb3c5af42f..362ad16a98 100644
--- a/epan/xdlc.c
+++ b/epan/xdlc.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/epan/xdlc.h b/epan/xdlc.h
index fc924ef6ee..0f1612cc69 100644
--- a/epan/xdlc.h
+++ b/epan/xdlc.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/epan/xmlstub.c b/epan/xmlstub.c
index 6ceb9c32be..b0b8aa3f0d 100644
--- a/epan/xmlstub.c
+++ b/epan/xmlstub.c
@@ -7,8 +7,8 @@
*
* Copyright (c) 2001 by David Frascone <dave@frascone.com>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998-2001 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/ethereal_gen.py b/ethereal_gen.py
index ca3b3bdafe..257979246e 100644
--- a/ethereal_gen.py
+++ b/ethereal_gen.py
@@ -2057,7 +2057,7 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) {
template_ethereal_copyright = """\
/*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
*/
diff --git a/file.c b/file.c
index f52135309b..e27dee2626 100644
--- a/file.c
+++ b/file.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/file.h b/file.h
index d8ce431298..716ea5da99 100644
--- a/file.h
+++ b/file.h
@@ -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/fileset.c b/fileset.c
index 8900bcacd2..81cc739d7f 100644
--- a/fileset.c
+++ b/fileset.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/fileset.h b/fileset.h
index 420a70c0f8..b0ba5229e6 100644
--- a/fileset.h
+++ b/fileset.h
@@ -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/filters.c b/filters.c
index cdecc51691..3614c9645a 100644
--- a/filters.c
+++ b/filters.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/filters.h b/filters.h
index d059c8cc80..7057ebd7ab 100644
--- a/filters.h
+++ b/filters.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/g711.h b/g711.h
index 84ac202e7a..8d8b44d439 100644
--- a/g711.h
+++ b/g711.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/globals.h b/globals.h
index 196afd28d5..d920fba1a2 100644
--- a/globals.h
+++ b/globals.h
@@ -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/gtk/Makefile.am b/gtk/Makefile.am
index 7bae6f4212..dace5e43ea 100644
--- a/gtk/Makefile.am
+++ b/gtk/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/gtk/Makefile.common b/gtk/Makefile.common
index 74ea6c9dc8..181a219fa8 100644
--- a/gtk/Makefile.common
+++ b/gtk/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/gtk/about_dlg.c b/gtk/about_dlg.c
index 41abeb370d..024225ca0b 100644
--- a/gtk/about_dlg.c
+++ b/gtk/about_dlg.c
@@ -4,8 +4,8 @@
*
* Ulf Lamping <ulf.lamping@web.de>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
@@ -100,7 +100,7 @@ splash_new(char *message)
gtk_container_border_width(GTK_CONTAINER(main_vb), 24);
gtk_container_add(GTK_CONTAINER(win), main_vb);
- about_ethereal(win, main_vb, "Ethereal - Network Protocol Analyzer");
+ about_ethereal(win, main_vb, "Wireshark - Network Protocol Analyzer");
main_lb = gtk_label_new(message);
gtk_container_add(GTK_CONTAINER(main_vb), main_lb);
@@ -143,7 +143,7 @@ about_ethereal_page_new(void)
{
GtkWidget *main_vb, *msg_label /*, *icon*/;
gchar *message;
- const char title[] = "Ethereal - Network Protocol Analyzer";
+ const char title[] = "Wireshark - Network Protocol Analyzer";
main_vb = gtk_vbox_new(FALSE, 6);
gtk_container_border_width(GTK_CONTAINER(main_vb), 12);
diff --git a/gtk/about_dlg.h b/gtk/about_dlg.h
index 00b53130d5..65070a22a3 100644
--- a/gtk/about_dlg.h
+++ b/gtk/about_dlg.h
@@ -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/gtk/afp_stat.c b/gtk/afp_stat.c
index 1548dcd740..bed1501a1b 100644
--- a/gtk/afp_stat.c
+++ b/gtk/afp_stat.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/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 033d283d5f..f217790bb3 100644
--- a/gtk/ansi_a_stat.c
+++ b/gtk/ansi_a_stat.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/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index fd53825158..ecd54d3162 100644
--- a/gtk/ansi_map_stat.c
+++ b/gtk/ansi_map_stat.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/gtk/bootp_stat.c b/gtk/bootp_stat.c
index c4f0a7ddef..6ed8edea9a 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.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/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 55e6703108..4cfd652fcd 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.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/gtk/capture_dlg.h b/gtk/capture_dlg.h
index d132061066..3d20ff2993 100644
--- a/gtk/capture_dlg.h
+++ b/gtk/capture_dlg.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c
index fc548dc981..0865e98faf 100644
--- a/gtk/capture_file_dlg.c
+++ b/gtk/capture_file_dlg.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/gtk/capture_file_dlg.h b/gtk/capture_file_dlg.h
index 1265732a5e..8a513e92ea 100644
--- a/gtk/capture_file_dlg.h
+++ b/gtk/capture_file_dlg.h
@@ -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/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c
index 132b762386..8302ddfe06 100644
--- a/gtk/capture_if_details_dlg.c
+++ b/gtk/capture_if_details_dlg.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/gtk/capture_if_details_dlg.h b/gtk/capture_if_details_dlg.h
index 91b8072bd6..8017aebc04 100644
--- a/gtk/capture_if_details_dlg.h
+++ b/gtk/capture_if_details_dlg.h
@@ -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/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 377b011fbc..a03851cf06 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.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/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index e03e6f8151..f1b2e8dfd8 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.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/gtk/capture_prefs.c b/gtk/capture_prefs.c
index bcda4ce160..7137985ecd 100644
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.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/gtk/capture_prefs.h b/gtk/capture_prefs.h
index cdc0d22907..7f19e4d5da 100644
--- a/gtk/capture_prefs.h
+++ b/gtk/capture_prefs.h
@@ -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/gtk/cfilter_combo_utils.c b/gtk/cfilter_combo_utils.c
index 9c184d3e26..6da541a306 100644
--- a/gtk/cfilter_combo_utils.c
+++ b/gtk/cfilter_combo_utils.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/gtk/cfilter_combo_utils.h b/gtk/cfilter_combo_utils.h
index 580c766436..97f140fe83 100644
--- a/gtk/cfilter_combo_utils.h
+++ b/gtk/cfilter_combo_utils.h
@@ -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/gtk/color_dlg.c b/gtk/color_dlg.c
index 45b1f1f160..19887a7db4 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.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/gtk/color_dlg.h b/gtk/color_dlg.h
index b053caa480..c0e7388cab 100644
--- a/gtk/color_dlg.h
+++ b/gtk/color_dlg.h
@@ -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/gtk/color_utils.c b/gtk/color_utils.c
index 8f95c820f6..3c6f008f41 100644
--- a/gtk/color_utils.c
+++ b/gtk/color_utils.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/gtk/colors.c b/gtk/colors.c
index b0b1766347..48cfdbb19d 100644
--- a/gtk/colors.c
+++ b/gtk/colors.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/gtk/colors.h b/gtk/colors.h
index 8f4c1100c6..6738945358 100644
--- a/gtk/colors.h
+++ b/gtk/colors.h
@@ -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/gtk/column_prefs.c b/gtk/column_prefs.c
index 54e56327a8..1bc8b077ef 100644
--- a/gtk/column_prefs.c
+++ b/gtk/column_prefs.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/gtk/column_prefs.h b/gtk/column_prefs.h
index 02968977d6..a401a54b9e 100644
--- a/gtk/column_prefs.h
+++ b/gtk/column_prefs.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index c9394aa643..78dbcfa940 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -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/gtk/conversations_eth.c b/gtk/conversations_eth.c
index 1caa95854f..f8a690d5ab 100644
--- a/gtk/conversations_eth.c
+++ b/gtk/conversations_eth.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/gtk/conversations_fc.c b/gtk/conversations_fc.c
index b5bd0715da..75a3719876 100644
--- a/gtk/conversations_fc.c
+++ b/gtk/conversations_fc.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/gtk/conversations_fddi.c b/gtk/conversations_fddi.c
index 320a625e69..ac9784ee65 100644
--- a/gtk/conversations_fddi.c
+++ b/gtk/conversations_fddi.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/gtk/conversations_ip.c b/gtk/conversations_ip.c
index dd46f5cd48..2ae005d8c1 100644
--- a/gtk/conversations_ip.c
+++ b/gtk/conversations_ip.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/gtk/conversations_ipx.c b/gtk/conversations_ipx.c
index 83444cec9c..2b0718ddc5 100644
--- a/gtk/conversations_ipx.c
+++ b/gtk/conversations_ipx.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/gtk/conversations_jxta.c b/gtk/conversations_jxta.c
index 4ff3b380bf..12166fc032 100644
--- a/gtk/conversations_jxta.c
+++ b/gtk/conversations_jxta.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/gtk/conversations_ncp.c b/gtk/conversations_ncp.c
index 46cb8b792a..8c1475c4e1 100644
--- a/gtk/conversations_ncp.c
+++ b/gtk/conversations_ncp.c
@@ -3,8 +3,8 @@
*
* $Id: conversations_wlan.c 15501 2005-08-21 19:24:11Z guy $
*
- * 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/gtk/conversations_rsvp.c b/gtk/conversations_rsvp.c
index cef4d41a00..c6fd7f08d0 100644
--- a/gtk/conversations_rsvp.c
+++ b/gtk/conversations_rsvp.c
@@ -1,8 +1,8 @@
/* conversations_rsvp.c
* conversations_rsvp.c August 2005, Manu Pathak <mapathak@cisco.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/gtk/conversations_sctp.c b/gtk/conversations_sctp.c
index f9c859cbff..6b04702038 100644
--- a/gtk/conversations_sctp.c
+++ b/gtk/conversations_sctp.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/gtk/conversations_table.c b/gtk/conversations_table.c
index 254ccfaab9..29e699ce3c 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.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/gtk/conversations_table.h b/gtk/conversations_table.h
index 783fad0dae..c8eb9e5d5e 100644
--- a/gtk/conversations_table.h
+++ b/gtk/conversations_table.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/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c
index 8f9e60a865..7d8afd8ac0 100644
--- a/gtk/conversations_tcpip.c
+++ b/gtk/conversations_tcpip.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/gtk/conversations_tr.c b/gtk/conversations_tr.c
index f678ae50bd..d3a0c80ced 100644
--- a/gtk/conversations_tr.c
+++ b/gtk/conversations_tr.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/gtk/conversations_udpip.c b/gtk/conversations_udpip.c
index 345ef6fcde..e18dbcd938 100644
--- a/gtk/conversations_udpip.c
+++ b/gtk/conversations_udpip.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/gtk/conversations_wlan.c b/gtk/conversations_wlan.c
index 8d5a2a62c6..1f94aa7bb0 100644
--- a/gtk/conversations_wlan.c
+++ b/gtk/conversations_wlan.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/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index 9764ac9f1f..5c5c6ce0ac 100644
--- a/gtk/dcerpc_stat.c
+++ b/gtk/dcerpc_stat.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/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index d9a08ca6af..39ec91f8f1 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -9,8 +9,8 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/dfilter_expr_dlg.h b/gtk/dfilter_expr_dlg.h
index 024819c68a..d588bc575e 100644
--- a/gtk/dfilter_expr_dlg.h
+++ b/gtk/dfilter_expr_dlg.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index 328423bc35..54a4de8098 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.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/gtk/dlg_utils.h b/gtk/dlg_utils.h
index 03135d7399..79d4c4f9ee 100644
--- a/gtk/dlg_utils.h
+++ b/gtk/dlg_utils.h
@@ -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/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index 43825014b1..623372b92a 100644
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.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/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index e396e1c3d5..eba5ad1220 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.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/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index 010158440d..4a8bfcb674 100644
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.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/gtk/expert_comp_table.h b/gtk/expert_comp_table.h
index 22141a7935..11a339ba59 100644
--- a/gtk/expert_comp_table.h
+++ b/gtk/expert_comp_table.h
@@ -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/gtk/expert_dlg.c b/gtk/expert_dlg.c
index 6e049e947f..fe086fe634 100644
--- a/gtk/expert_dlg.c
+++ b/gtk/expert_dlg.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/gtk/fc_stat.c b/gtk/fc_stat.c
index 8336c8dea0..71a204e156 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.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/gtk/file_dlg.c b/gtk/file_dlg.c
index 9ff9129ac5..0e1a8da3d7 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.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/gtk/file_dlg.h b/gtk/file_dlg.h
index 74b1a2fce5..ead49086c2 100644
--- a/gtk/file_dlg.h
+++ b/gtk/file_dlg.h
@@ -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/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 1cb519604b..a0a01b0bd6 100644
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.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/gtk/fileset_dlg.h b/gtk/fileset_dlg.h
index 9ed4b3a7bf..89fe16493a 100644
--- a/gtk/fileset_dlg.h
+++ b/gtk/fileset_dlg.h
@@ -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/gtk/filter_dlg.c b/gtk/filter_dlg.c
index bfa0c7768d..162032fabc 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.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/gtk/filter_dlg.h b/gtk/filter_dlg.h
index 822c37f363..6ace508880 100644
--- a/gtk/filter_dlg.h
+++ b/gtk/filter_dlg.h
@@ -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/gtk/find_dlg.c b/gtk/find_dlg.c
index 3ea41420a9..624494f2b7 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.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/gtk/find_dlg.h b/gtk/find_dlg.h
index 46fc2cc1fb..8800abffc6 100644
--- a/gtk/find_dlg.h
+++ b/gtk/find_dlg.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index fa2dd28aff..bc440aaa5d 100644
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -5,8 +5,8 @@
* Copyright 2004, Ericsson , Spain
* By Francisco Alcoba <francisco.alcoba@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/gtk/follow_dlg.c b/gtk/follow_dlg.c
index cd8389cd07..c7d6a02a39 100644
--- a/gtk/follow_dlg.c
+++ b/gtk/follow_dlg.c
@@ -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 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/follow_dlg.h b/gtk/follow_dlg.h
index 423da70eab..d88dae7448 100644
--- a/gtk/follow_dlg.h
+++ b/gtk/follow_dlg.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2000 Gerald Combs
*
diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 732783d114..0e0e55a3d9 100644
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.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/gtk/font_utils.h b/gtk/font_utils.h
index 16dcc15d4e..eaeec828ed 100644
--- a/gtk/font_utils.h
+++ b/gtk/font_utils.h
@@ -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/gtk/funnel_stat.c b/gtk/funnel_stat.c
index 5eb5cd26c7..99de2c04b7 100644
--- a/gtk/funnel_stat.c
+++ b/gtk/funnel_stat.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/gtk/goto_dlg.c b/gtk/goto_dlg.c
index d7918600e0..33f2a3f440 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.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/gtk/goto_dlg.h b/gtk/goto_dlg.h
index 0614acd167..3646a203d3 100644
--- a/gtk/goto_dlg.h
+++ b/gtk/goto_dlg.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index 31b0b2c01f..e1b0bbbeeb 100644
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -9,8 +9,8 @@
* based on rtp_analysis.c and io_stat
*
*
- * 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/gtk/graph_analysis.h b/gtk/graph_analysis.h
index 508c149a28..7fe5b02ce3 100644
--- a/gtk/graph_analysis.h
+++ b/gtk/graph_analysis.h
@@ -9,8 +9,8 @@
* based on rtp_analysis.c and io_stat
*
*
- * 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/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 3775db98ef..de5551cb1c 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.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/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index 433c13d208..20e8b662db 100644
--- a/gtk/gsm_map_stat.c
+++ b/gtk/gsm_map_stat.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/gtk/gsm_map_stat.h b/gtk/gsm_map_stat.h
index 283aac6b69..39d3d6d4d3 100644
--- a/gtk/gsm_map_stat.h
+++ b/gtk/gsm_map_stat.h
@@ -5,8 +5,8 @@
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
*
- * 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/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c
index dc4c288402..7515bf808e 100644
--- a/gtk/gsm_map_summary.c
+++ b/gtk/gsm_map_summary.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/gtk/gtkglobals.h b/gtk/gtkglobals.h
index c1226e6cbb..09cf5056ef 100644
--- a/gtk/gtkglobals.h
+++ b/gtk/gtkglobals.h
@@ -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/gtk/gui_prefs.c b/gtk/gui_prefs.c
index f8dda783f0..be05f0fcc5 100644
--- a/gtk/gui_prefs.c
+++ b/gtk/gui_prefs.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/gtk/gui_prefs.h b/gtk/gui_prefs.h
index b88e0eae28..8454382a40 100644
--- a/gtk/gui_prefs.h
+++ b/gtk/gui_prefs.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h
index 52feb0673c..595ed1348e 100644
--- a/gtk/gui_stat_menu.h
+++ b/gtk/gui_stat_menu.h
@@ -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/gtk/gui_stat_util.c b/gtk/gui_stat_util.c
index 81418cb89a..c343592666 100644
--- a/gtk/gui_stat_util.c
+++ b/gtk/gui_stat_util.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/gtk/gui_stat_util.h b/gtk/gui_stat_util.h
index 676563d0bb..f80f2c28b1 100644
--- a/gtk/gui_stat_util.h
+++ b/gtk/gui_stat_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/gtk/gui_utils.c b/gtk/gui_utils.c
index c3cd19d377..552a8a789f 100644
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.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/gtk/gui_utils.h b/gtk/gui_utils.h
index 07b01e284c..b6b42fb76f 100644
--- a/gtk/gui_utils.h
+++ b/gtk/gui_utils.h
@@ -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/gtk/h225_counter.c b/gtk/h225_counter.c
index c84685245e..d9536f3d5c 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.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/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index e053b3e20f..d911928544 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.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/gtk/help_dlg.c b/gtk/help_dlg.c
index ca3c4e04ed..f64898cdf4 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -4,8 +4,8 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h
index a1702042f3..33e788a3a2 100644
--- a/gtk/help_dlg.h
+++ b/gtk/help_dlg.h
@@ -4,7 +4,7 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2000 Gerald Combs
*
diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c
index c7dacea0f9..d4ced9afa6 100644
--- a/gtk/hostlist_eth.c
+++ b/gtk/hostlist_eth.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/gtk/hostlist_fc.c b/gtk/hostlist_fc.c
index d6c63cae16..8ff756882b 100644
--- a/gtk/hostlist_fc.c
+++ b/gtk/hostlist_fc.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/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c
index 2fe1607b09..32723d9e25 100644
--- a/gtk/hostlist_fddi.c
+++ b/gtk/hostlist_fddi.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/gtk/hostlist_ip.c b/gtk/hostlist_ip.c
index e1b1cfe765..523cef7a71 100644
--- a/gtk/hostlist_ip.c
+++ b/gtk/hostlist_ip.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/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c
index 09db3745ba..cd02f04b3b 100644
--- a/gtk/hostlist_ipx.c
+++ b/gtk/hostlist_ipx.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/gtk/hostlist_jxta.c b/gtk/hostlist_jxta.c
index b239f6a8e6..ff124a1ef7 100644
--- a/gtk/hostlist_jxta.c
+++ b/gtk/hostlist_jxta.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/gtk/hostlist_ncp.c b/gtk/hostlist_ncp.c
index 7757de2714..1d40d6c03f 100644
--- a/gtk/hostlist_ncp.c
+++ b/gtk/hostlist_ncp.c
@@ -2,8 +2,8 @@
* modified from endpoint_talkers_eth.c 2003 Ronnie Sahlberg
*
* $Id: hostlist_ncp.c
- * 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/gtk/hostlist_rsvp.c b/gtk/hostlist_rsvp.c
index 1d6849872e..1a3ceb0def 100644
--- a/gtk/hostlist_rsvp.c
+++ b/gtk/hostlist_rsvp.c
@@ -1,8 +1,8 @@
/* hostlist_rsvp.c
* hostlist_rsvp.c August 2005, Manu Pathak <mapathak@cisco.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/gtk/hostlist_table.c b/gtk/hostlist_table.c
index eca6612a7b..d3cb51f188 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.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/gtk/hostlist_table.h b/gtk/hostlist_table.h
index 99577ef080..bd7794017c 100644
--- a/gtk/hostlist_table.h
+++ b/gtk/hostlist_table.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/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c
index ea3272e050..b98ec910f9 100644
--- a/gtk/hostlist_tcpip.c
+++ b/gtk/hostlist_tcpip.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/gtk/hostlist_tr.c b/gtk/hostlist_tr.c
index 5112035a02..34c2baf236 100644
--- a/gtk/hostlist_tr.c
+++ b/gtk/hostlist_tr.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/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c
index 2c36a20c2a..24f4c30209 100644
--- a/gtk/hostlist_udpip.c
+++ b/gtk/hostlist_udpip.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/gtk/hostlist_wlan.c b/gtk/hostlist_wlan.c
index e123485049..bfe7547fd6 100644
--- a/gtk/hostlist_wlan.c
+++ b/gtk/hostlist_wlan.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/gtk/io_stat.c b/gtk/io_stat.c
index b6b983d241..863e000c5d 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.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/gtk/isprint.h b/gtk/isprint.h
index cd4a836120..c1dd32cefb 100644
--- a/gtk/isprint.h
+++ b/gtk/isprint.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/gtk/keys.h b/gtk/keys.h
index afa0295f2c..9c150757bf 100644
--- a/gtk/keys.h
+++ b/gtk/keys.h
@@ -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/gtk/layout_prefs.c b/gtk/layout_prefs.c
index 25ae22f3a7..c3a34c159d 100644
--- a/gtk/layout_prefs.c
+++ b/gtk/layout_prefs.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/gtk/layout_prefs.h b/gtk/layout_prefs.h
index 34fb157633..89b64d086b 100644
--- a/gtk/layout_prefs.h
+++ b/gtk/layout_prefs.h
@@ -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/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 954d50b319..6bfc24c08f 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.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/gtk/main.c b/gtk/main.c
index d5503a73b9..c1df9c3b1e 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -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
*
* Richard Sharpe, 13-Feb-1999, added support for initializing structures
diff --git a/gtk/main.h b/gtk/main.h
index 3a822ce6d0..bbbfa129db 100644
--- a/gtk/main.h
+++ b/gtk/main.h
@@ -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/gtk/mcast_stream.c b/gtk/mcast_stream.c
index 0247dc07f5..e91cab21af 100644
--- a/gtk/mcast_stream.c
+++ b/gtk/mcast_stream.c
@@ -8,8 +8,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/mcast_stream.h b/gtk/mcast_stream.h
index a79d165db7..0f413a47f3 100644
--- a/gtk/mcast_stream.h
+++ b/gtk/mcast_stream.h
@@ -8,8 +8,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index 3269308ad2..ee5be8e20c 100644
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -8,8 +8,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/mcast_stream_dlg.h b/gtk/mcast_stream_dlg.h
index a36aaa624f..b935db6e44 100644
--- a/gtk/mcast_stream_dlg.h
+++ b/gtk/mcast_stream_dlg.h
@@ -8,8 +8,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/menu.c b/gtk/menu.c
index 000a40ec00..5eded936c6 100644
--- a/gtk/menu.c
+++ b/gtk/menu.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/gtk/menu.h b/gtk/menu.h
index 06e51a3a61..da9ec1db7b 100644
--- a/gtk/menu.h
+++ b/gtk/menu.h
@@ -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/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index 6705322658..dad9b86455 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.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/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index 11c75907f0..40117aa427 100644
--- a/gtk/mtp3_stat.c
+++ b/gtk/mtp3_stat.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/gtk/mtp3_stat.h b/gtk/mtp3_stat.h
index 3aded4a8fe..0249da73f5 100644
--- a/gtk/mtp3_stat.h
+++ b/gtk/mtp3_stat.h
@@ -5,8 +5,8 @@
* Copyright 2004, Michael Lum <mlum [AT] telostech.com>,
* In association with Telos Technology Inc.
*
- * 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/gtk/mtp3_summary.c b/gtk/mtp3_summary.c
index 9d24805979..a3872260ad 100644
--- a/gtk/mtp3_summary.c
+++ b/gtk/mtp3_summary.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/gtk/nameres_prefs.c b/gtk/nameres_prefs.c
index 22d701009d..f02a231911 100644
--- a/gtk/nameres_prefs.c
+++ b/gtk/nameres_prefs.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/gtk/nameres_prefs.h b/gtk/nameres_prefs.h
index 22866adc35..b25995fc56 100644
--- a/gtk/nameres_prefs.h
+++ b/gtk/nameres_prefs.h
@@ -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/gtk/ncp_stat.c b/gtk/ncp_stat.c
index f5a6fa6873..396855f42a 100644
--- a/gtk/ncp_stat.c
+++ b/gtk/ncp_stat.c
@@ -3,8 +3,8 @@
*
* $Id: ncp_stat.c 00000 2005-09-22 11:09:36Z xxx $
*
- * 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/gtk/packet_history.c b/gtk/packet_history.c
index 4a3370028c..6a6b1917b5 100644
--- a/gtk/packet_history.c
+++ b/gtk/packet_history.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/gtk/packet_history.h b/gtk/packet_history.h
index 9957ce976f..1c6888b629 100644
--- a/gtk/packet_history.h
+++ b/gtk/packet_history.h
@@ -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/gtk/packet_list.c b/gtk/packet_list.c
index 80ea3b53f7..61b697d210 100644
--- a/gtk/packet_list.c
+++ b/gtk/packet_list.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/gtk/packet_list.h b/gtk/packet_list.h
index 3953017e35..2d77f1636d 100644
--- a/gtk/packet_list.h
+++ b/gtk/packet_list.h
@@ -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/gtk/packet_win.c b/gtk/packet_win.c
index 78af4bccae..711d3aa492 100644
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.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/gtk/packet_win.h b/gtk/packet_win.h
index 38b2ac7561..86e5e483e8 100644
--- a/gtk/packet_win.h
+++ b/gtk/packet_win.h
@@ -5,7 +5,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c
index 10b0705597..4b04a1a98b 100644
--- a/gtk/plugins_dlg.c
+++ b/gtk/plugins_dlg.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 1999 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/plugins_dlg.h b/gtk/plugins_dlg.h
index 63851b014d..482aa80a62 100644
--- a/gtk/plugins_dlg.h
+++ b/gtk/plugins_dlg.h
@@ -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/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index bf7740bb22..c1bf01a74d 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.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/gtk/prefs_dlg.h b/gtk/prefs_dlg.h
index 96cc238786..e37d696aa0 100644
--- a/gtk/prefs_dlg.h
+++ b/gtk/prefs_dlg.h
@@ -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/gtk/print_dlg.c b/gtk/print_dlg.c
index bf4964aa6e..131b02b5e9 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.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/gtk/print_mswin.c b/gtk/print_mswin.c
index 8e772628fa..2d1713903c 100644
--- a/gtk/print_mswin.c
+++ b/gtk/print_mswin.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 2002, Jeffrey C. Foster <jfoste@woodward.com>
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/print_mswin.h b/gtk/print_mswin.h
index 0f221eae62..21a5bce9aa 100644
--- a/gtk/print_mswin.h
+++ b/gtk/print_mswin.h
@@ -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 2002, Jeffrey C. Foster <jfoste@woodward.com>
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c
index a90e6ff3ff..1e6598c158 100644
--- a/gtk/print_prefs.c
+++ b/gtk/print_prefs.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/gtk/print_prefs.h b/gtk/print_prefs.h
index 80df32775f..0cc8cccd7b 100644
--- a/gtk/print_prefs.h
+++ b/gtk/print_prefs.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c
index 135cd01767..84d318a4c8 100644
--- a/gtk/progress_dlg.c
+++ b/gtk/progress_dlg.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/gtk/proto_dlg.c b/gtk/proto_dlg.c
index b795dcbfbc..248e333cf4 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -4,8 +4,8 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/proto_dlg.h b/gtk/proto_dlg.h
index fb2c331f91..2d37814014 100644
--- a/gtk/proto_dlg.h
+++ b/gtk/proto_dlg.h
@@ -4,7 +4,7 @@
*
* Laurent Deniel <laurent.deniel@free.fr>
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2000 Gerald Combs
*
diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c
index ef4f466a90..8c688c0012 100644
--- a/gtk/proto_draw.c
+++ b/gtk/proto_draw.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
*
* Jeff Foster, 2001/03/12, added support for displaying named
diff --git a/gtk/proto_draw.h b/gtk/proto_draw.h
index 3a3c5f09f2..e5928b8b56 100644
--- a/gtk/proto_draw.h
+++ b/gtk/proto_draw.h
@@ -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/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index ccd38086c8..00a6b4f1d1 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -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/gtk/proto_hier_stats_dlg.h b/gtk/proto_hier_stats_dlg.h
index 6725ee9718..6dceaf8716 100644
--- a/gtk/proto_hier_stats_dlg.h
+++ b/gtk/proto_hier_stats_dlg.h
@@ -2,7 +2,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/range_utils.c b/gtk/range_utils.c
index 12371f2ca4..f7acd3a685 100644
--- a/gtk/range_utils.c
+++ b/gtk/range_utils.c
@@ -5,8 +5,8 @@
*
* Ulf Lamping <ulf.lamping@web.de>
*
- * 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/gtk/range_utils.h b/gtk/range_utils.h
index 8d7ff239c5..c7cd8bf593 100644
--- a/gtk/range_utils.h
+++ b/gtk/range_utils.h
@@ -5,8 +5,8 @@
*
* Ulf Lamping <ulf.lamping@web.de>
*
- * 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/gtk/recent.c b/gtk/recent.c
index 9da6821050..054279ef26 100644
--- a/gtk/recent.c
+++ b/gtk/recent.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/gtk/recent.h b/gtk/recent.h
index ab53fa642c..2450aadff1 100644
--- a/gtk/recent.h
+++ b/gtk/recent.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/gtk/rpc_progs.c b/gtk/rpc_progs.c
index 4a368692df..5b226748e1 100644
--- a/gtk/rpc_progs.c
+++ b/gtk/rpc_progs.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/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 471a1cf666..42c57c7fc3 100644
--- a/gtk/rpc_stat.c
+++ b/gtk/rpc_stat.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/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index a3b616bf02..2cd698fe91 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -14,8 +14,8 @@
* By Alejandro Vaquero <alejandro.vaquero@verso.com>
* Based on io_stat.c by Ronnie Sahlberg
*
- * 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/gtk/rtp_analysis.h b/gtk/rtp_analysis.h
index dc88c8dc49..8535ef7b35 100644
--- a/gtk/rtp_analysis.h
+++ b/gtk/rtp_analysis.h
@@ -10,8 +10,8 @@
* Copyright 2003, Iskratel, Ltd, Kranj
* By Miha Jemec <m.jemec@iskratel.si>
*
- * 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/gtk/rtp_stream.c b/gtk/rtp_stream.c
index 75b82fc65f..39c7b19e12 100644
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -6,8 +6,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/rtp_stream.h b/gtk/rtp_stream.h
index d826c49d8a..1ba4a1ac23 100644
--- a/gtk/rtp_stream.h
+++ b/gtk/rtp_stream.h
@@ -6,8 +6,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 8896e0cac4..8b5f7f8a2d 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -6,8 +6,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/rtp_stream_dlg.h b/gtk/rtp_stream_dlg.h
index 4f5cc5b82f..2884b690e5 100644
--- a/gtk/rtp_stream_dlg.h
+++ b/gtk/rtp_stream_dlg.h
@@ -6,8 +6,8 @@
* Copyright 2003, Alcatel Business Systems
* By Lars Ruoff <lars.ruoff@gmx.net>
*
- * 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/gtk/sat.h b/gtk/sat.h
index 6a1043affb..8fbba9a3b3 100644
--- a/gtk/sat.h
+++ b/gtk/sat.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/gtk/scsi_stat.c b/gtk/scsi_stat.c
index f97aa5a087..b7b5f4d9fc 100644
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -3,8 +3,8 @@
*
* $Id: scsi_stat.c 17252 2006-02-11 13:05:24Z lego $
*
- * 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/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c
index 293274de57..87eefa57ba 100644
--- a/gtk/sctp_assoc_analyse.c
+++ b/gtk/sctp_assoc_analyse.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/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index 20ec911ef6..cff0998feb 100644
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.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/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index d4c8a3f5f7..eecbf55b53 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.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/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c
index 2495d58064..9ba5248762 100644
--- a/gtk/sctp_chunk_stat_dlg.c
+++ b/gtk/sctp_chunk_stat_dlg.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/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c
index 1eb37abf7a..0489770d15 100644
--- a/gtk/sctp_error_dlg.c
+++ b/gtk/sctp_error_dlg.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/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index 90d04b3088..37b89a15f4 100644
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.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/gtk/sctp_stat.c b/gtk/sctp_stat.c
index bf7b02fcf4..b29f68e9a9 100644
--- a/gtk/sctp_stat.c
+++ b/gtk/sctp_stat.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/gtk/sctp_stat.h b/gtk/sctp_stat.h
index 87d0284f7c..d08e64fd3e 100644
--- a/gtk/sctp_stat.h
+++ b/gtk/sctp_stat.h
@@ -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/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c
index 054337bbde..fc51798a33 100644
--- a/gtk/sctp_stat_dlg.c
+++ b/gtk/sctp_stat_dlg.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/gtk/service_response_time_table.c b/gtk/service_response_time_table.c
index 2764deace6..ec5e24d21d 100644
--- a/gtk/service_response_time_table.c
+++ b/gtk/service_response_time_table.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/gtk/service_response_time_table.h b/gtk/service_response_time_table.h
index c62afa2b5e..217017e2f4 100644
--- a/gtk/service_response_time_table.h
+++ b/gtk/service_response_time_table.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/gtk/simple_dialog.c b/gtk/simple_dialog.c
index adfec0125f..acbc186c48 100644
--- a/gtk/simple_dialog.c
+++ b/gtk/simple_dialog.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/gtk/sip_stat.c b/gtk/sip_stat.c
index c4661aeca2..9ed590b588 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -4,8 +4,8 @@
* $Id$
* Copied from http_stat.c
*
- * 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/gtk/smb2_stat.c b/gtk/smb2_stat.c
index 76b87900ce..48db32bb05 100644
--- a/gtk/smb2_stat.c
+++ b/gtk/smb2_stat.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/gtk/smb_stat.c b/gtk/smb_stat.c
index 1608f3c838..1ecb10b1cf 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.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/gtk/ssl-dlg.h b/gtk/ssl-dlg.h
index 01ea92ad6c..38018bdf33 100644
--- a/gtk/ssl-dlg.h
+++ b/gtk/ssl-dlg.h
@@ -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/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c
index b90fac5999..9117683bd8 100644
--- a/gtk/stats_tree_stat.c
+++ b/gtk/stats_tree_stat.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/gtk/stream_prefs.c b/gtk/stream_prefs.c
index eb18c37e8e..14f6e5911f 100644
--- a/gtk/stream_prefs.c
+++ b/gtk/stream_prefs.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/gtk/stream_prefs.h b/gtk/stream_prefs.h
index 0e934d68ea..52ad6a645c 100644
--- a/gtk/stream_prefs.h
+++ b/gtk/stream_prefs.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1999 Gerald Combs
*
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index cab8194c3d..828b4ddef4 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.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/gtk/summary_dlg.h b/gtk/summary_dlg.h
index 3b33cd0804..64a0505dd4 100644
--- a/gtk/summary_dlg.h
+++ b/gtk/summary_dlg.h
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 1998 Gerald Combs
*
diff --git a/gtk/supported_protos_dlg.c b/gtk/supported_protos_dlg.c
index 4209c8c124..1099d667f0 100644
--- a/gtk/supported_protos_dlg.c
+++ b/gtk/supported_protos_dlg.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 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/supported_protos_dlg.h b/gtk/supported_protos_dlg.h
index ef9dd8bd37..cbaf2b64aa 100644
--- a/gtk/supported_protos_dlg.h
+++ b/gtk/supported_protos_dlg.h
@@ -4,7 +4,7 @@
*
* $Id$
*
- * Ethereal - Network traffic analyzer
+ * Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
* Copyright 2000 Gerald Combs
*
diff --git a/gtk/t38_analysis.c b/gtk/t38_analysis.c
index fe5589fb26..55f99fbb0f 100644
--- a/gtk/t38_analysis.c
+++ b/gtk/t38_analysis.c
@@ -7,8 +7,8 @@
* By Alejandro Vaquero <alejandro.vaquero@verso.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/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 6134c6cef2..4c5c7ee47e 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.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/gtk/tcp_graph.c b/gtk/tcp_graph.c
index e7a3d666d6..ccd990284c 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.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/gtk/text_page.c b/gtk/text_page.c
index a51c8a10d8..e565c0bc72 100644
--- a/gtk/text_page.c
+++ b/gtk/text_page.c
@@ -4,8 +4,8 @@
*
* Ulf Lamping
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 2000 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/text_page.h b/gtk/text_page.h
index 893d371cc7..dc864ab68c 100644
--- a/gtk/text_page.h
+++ b/gtk/text_page.h
@@ -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/gtk/toolbar.c b/gtk/toolbar.c
index f68f43bdd7..9711eb4ce6 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.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/gtk/toolbar.h b/gtk/toolbar.h
index ba51487b51..4097cd3f83 100644
--- a/gtk/toolbar.h
+++ b/gtk/toolbar.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/gtk/voip_calls.c b/gtk/voip_calls.c
index 12c7eee41d..fd1f6967e6 100644
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -14,8 +14,8 @@
* By Alejandro Vaquero, alejandro.vaquero@verso.com
* Copyright 2005, Verso Technologies Inc.
*
- * 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/gtk/voip_calls.h b/gtk/voip_calls.h
index e24221cbea..6a8caa70a4 100644
--- a/gtk/voip_calls.h
+++ b/gtk/voip_calls.h
@@ -14,8 +14,8 @@
* By Alejandro Vaquero, alejandro.vaquero@verso.com
* Copyright 2005, Verso Technologies Inc.
*
- * 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/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index f626c6977a..17ebda4a57 100644
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -14,8 +14,8 @@
* By Alejandro Vaquero, alejandro.vaquero@verso.com
* Copyright 2005, Verso Technologies Inc.
*
- * 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/gtk/voip_calls_dlg.h b/gtk/voip_calls_dlg.h
index 74bd793f89..eeda170c1b 100644
--- a/gtk/voip_calls_dlg.h
+++ b/gtk/voip_calls_dlg.h
@@ -14,8 +14,8 @@
* By Alejandro Vaquero, alejandro.vaquero@verso.com
* Copyright 2005, Verso Technologies Inc.
*
- * 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/gtk/webbrowser.h b/gtk/webbrowser.h
index 7765f0b127..84d9e10e22 100644
--- a/gtk/webbrowser.h
+++ b/gtk/webbrowser.h
@@ -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/gtk/win32-file-dlg.c b/gtk/win32-file-dlg.c
index c738cc0b52..83411e0c95 100644
--- a/gtk/win32-file-dlg.c
+++ b/gtk/win32-file-dlg.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 2004 Gerald Combs
*
* This program is free software; you can redistribute it and/or
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index b7830223d2..08250e5087 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.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/help/Makefile.am b/help/Makefile.am
index 2c3b3fda5a..feec7c860e 100644
--- a/help/Makefile.am
+++ b/help/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 2003 Gerald Combs
#
# This program is free software; you can redistribute it and/or
diff --git a/image/capinfos.rc.in b/image/capinfos.rc.in
index e82463d6c6..7c41729fe8 100644
--- a/image/capinfos.rc.in
+++ b/image/capinfos.rc.in
@@ -23,7 +23,7 @@ BEGIN
VALUE "FileDescription", "Capinfos\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "Capinfos @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "Capinfos.exe\0"
VALUE "ProductName", "Capinfos\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/image/dumpcap.rc.in b/image/dumpcap.rc.in
index d6c148ae6e..4094b1ef34 100644
--- a/image/dumpcap.rc.in
+++ b/image/dumpcap.rc.in
@@ -23,7 +23,7 @@ BEGIN
VALUE "FileDescription", "Dumpcap\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "Dumpcap @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "Dumpcap.exe\0"
VALUE "ProductName", "Dumpcap\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/image/editcap.rc.in b/image/editcap.rc.in
index b181460312..f16df4c268 100644
--- a/image/editcap.rc.in
+++ b/image/editcap.rc.in
@@ -23,7 +23,7 @@ BEGIN
VALUE "FileDescription", "Editcap\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "Editcap @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "Editcap.exe\0"
VALUE "ProductName", "Editcap\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/image/ethereal.rc.in b/image/ethereal.rc.in
index adb9401a48..b144652c5a 100644
--- a/image/ethereal.rc.in
+++ b/image/ethereal.rc.in
@@ -25,7 +25,7 @@ BEGIN
VALUE "FileDescription", "Ethereal\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "Ethereal @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "Ethereal.exe\0"
VALUE "ProductName", "Ethereal\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/image/libethereal.rc.in b/image/libethereal.rc.in
index 9a634558f0..381d331bef 100644
--- a/image/libethereal.rc.in
+++ b/image/libethereal.rc.in
@@ -21,7 +21,7 @@ BEGIN
VALUE "FileDescription", "Ethereal dissector library\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "libethereal @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "libethereal.dll\0"
VALUE "ProductName", "Ethereal\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/image/mergecap.rc.in b/image/mergecap.rc.in
index 2f8a9457bd..1f0d887f99 100644
--- a/image/mergecap.rc.in
+++ b/image/mergecap.rc.in
@@ -23,7 +23,7 @@ BEGIN
VALUE "FileDescription", "Mergecap\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "Mergecap @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "Mergecap.exe\0"
VALUE "ProductName", "Mergecap\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/image/tethereal.rc.in b/image/tethereal.rc.in
index 13beb9f138..4f02f0f105 100644
--- a/image/tethereal.rc.in
+++ b/image/tethereal.rc.in
@@ -23,7 +23,7 @@ BEGIN
VALUE "FileDescription", "Tethereal\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "Tethereal @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "Tethereal.exe\0"
VALUE "ProductName", "Tethereal\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/image/wiretap.rc.in b/image/wiretap.rc.in
index fa0a3e108a..dddfc3b1cc 100644
--- a/image/wiretap.rc.in
+++ b/image/wiretap.rc.in
@@ -21,7 +21,7 @@ BEGIN
VALUE "FileDescription", "Ethereal capture file library\0"
VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "wiretap @VERSION@\0"
- VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+ VALUE "LegalCopyright", "Copyright 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
VALUE "OriginalFilename", "wiretap-@VERSION@.dll\0"
VALUE "ProductName", "Ethereal\0"
VALUE "ProductVersion", "@VERSION@\0"
diff --git a/isprint.h b/isprint.h
index 85a23b6b43..297f670158 100644
--- a/isprint.h
+++ b/isprint.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/log.h b/log.h
index 768d3db8f2..5e12b33a19 100644
--- a/log.h
+++ b/log.h
@@ -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/main_window.h b/main_window.h
index a5e4a54d79..e69c39bc40 100644
--- a/main_window.h
+++ b/main_window.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/make-version.pl b/make-version.pl
index dca0307a51..58cb5df4bc 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -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/manuf b/manuf
index 482f0790be..ef0c72a969 100644
--- a/manuf
+++ b/manuf
@@ -8,7 +8,7 @@
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] ethereal.com>
# Copyright 1998 Gerald Combs
#
@@ -9233,7 +9233,7 @@ EC:10:00 EnanceSour # Enance Source Co., Ltd. PC clones(?)
#
# $Id$
#
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] ethereal.com>
# Copyright 1998 Gerald Combs
#
diff --git a/manuf.tmpl b/manuf.tmpl
index 31dbe958e0..f939e085dc 100644
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -5,7 +5,7 @@
#
# Laurent Deniel <laurent.deniel [AT] free.fr>
#
-# Ethereal - Network traffic analyzer
+# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald [AT] ethereal.com>
# Copyright 1998 Gerald Combs
#
diff --git a/menu.h b/menu.h
index 75b8d5b61c..9664ac02a6 100644
--- a/menu.h
+++ b/menu.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/merge.h b/merge.h
index 209f78bc05..ae2faeffb1 100644
--- a/merge.h
+++ b/merge.h
@@ -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/packaging/svr4/pkginfo.in b/packaging/svr4/pkginfo.in
index 70a8a9bfce..d866224c31 100644
--- a/packaging/svr4/pkginfo.in
+++ b/packaging/svr4/pkginfo.in
@@ -7,7 +7,7 @@ CATEGORY="application,network"
DESC="A GUI network protocol analyzer"
VENDOR="Ethereal Development Team"
PSTAMP="2000-07-16"
-EMAIL="gerald@ethereal.com"
+EMAIL="gerald@wireshark.org"
ISTATES="S s 1 2 3"
RSTATES="S s 1 2 3"
BASEDIR=""
diff --git a/packet-range.c b/packet-range.c
index 4c53c92f9f..6d98b121e1 100644
--- a/packet-range.c
+++ b/packet-range.c
@@ -6,8 +6,8 @@
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
*
- * 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/packet-range.h b/packet-range.h
index b4e9f66bc9..3b970f50fa 100644
--- a/packet-range.h
+++ b/packet-range.h
@@ -6,8 +6,8 @@
* Dick Gooris <gooris@lucent.com>
* Ulf Lamping <ulf.lamping@web.de>
*
- * 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/pcapio.c b/pcapio.c
index ad8f057a33..5c4b885925 100644
--- a/pcapio.c
+++ b/pcapio.c
@@ -18,8 +18,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
*
* Derived from code in the Wiretap Library
diff --git a/pcapio.h b/pcapio.h
index 801a563e49..ae2d4e93c5 100644
--- a/pcapio.h
+++ b/pcapio.h
@@ -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
*
* Derived from code in the Wiretap Library
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
diff --git a/print.c b/print.c
index 892438caa4..fafacfe8ed 100644
--- a/print.c
+++ b/print.c
@@ -5,8 +5,8 @@
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * 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/print.h b/print.h
index 1325e03be7..6c2617ff60 100644
--- a/print.h
+++ b/print.h
@@ -5,8 +5,8 @@
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * 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/print.ps b/print.ps
index 49151e3dcc..547f32e46e 100644
--- a/print.ps
+++ b/print.ps
@@ -7,8 +7,8 @@
%!
%!PS-Adobe-2.0
%
-% Ethereal - Network traffic analyzer
-% By Gerald Combs <gerald@ethereal.com>
+% Wireshark - Network traffic analyzer
+% By Gerald Combs <gerald@wireshark.org>
% Copyright 1998 Gerald Combs
%
%%Creator: Ethereal
diff --git a/progress_dlg.h b/progress_dlg.h
index c4f1932c53..0f404c71d7 100644
--- a/progress_dlg.h
+++ b/progress_dlg.h
@@ -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/proto_hier_stats.c b/proto_hier_stats.c
index beacf589b2..8706001e64 100644
--- a/proto_hier_stats.c
+++ b/proto_hier_stats.c
@@ -3,8 +3,8 @@
*