From 02cb20760b7efb6dde1a2964195f8525ccaa09c0 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 27 Apr 2017 23:42:16 -0700
Subject: [PATCH] [v9_9] change markdown comment style for pandoc

---
 HISTORY                | 11 -----------
 HISTORY.md             |  4 ++--
 OPTIONS                | 11 -----------
 OPTIONS.md             |  4 ++--
 README                 | 11 -----------
 README.md              |  4 ++--
 doc/dev/contrib.md     |  4 ++--
 doc/dev/dev.md         |  4 ++--
 doc/dev/style.md       |  4 ++--
 util/update_copyrights |  4 ++--
 10 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/HISTORY b/HISTORY
index 5eda97062f..92ccdef695 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,14 +1,3 @@
-<!--- - Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") - -
-Permission to use, copy, modify, and/or distribute this software for any -
-purpose with or without fee is hereby granted, provided that the above -
-copyright notice and this permission notice appear in all copies. - - THE
-SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY
-SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. ---> ###
 Functional enhancements from prior major releases of BIND 9
 
 BIND 9.8.0
diff --git a/HISTORY.md b/HISTORY.md
index 6850f6ade5..b12c23d81c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,4 @@
-<!---
+<!--
  - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +12,7 @@
  - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
---->
+-->
 ### Functional enhancements from prior major releases of BIND 9
 
 #### BIND 9.8.0
diff --git a/OPTIONS b/OPTIONS
index 5660c5b7b7..0be74b7aac 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -1,14 +1,3 @@
-<!--- - Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") - -
-Permission to use, copy, modify, and/or distribute this software for any -
-purpose with or without fee is hereby granted, provided that the above -
-copyright notice and this permission notice appear in all copies. - - THE
-SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY
-SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --->
 Setting the STD_CDEFINES environment variable before running configure can
 be used to enable certain compile-time options that are not explicitly
 defined in configure.
diff --git a/OPTIONS.md b/OPTIONS.md
index 06e35c402a..610087e17b 100644
--- a/OPTIONS.md
+++ b/OPTIONS.md
@@ -1,4 +1,4 @@
-<!---
+<!--
  - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +12,7 @@
  - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
---->
+-->
 Setting the `STD_CDEFINES` environment variable before running `configure`
 can be used to enable certain compile-time options that are not explicitly
 defined in `configure`.
diff --git a/README b/README
index 53f9e0f017..83bdc52434 100644
--- a/README
+++ b/README
@@ -1,14 +1,3 @@
-<!--- - Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") - -
-Permission to use, copy, modify, and/or distribute this software for any -
-purpose with or without fee is hereby granted, provided that the above -
-copyright notice and this permission notice appear in all copies. - - THE
-SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH -
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY
-SPECIAL, DIRECT, - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE - OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. ---> #
 BIND 9
 
 Contents
diff --git a/README.md b/README.md
index 083a46ceb5..7112f6aefc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<!---
+<!--
  - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +12,7 @@
  - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
---->
+-->
 # BIND 9
 
 ### Contents
diff --git a/doc/dev/contrib.md b/doc/dev/contrib.md
index 8b252c69a5..2dcdd52950 100644
--- a/doc/dev/contrib.md
+++ b/doc/dev/contrib.md
@@ -1,4 +1,4 @@
-<!---
+<!--
  - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +12,7 @@
  - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
---->
+-->
 ## BIND Source Access and Contributor Guidelines
 *Apr 14, 2017*
 
diff --git a/doc/dev/dev.md b/doc/dev/dev.md
index ac03343416..2b58483166 100644
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -1,4 +1,4 @@
-<!---
+<!--
  - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +12,7 @@
  - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
---->
+-->
 ## BIND Developer Information
 
 ### Contents
diff --git a/doc/dev/style.md b/doc/dev/style.md
index f6383c60cc..8ffa3235cd 100644
--- a/doc/dev/style.md
+++ b/doc/dev/style.md
@@ -1,4 +1,4 @@
-<!---
+<!--
  - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
  -
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -12,7 +12,7 @@
  - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
---->
+-->
 ## BIND 9 Coding Style
 
 BIND 9 is principally written in [C](#cstyle), with some additional code
diff --git a/util/update_copyrights b/util/update_copyrights
index bd303a5c91..3d9a7579ed 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -220,9 +220,9 @@ foreach $file (keys %file_types) {
                 $end_comment = "-->\n";
         } elsif ($type eq "MKD") {
                 $mkd_comment = 1;
-                $start_comment = "<!---\n";
+                $start_comment = "<!--\n";
                 $prefix = " - ";
-                $end_comment = "--->";
+                $end_comment = "-->";
         } elsif ($type eq "TXT") {
                 $prefix = "";
         } else {