doc updates, including very minor extra notes about upgrading to 3.1

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2526 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index add41f5b8d0e615ac6e9032101b38f89782781ec..80a1489c7fd6caa62c722730633573af2636ff65 100644 (file)
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -10345,14 +10345,6 @@ local0.err                        /var/log/pdns.err
              </para>
            </listitem>
          </varlistentry>
-         <varlistentry>
-           <term>--startid</term>
-           <listitem>
-             <para>
-               Supply a value for the first domain_id generated. Defaults at 0.
-             </para>
-           </listitem>
-         </varlistentry>
          <varlistentry>
            <term>--transactions</term>
            <listitem>
@@ -10498,6 +10490,11 @@ local0.err                        /var/log/pdns.err
   </sect2>
   </sect1>
   <sect1 id="from3.0to3.1"><title>From PowerDNS Authoritative Server 3.0 to 3.1</title>
+    <note>
+       <para>
+               If you are coming from 2.9.x, please also read <xref linkend="from2.9to3.0" />.
+       </para>
+    </note>
     <para>
        PowerDNS 3.1 introduces native SQLite3 support for storing key material for DNSSEC in the bindbackend. With this change,
        support for bind+gsql-setups ('hybrid mode') has been dropped. If you were using this mode, you will need to switch to
@@ -10506,6 +10503,13 @@ local0.err                        /var/log/pdns.err
     <para>
        There have been changes to the SQL schemas for the generic backends.
     </para>
+    <para>
+       For MySQL:
+       <screen>
+               mysql> ALTER TABLE records MODIFY content VARCHAR(64000);
+               mysql> ALTER TABLE tsigkeys MODIFY algorithm VARCHAR(50);
+       </screen>
+    </para>
   </sect1>
   </chapter>
   <chapter id="powerdnssec-auth">
@@ -11135,7 +11139,7 @@ $ pdnssec rectify-zone powerdnssec.org
     <warning>
     <para>
       This mode is only supported in 3.0 and 3.0.1! In 3.1 and up, the bindbackend
-      always does its own key storage. See FIXME for more details.
+      always does its own key storage.
     </para>
     </warning>
     <para>