8 files changed, 29 insertions, 5 deletions
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.sgml b/release/doc/en_US.ISO8859-1/hardware/article.sgml
index 0ebee1c..ba09d99 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.sgml
@@ -1076,6 +1076,9 @@
 	  <para>3Com 3c19250</para>
         </listitem>
 	<listitem>
+	  <para>Abocom URE 450</para>
+        </listitem>
+	<listitem>
 	  <para>ADS Technologies USB-10BT</para>
         </listitem>
 	<listitem>
diff --git a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
index 0ebee1c..ba09d99 100644
--- a/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml
@@ -1076,6 +1076,9 @@
 	  <para>3Com 3c19250</para>
         </listitem>
 	<listitem>
+	  <para>Abocom URE 450</para>
+        </listitem>
+	<listitem>
 	  <para>ADS Technologies USB-10BT</para>
         </listitem>
 	<listitem>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index d05318a..f88446c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -169,6 +169,9 @@
     enables interfaces and functionality intended for use during
     correctness and regression testing.</para>
 
+    <para>The <literal>USER_LDT</literal> kernel option is now
+    activated by default.</para>
+
     <sect3>
       <title>Processor/Motherboard Support</title>
 
@@ -539,7 +542,7 @@
       use this driver, add the following line to
       <filename>/boot/loader.conf</filename>:
 
-        <screen><userinput>maestro3_load="YES"</userinput></screen>
+        <screen><userinput>snd_maestro3_load="YES"</userinput></screen>
 
       </para>
 
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index d05318a..f88446c 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -169,6 +169,9 @@
     enables interfaces and functionality intended for use during
     correctness and regression testing.</para>
 
+    <para>The <literal>USER_LDT</literal> kernel option is now
+    activated by default.</para>
+
     <sect3>
       <title>Processor/Motherboard Support</title>
 
@@ -539,7 +542,7 @@
       use this driver, add the following line to
       <filename>/boot/loader.conf</filename>:
 
-        <screen><userinput>maestro3_load="YES"</userinput></screen>
+        <screen><userinput>snd_maestro3_load="YES"</userinput></screen>
 
       </para>
 
diff --git a/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml b/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml
index 0ebee1c..ba09d99 100644
--- a/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml
+++ b/release/doc/en_US.ISO_8859-1/hardware/common/dev.sgml
@@ -1076,6 +1076,9 @@
 	  <para>3Com 3c19250</para>
         </listitem>
 	<listitem>
+	  <para>Abocom URE 450</para>
+        </listitem>
+	<listitem>
 	  <para>ADS Technologies USB-10BT</para>
         </listitem>
 	<listitem>
diff --git a/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
index d05318a..f88446c 100644
--- a/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO_8859-1/relnotes/common/new.sgml
@@ -169,6 +169,9 @@
     enables interfaces and functionality intended for use during
     correctness and regression testing.</para>
 
+    <para>The <literal>USER_LDT</literal> kernel option is now
+    activated by default.</para>
+
     <sect3>
       <title>Processor/Motherboard Support</title>
 
@@ -539,7 +542,7 @@
       use this driver, add the following line to
       <filename>/boot/loader.conf</filename>:
 
-        <screen><userinput>maestro3_load="YES"</userinput></screen>
+        <screen><userinput>snd_maestro3_load="YES"</userinput></screen>
 
       </para>
 
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 73646cf..3bf672e 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -166,7 +166,7 @@ licensing restrictions, it cannot be compiled into the kernel.
 [MERGED] To use this driver, add the following line to
 /boot/loader.conf:
 
-	maestro3_load="YES"
+	snd_maestro3_load="YES"
 
 Replace the PQ_*CACHE options with a single PQ_CACHESIZE option to be
 set to the cache size in kilobytes.  The old options are still
@@ -361,6 +361,9 @@ Semiconductor DP83820 and DP83821 gigabit ethernet controller chips,
 including the D-Link DGE-500T, SMC EZ Card 1000 (SMC9462TX),
 Asante FriendlyNet GigaNIC 1000TA and 1000TPC and Addtron AEG320T.
 
+The USER_LDT kernel option is now activated by default.
+
+
 1.2. SECURITY FIXES
 -------------------
 
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 09813ff..c28af99 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -190,7 +190,7 @@ licensing restrictions, it cannot be compiled into the kernel.
 [MERGED] To use this driver, add the following line to
 /boot/loader.conf:
 
-	maestro3_load="YES"
+	snd_maestro3_load="YES"
 
 Replace the PQ_*CACHE options with a single PQ_CACHESIZE option to be
 set to the cache size in kilobytes.  The old options are still
@@ -442,6 +442,9 @@ Semiconductor DP83820 and DP83821 gigabit ethernet controller chips,
 including the D-Link DGE-500T, SMC EZ Card 1000 (SMC9462TX),
 Asante FriendlyNet GigaNIC 1000TA and 1000TPC and Addtron AEG320T.
 
+The USER_LDT kernel option is now activated by default.
+
+
 1.2. SECURITY FIXES
 -------------------