From: Mark Andrews <marka@isc.org>
Date: Thu, 21 Jul 2016 08:17:28 +0000 (+1000)
Subject: use articleinfo
X-Git-Tag: v9.12.0a0~163
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1716e138bff9433a933da5259ec972dee449924a;p=thirdparty%2Fbind9.git

use articleinfo
---

diff --git a/FAQ b/FAQ
index 29475d47a14..6a75e8af81a 100644
--- a/FAQ
+++ b/FAQ
@@ -1,8 +1,6 @@
-Copyright ? 2004-2010, 2013, 2014 Internet Systems Consortium, Inc.
+Copyright ? 2000-2010, 2013-2016 Internet Systems Consortium, Inc.
 ("ISC")
 
-Copyright ? 2000-2003 Internet Software Consortium.
-
 -----------------------------------------------------------------------
 
 1. Compilation and Installation Questions
diff --git a/FAQ.xml b/FAQ.xml
index 1c7748bba64..484c40fc74b 100644
--- a/FAQ.xml
+++ b/FAQ.xml
@@ -9,8 +9,12 @@
 <!-- Converted by db4-upgrade version 1.0 -->
 <article xmlns="http://docbook.org/ns/docbook" version="5.0" class="faq">
 
-  <info>
+  <articleinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -20,16 +24,11 @@
       <year>2010</year>
       <year>2013</year>
       <year>2014</year>
+      <year>2015</year>
+      <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
-  </info>
+  </articleinfo>
   <qandaset defaultlabel="qanda">
 
     <qandadiv><title>Compilation and Installation Questions</title>