diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 8ab8aba525..9d0c11a5c6 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -8,7 +8,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * 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 21c87d9c68..1716a4dc07 100644 --- a/asn1/h248/packet-h248-template.h +++ b/asn1/h248/packet-h248-template.h @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc/packet-umts_rrc-template.c b/asn1/umts_rrc/packet-umts_rrc-template.c index 8afe9ec24f..eba40dc12e 100644 --- a/asn1/umts_rrc/packet-umts_rrc-template.c +++ b/asn1/umts_rrc/packet-umts_rrc-template.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc/packet-umts_rrc-template.h b/asn1/umts_rrc/packet-umts_rrc-template.h index 640616dbf2..bbe4234d60 100644 --- a/asn1/umts_rrc/packet-umts_rrc-template.h +++ b/asn1/umts_rrc/packet-umts_rrc-template.h @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c index f34fbdafa0..5efafd7dc8 100644 --- a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c +++ b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h index 63474fdbb9..e9be0ac6b7 100644 --- a/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h +++ b/asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c index 0c0ce79989..caaf6f6040 100644 --- a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c +++ b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h index 21aabc1f1e..c6df9b6305 100644 --- a/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h +++ b/asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c index 24aa47dc0e..3dc21a3cb1 100644 --- a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c +++ b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h index 95bf0f5cbe..2b4e3ed1c3 100644 --- a/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h +++ b/asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/docbook/dfilter2xml.pl b/docbook/dfilter2xml.pl index a2e6971215..ef1b4b4e1d 100644 --- a/docbook/dfilter2xml.pl +++ b/docbook/dfilter2xml.pl @@ -1,10 +1,10 @@ #!/usr/bin/perl # -# Reads the display filter keyword dump produced by 'ethereal -G' and +# Reads the display filter keyword dump produced by 'tshark -G' and # formats it for a pod document. The pod document is then used to # make a manpage # -# STDIN is the ethereal glossary +# STDIN is the wireshark glossary # arg1 is the pod template file. The =insert_dfilter_table token # will be replaced by the pod-formatted glossary # STDOUT is the output @@ -84,7 +84,7 @@ close(TEMPLATE) || die "Can't close $template: $!\n"; sub create_dfilter_table { - print "Ethereal Display Filter Fields\n"; + print "Wireshark Display Filter Fields\n"; $pn_counter = 1; # Print each protocol diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index 737f4d3807..b912e51cba 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -5,7 +5,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * Based on BSD rexecd code/man page and parts of packet-rlogin.c diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c index e7b531ac0d..b19871c33f 100644 --- a/epan/dissectors/packet-h248_3gpp.c +++ b/epan/dissectors/packet-h248_3gpp.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index a615c48750..908ec19180 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c index 5c97b6d010..4759f187b4 100644 --- a/epan/dissectors/packet-h248_annex_e.c +++ b/epan/dissectors/packet-h248_annex_e.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c index 6b47d23cea..784152d6f4 100644 --- a/epan/dissectors/packet-h248_q1950.c +++ b/epan/dissectors/packet-h248_q1950.c @@ -7,7 +7,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c index 2e83709462..d2669ba9c3 100644 --- a/epan/dissectors/packet-image-png.c +++ b/epan/dissectors/packet-image-png.c @@ -7,7 +7,7 @@ * Copyright 2006 Ronnie Sahlberg * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 0591c80e27..4b3f2e4dab 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -10,7 +10,7 @@ * Francisco Javier Cabello Torres, * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index fda01d4948..53ffaf1b92 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -5,7 +5,7 @@ * $Id$ * * Wireshark - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * 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 757069c81d..850e1be749 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for MATE Ethereal plugin +# Automake file for MATE Wireshark plugin # # $Id$ #