Author: gjb
Date: Thu Feb  5 15:46:01 2015
New Revision: 278265
URL: https://svnweb.freebsd.org/changeset/base/278265

Log:
  Security Advisory information is included on several
  pages in the release notes.  Rather than duplicating
  the information between various files, add two new
  files to include in all pages that currently display
  the information.
  
  Sponsored by: The FreeBSD Foundation

Added:
  head/release/doc/share/xml/errata.xml   (contents, props changed)
  head/release/doc/share/xml/security.xml   (contents, props changed)
Modified:
  head/release/doc/en_US.ISO8859-1/errata/article.xml
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/errata/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/errata/article.xml Thu Feb  5 14:54:53 
2015        (r278264)
+++ head/release/doc/en_US.ISO8859-1/errata/article.xml Thu Feb  5 15:46:01 
2015        (r278265)
@@ -4,6 +4,8 @@
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"
         "http://www.FreeBSD.org/release/XML/release.ent";>
 %release;
+<!ENTITY security SYSTEM "../../share/xml/security.xml">
+<!ENTITY errata SYSTEM "../../share/xml/errata.xml">
 ]>
 
 <article xmlns="http://docbook.org/ns/docbook";
@@ -76,7 +78,13 @@
   <sect1 xml:id="security">
     <title>Security Advisories</title>
 
-    <para>No advisory.</para>
+    &security;
+  </sect1>
+
+  <sect1 xml:id="errata">
+    <title>Errata Notices</title>
+
+    &errata;
   </sect1>
 
   <sect1 xml:id="open-issues">

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml       Thu Feb  5 
14:54:53 2015        (r278264)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml       Thu Feb  5 
15:46:01 2015        (r278265)
@@ -7,6 +7,8 @@
  %sponsor;
 <!ENTITY % vendor PUBLIC "-//FreeBSD//ENTITIES Vendor Specification//EN" 
"vendor.ent">
  %vendor;
+<!ENTITY security SYSTEM "../../share/xml/security.xml">
+<!ENTITY errata SYSTEM "../../share/xml/errata.xml">
 ]>
 <article xmlns="http://docbook.org/ns/docbook";
   xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0">
@@ -138,15 +140,13 @@
     <sect2 xml:id="security">
       <title>Security Advisories</title>
 
-      <para>No advisories.</para>
-
+      &security;
     </sect2>
 
     <sect2 xml:id="errata">
       <title>Errata Notices</title>
 
-      <para>No errata notices.</para>
-
+      &errata;
     </sect2>
   </sect1>
 

Added: head/release/doc/share/xml/errata.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/release/doc/share/xml/errata.xml       Thu Feb  5 15:46:01 2015        
(r278265)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+     The FreeBSD Documentation Project
+
+     $FreeBSD$
+-->
+<informaltable frame="none" pgwide="1">
+  <tgroup cols="3">
+    <colspec colwidth="40%"/>
+    <colspec colwidth="30%"/>
+    <colspec colwidth="30%"/>
+    <thead>
+      <row>
+       <entry>Errata</entry>
+       <entry>Date</entry>
+       <entry>Topic</entry>
+      </row>
+    </thead>
+
+    <tbody>
+      <row>
+       <entry><para>No errata notices.</para></entry>
+       <entry><para>&nbsp;</para></entry>
+       <entry><para>&nbsp;</para></entry>
+      </row>
+    </tbody>
+  </tgroup>
+</informaltable>

Added: head/release/doc/share/xml/security.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/release/doc/share/xml/security.xml     Thu Feb  5 15:46:01 2015        
(r278265)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+     The FreeBSD Documentation Project
+
+     $FreeBSD$
+-->
+<informaltable frame="none" pgwide="1">
+  <tgroup cols="3">
+    <colspec colwidth="40%"/>
+    <colspec colwidth="30%"/>
+    <colspec colwidth="30%"/>
+    <thead>
+      <row>
+       <entry>Advisory</entry>
+       <entry>Date</entry>
+       <entry>Topic</entry>
+      </row>
+    </thead>
+
+    <tbody>
+      <row>
+       <entry><para>No advisories.</para></entry>
+       <entry><para>&nbsp;</para></entry>
+       <entry><para>&nbsp;</para></entry>
+      </row>
+    </tbody>
+  </tgroup>
+</informaltable>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to