[v9_10] change markdown comment style for pandoc

diff --git a/HISTORY b/HISTORY
index e652b64afb9dc8e0b72e9719689662d9f91919c4..c446aecb9c8486de95b33e78be6899b39a33fb2c 100644 (file)
--- 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.9.0

diff --git a/HISTORY.md b/HISTORY.md
index 1f2aef25af786232f95f86612a8af5ec8c4d0637..ed3c432de7e4880396fa3d4b4e9234e870907cda 100644 (file)
--- 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.9.0

diff --git a/OPTIONS b/OPTIONS
index 5660c5b7b7dcb99bbfb3bc562372e82d35755355..0be74b7aac66845e5bbfebb73fe1d72ffa13ec19 100644 (file)
--- 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 06e35c402ad5b2842f141586af1751ba895738c1..610087e17b67777f3a55fbcbaca64a7d8f0acda5 100644 (file)
--- 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 a9692d2b0015bc6e52ea41a7623ebc5f7bd52674..1c699cece5efb0b938df3952fbaad5afee34088a 100644 (file)
--- 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 5b390b595bfeb170f014a29919946f0154acf5c3..f02202603fb1e2ea5927a1ff4af36cfe4cd82144 100644 (file)
--- 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 8b252c69a530540ba5cc96bc35ebb37f61a7f0d4..2dcdd529505d3807de541e7a16b65a0bc8ac008f 100644 (file)
--- 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 ac033434162ea2bde16bd740875fffbfce8d2f4e..2b58483166415dfe9d207f4ae63fdd06b771c79d 100644 (file)
--- 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 f6383c60ccdab79322f8b116d2755969159a7009..8ffa3235cddff6ef3074a4f6689f031da825f881 100644 (file)
--- 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 bd303a5c9180e30b3fb3b464dc54fc4575fe7d6b..3d9a7579ed8e17dd2c77bb768ace8ab07ff462ed 100644 (file)
--- 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 {