Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code

docs/FAQ.xml

@@ -20,7 +20,7 @@
     <pubdate><?dbtimestamp format="Y/m/d"?></pubdate>
 
     <copyright>
-      <year>2001-2014</year>
+      <year>2001-2016</year>
 
       <holder>Thomas M. Eastep</holder>
     </copyright>
@@ -62,7 +62,9 @@
       Shorewall 4.4.0 or later, you must install the <emphasis
       role="bold">shorewall</emphasis> package. If you want to configure an
       IPv6 firewall, you must also install <emphasis
-      role="bold">shorewall6</emphasis>.</para>
+      role="bold">shorewall6</emphasis>. Beginning with Shorewall 4.5, you
+      must first install the <emphasis role="bold">shorewall-core</emphasis>
+      package.</para>
 
       <section id="faq92a">
         <title>(FAQ 92a) Someone once told me to install shorewall-perl;
@@ -123,7 +125,9 @@
       <firstterm>shorewall-shell</firstterm> package was discontinued. The
       <firstterm>shorewall-common</firstterm> and
       <firstterm>shorewall-perl</firstterm> packages were combined to form a
-      single <firstterm>shorewall</firstterm> package.</para>
+      single <firstterm>shorewall</firstterm> package. In Shorewall 4.5, the
+      <firstterm>shorewall-core</firstterm> package was added and all of the
+      other packages depend on shorewall-core.</para>
     </section>
   </section>
 

docs/upgrade_issues.xml

@@ -35,6 +35,8 @@
 
       <year>2013</year>
 
+      <year>2015</year>
+
       <holder>Thomas M. Eastep</holder>
 
       <holder/>