Use consistent "generated automatically" wording which will hopefully be

picked up by licensecheck.

svn path=/trunk/; revision=48812

5 files changed, 9 insertions, 11 deletions

diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index daa1ae0ed4..7427800945 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -1,5 +1,5 @@
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
+/* Do not modify this file. Changes will be overwritten.                      */
+/* Generated automatically by the ASN.1 to Wireshark dissector compiler       */
 /* packet-snmp.c                                                              */
 /* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . -O ../../epan/dissectors snmp.asn */
 
diff --git a/epan/dissectors/packet-snmp.h b/epan/dissectors/packet-snmp.h
index f0a793752b..a7f78158ef 100644
--- a/epan/dissectors/packet-snmp.h
+++ b/epan/dissectors/packet-snmp.h
@@ -1,5 +1,5 @@
-/* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
+/* Do not modify this file. Changes will be overwritten.                      */
+/* Generated automatically by the ASN.1 to Wireshark dissector compiler       */
 /* packet-snmp.h                                                              */
 /* ../../tools/asn2wrs.py -b -p snmp -c ./snmp.cnf -s ./packet-snmp-template -D . -O ../../epan/dissectors snmp.asn */
 
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index 1771974ba0..1eb613773b 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -2896,8 +2896,8 @@ class EthOut:
   #--- fhdr -------------------------------------------------------
   def fhdr(self, fn, comment=None):
     out = ''
-    out += self.outcomment('Do not modify this file.', comment)
-    out += self.outcomment('It is created automatically by the ASN.1 to Wireshark dissector compiler', comment)
+    out += self.outcomment('Do not modify this file. Changes will be overwritten.', comment)
+    out += self.outcomment('Generated automatically by the ASN.1 to Wireshark dissector compiler', comment)
     out += self.outcomment(os.path.basename(fn), comment)
     out += self.outcomment(' '.join(sys.argv), comment)
     out += '\n'
diff --git a/tools/make-tap-reg.py b/tools/make-tap-reg.py
index aaf35f9fbd..c038485ebf 100755
--- a/tools/make-tap-reg.py
+++ b/tools/make-tap-reg.py
@@ -131,8 +131,8 @@ regs['tap_reg'].sort()
 
 reg_code = open(tmp_filename, "w")
 
-reg_code.write("/* Do not modify this file.  */\n")
-reg_code.write("/* It is created automatically by the Makefile.  */\n")
+reg_code.write("/* Do not modify this file. Changes will be overwritten.  */\n")
+reg_code.write("/* Generated automatically from %s  */\n" % (sys.argv[0]))
 
 # Make the routine to register all taps
 reg_code.write("""
@@ -159,5 +159,3 @@ except OSError:
 
 # Move from tmp file to final file
 os.rename(tmp_filename, final_filename)
-
-
diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index f1bc4f2ef2..49de111851 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -5705,8 +5705,8 @@ def produce_code():
 	global errors
 
 	print "/*"
+	print " * Do not modify this file. Changes will be overwritten."
 	print " * Generated automatically from %s" % (sys.argv[0])
-	print " * Do not edit this file manually, as all changes will be lost."
 	print " */\n"
 
 	print """