diff --git a/en_US.ISO8859-1/books/porters-handbook/uses.xml b/en_US.ISO8859-1/books/porters-handbook/uses.xml
index 08c77bd1b4..7c3394bc59 100644
--- a/en_US.ISO8859-1/books/porters-handbook/uses.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/uses.xml
@@ -21,7 +21,7 @@
   <entry>(none)</entry>
 
   <entry>Depends on an <application>Ada</application>-capable
-    compiler, and sets <makevar>CC</makevar> accordingly.</entry>
+    compiler, and sets <varname>CC</varname> accordingly.</entry>
 </row>
 
 <row>
@@ -43,10 +43,10 @@
   <entry>Prevents the port from installing
     <filename>charset.alias</filename>.  This should be installed only
     by <filename role="package">converters/libiconv</filename>.
-    <makevar>CHARSETFIX_MAKEFILEIN</makevar> can be set to a path
-    relative to <makevar>WRKSRC</makevar> if
+    <varname>CHARSETFIX_MAKEFILEIN</varname> can be set to a path
+    relative to <varname>WRKSRC</varname> if
     <filename>charset.alias</filename> is not installed by
-    <makevar>WRKSRC</makevar>/<filename>Makefile.in</filename>.</entry>
+    <varname>WRKSRC</varname>/<filename>Makefile.in</filename>.</entry>
 </row>
 
 <row>
@@ -114,7 +114,7 @@
     <filename role="package">converters/libiconv</filename> as a
     build-time and run-time dependency, or from the base system on
     10-CURRENT after a native <command>iconv</command> was committed
-    in <svnref>254273</svnref>.  By default, with no arguments or with
+    in <revnumber>254273</revnumber>.  By default, with no arguments or with
     the <literal>lib</literal> argument, implies
     <command>iconv</command> with build-time and run-time
     dependencies, <literal>build</literal> implies a build-time
@@ -137,13 +137,13 @@
   <entry>Fills in the boilerplate for kernel module ports, currently:
   <itemizedlist>
     <listitem><para>Add <literal>kld</literal> to
-      <makevar>CATEGORIES</makevar>.</para></listitem>
-    <listitem><para>Set <makevar>SSP_UNSAFE</makevar>.</para></listitem>
-    <listitem><para>Set <makevar>IGNORE</makevar> if the kernel sources are
-      not found in <makevar>SRC_BASE</makevar>.</para></listitem>
-    <listitem><para>Define <makevar>KMODDIR</makevar> to <filename
+      <varname>CATEGORIES</varname>.</para></listitem>
+    <listitem><para>Set <varname>SSP_UNSAFE</varname>.</para></listitem>
+    <listitem><para>Set <varname>IGNORE</varname> if the kernel sources are
+      not found in <varname>SRC_BASE</varname>.</para></listitem>
+    <listitem><para>Define <varname>KMODDIR</varname> to <filename
 	class="directory">/boot/modules</filename> by default, add it
-      to <makevar>PLIST_SUB</makevar> and <makevar>MAKE_ENV</makevar>,
+      to <varname>PLIST_SUB</varname> and <varname>MAKE_ENV</varname>,
       and create it upon installation.</para></listitem>
     <listitem><para>Handle cross-referencing kernel modules upon installation
       and deinstallation.</para></listitem>
@@ -156,7 +156,7 @@
   <entry>(none)</entry>
   <entry>Implies that the ports uses
     <filename role="package">devel/open-motif</filename> as a library
-    dependency.  End users can set <makevar>WANT_LESSTIF</makevar>
+    dependency.  End users can set <varname>WANT_LESSTIF</varname>
     for the dependency to be on
     <filename role="package">devel/lesstif</filename> instead of
     <filename role="package">devel/open-motif</filename>.</entry>
@@ -225,7 +225,7 @@
   <entry>(none), port</entry>
   <entry>Implies that the port uses
     <application>readline</application> as library dependency, and
-    sets <makevar>CPPFLAGS</makevar> and <makevar>LDFLAGS</makevar> as
+    sets <varname>CPPFLAGS</varname> and <varname>LDFLAGS</varname> as
     necessary.</entry>
 </row>
 
@@ -250,16 +250,16 @@
   <entry>A lot of software uses incorrect locations for script
     interpreters, most notably <filename>/usr/bin/perl</filename> and
     <filename>/bin/bash</filename>.  This fixes shebang lines in
-    scripts listed in <makevar>SHEBANG_FILES</makevar>.  Currently
+    scripts listed in <varname>SHEBANG_FILES</varname>.  Currently
     <application>Perl</application>,
     <application>Python</application>,
     <application>Bash</application>, <application>Ruby</application>,
     and <application>PHP</application> are supported by default.  To
-    support another interpreter, set <makevar>SHEBANG_LANG</makevar>
+    support another interpreter, set <varname>SHEBANG_LANG</varname>
     (for example
     <literal>SHEBANG_LANG=lua</literal>), then
-    <makevar>lua_OLD_CMD</makevar> and
-    <makevar>lua_CMD</makevar>.</entry>
+    <varname>lua_OLD_CMD</varname> and
+    <varname>lua_CMD</varname>.</entry>
 </row>
 
 <row>
diff --git a/en_US.ISO8859-1/books/porters-handbook/versions.xml b/en_US.ISO8859-1/books/porters-handbook/versions.xml
index 87d5e1765c..362d5bb76d 100644
--- a/en_US.ISO8859-1/books/porters-handbook/versions.xml
+++ b/en_US.ISO8859-1/books/porters-handbook/versions.xml
@@ -2812,7 +2812,7 @@
   <entry>800005</entry>
   <entry>December 4, 2007</entry>
   <entry>8.0-CURRENT after changes to the jumbo frame
-    allocator (rev <svnref>174247</svnref>).</entry>
+    allocator (rev <revnumber>174247</revnumber>).</entry>
 </row>
 
 <row>
@@ -3032,7 +3032,7 @@
   <entry>8.0-CURRENT after added &man.write.2; support for
     &man.psm.4; in native operation level.  Now arbitrary
     commands can be written to
-    <devicename>/dev/psm%d</devicename> and status can be
+    <filename>/dev/psm%d</filename> and status can be
     read back from it.</entry>
 </row>
 
@@ -3811,7 +3811,7 @@
   <entry>8.2-STABLE after introduction of the new
     extensible sysctl(3) interface NET_RT_IFLISTL
     to query address lists (rev
-    <svnref>231769</svnref>).</entry>
+    <revnumber>231769</revnumber>).</entry>
 </row>
 
 <row>
@@ -4213,7 +4213,7 @@ it was never committed:
   <entry>9.0-STABLE after introduction of the new
     extensible sysctl(3) interface NET_RT_IFLISTL
     to query address lists (rev
-    <svnref>231768</svnref>).</entry>
+    <revnumber>231768</revnumber>).</entry>
 </row>
 
 <row>
@@ -4221,7 +4221,7 @@ it was never committed:
   <entry>March 3, 2012</entry>
   <entry>9.0-STABLE after changes related to mounting
     of filesystem inside a jail (rev
-    <svnref>232728</svnref>).</entry>
+    <revnumber>232728</revnumber>).</entry>
 </row>
 
 <row>
@@ -4230,7 +4230,7 @@ it was never committed:
   <entry>9.0-STABLE after introduction of new tcp(4)
     socket options: TCP_KEEPINIT, TCP_KEEPIDLE,
     TCP_KEEPINTVL, and TCP_KEEPCNT (rev
-    <svnref>232945</svnref>).</entry>
+    <revnumber>232945</revnumber>).</entry>
 </row>
 
 <row>
@@ -4239,7 +4239,7 @@ it was never committed:
   <entry>9.0-STABLE after introduction of the
     <function>quick_exit</function> function and
     related changes required for C++11 (rev
-    <svnref>235786</svnref>).</entry>
+    <revnumber>235786</revnumber>).</entry>
 </row>
 
 <row>
@@ -4259,8 +4259,8 @@ it was never committed:
   <entry>901501</entry>
   <entry>November 11, 2012</entry>
   <entry>9.1-STABLE after LIST_PREV() added to queue.h
-    (rev <svnref>242893</svnref>) and KBI change in USB
-    serial devices (rev <svnref>240659</svnref>).</entry>
+    (rev <revnumber>242893</revnumber>) and KBI change in USB
+    serial devices (rev <revnumber>240659</revnumber>).</entry>
 </row>
 
 <row>
@@ -4289,7 +4289,7 @@ it was never committed:
   <entry>901505</entry>
   <entry>June 13, 2013</entry>
   <entry>9.1-STABLE after fixes in ctfmerge bootstrapping
-    (rev <svnref>249243</svnref>).</entry>
+    (rev <revnumber>249243</revnumber>).</entry>
 </row>
 
 <row>
@@ -4297,7 +4297,7 @@ it was never committed:
   <entry>August 3, 2013</entry>
   <entry><literal>releng/9.2</literal> branched from
     <literal>stable/9</literal>
-    (rev <svnref>253912</svnref>).</entry>
+    (rev <revnumber>253912</revnumber>).</entry>
 </row>
 
 <row>
@@ -4305,7 +4305,7 @@ it was never committed:
   <entry>August 2, 2013</entry>
   <entry>9.2-STABLE after creation of
     <literal>releng/9.2</literal> branch
-    (rev <svnref>253913</svnref>).</entry>
+    (rev <revnumber>253913</revnumber>).</entry>
 </row>
 
 <row>
@@ -4326,9 +4326,9 @@ it was never committed:
   <entry>December 12, 2011</entry>
   <entry>10-CURRENT after defining boolean true/false in
     sys/types.h, sizeof(bool) may have changed (rev
-    <svnref>228444</svnref>).  10-CURRENT after xlocale.h
+    <revnumber>228444</revnumber>).  10-CURRENT after xlocale.h
     was introduced (rev
-    <svnref>227753</svnref>).</entry>
+    <revnumber>227753</revnumber>).</entry>
 </row>
 
 <row>
@@ -4336,9 +4336,9 @@ it was never committed:
   <entry>December 16, 2011</entry>
   <entry>10-CURRENT after major changes to carp(4),
     changing size of struct&nbsp;in_aliasreq,
-    struct&nbsp;in6_aliasreq (rev <svnref>228571</svnref>)
+    struct&nbsp;in6_aliasreq (rev <revnumber>228571</revnumber>)
     and straitening arguments check of SIOCAIFADDR (rev
-    <svnref>228574</svnref>).</entry>
+    <revnumber>228574</revnumber>).</entry>
 </row>
 
 <row>
@@ -4346,7 +4346,7 @@ it was never committed:
   <entry>January 1, 2012</entry>
   <entry>10-CURRENT after the removal of skpc(9) and the
     addition of memcchr(9) (rev
-    <svnref>229200</svnref>).</entry>
+    <revnumber>229200</revnumber>).</entry>
 </row>
 
 <row>
@@ -4355,7 +4355,7 @@ it was never committed:
   <entry>10-CURRENT after the removal of support for
     SIOCSIFADDR, SIOCSIFNETMASK, SIOCSIFBRDADDR,
     SIOCSIFDSTADDR ioctls (rev
-    <svnref>230207</svnref>).</entry>
+    <revnumber>230207</revnumber>).</entry>
 </row>
 
 <row>
@@ -4363,7 +4363,7 @@ it was never committed:
   <entry>January 26, 2012</entry>
   <entry>10-CURRENT after introduction of read capacity
     data asynchronous notification in the cam(4) layer
-    (rev <svnref>230590</svnref>).</entry>
+    (rev <revnumber>230590</revnumber>).</entry>
 </row>
 
 <row>
@@ -4372,7 +4372,7 @@ it was never committed:
   <entry>10-CURRENT after introduction of new tcp(4)
     socket options: TCP_KEEPINIT, TCP_KEEPIDLE,
     TCP_KEEPINTVL, and TCP_KEEPCNT (rev
-    <svnref>231025</svnref>).</entry>
+    <revnumber>231025</revnumber>).</entry>
 </row>
 
 <row>
@@ -4381,84 +4381,84 @@ it was never committed:
   <entry>10-CURRENT after introduction of the new
     extensible sysctl(3) interface NET_RT_IFLISTL
     to query address lists (rev
-    <svnref>231505</svnref>).</entry>
+    <revnumber>231505</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000009</entry>
   <entry>February 25, 2012</entry>
   <entry>10-CURRENT after import of libarchive 3.0.3
-    (rev <svnref>232153</svnref>).</entry>
+    (rev <revnumber>232153</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000010</entry>
   <entry>March 31, 2012</entry>
   <entry>10-CURRENT after xlocale cleanup (rev
-    <svnref>233757</svnref>).</entry>
+    <revnumber>233757</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000011</entry>
   <entry>April 16, 2012</entry>
   <entry>10-CURRENT import of LLVM/Clang 3.1 trunk r154661
-    (rev <svnref>234353</svnref>).</entry>
+    (rev <revnumber>234353</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000012</entry>
   <entry>May 2, 2012</entry>
   <entry>10-CURRENT jemalloc import
-    (rev <svnref>234924</svnref>).</entry>
+    (rev <revnumber>234924</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000013</entry>
   <entry>May 22, 2012</entry>
   <entry>10-CURRENT after byacc import
-    (rev <svnref>235788</svnref>).</entry>
+    (rev <revnumber>235788</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000014</entry>
   <entry>June 27, 2012</entry>
   <entry>10-CURRENT after BSD sort becoming the default
-    sort (rev <svnref>237629</svnref>).</entry>
+    sort (rev <revnumber>237629</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000015</entry>
   <entry>July 12, 2012</entry>
   <entry>10-CURRENT after import of OpenSSL 1.0.1c
-    (rev <svnref>238405</svnref>).</entry>
+    (rev <revnumber>238405</revnumber>).</entry>
 </row>
 
 <row>
   <entry>(not changed)</entry>
   <entry>July 13, 2012</entry>
   <entry>10-CURRENT after the fix for LLVM/Clang 3.1
-    regression (rev <svnref>238429</svnref>).</entry>
+    regression (rev <revnumber>238429</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000016</entry>
   <entry>August 8, 2012</entry>
   <entry>10-CURRENT after KBI change in &man.ucom.4;
-    (rev <svnref>239179</svnref>).</entry>
+    (rev <revnumber>239179</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000017</entry>
   <entry>August 8, 2012</entry>
   <entry>10-CURRENT after adding streams feature to the
-    USB stack (rev <svnref>239214</svnref>).</entry>
+    USB stack (rev <revnumber>239214</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000018</entry>
   <entry>September 8, 2012</entry>
   <entry>10-CURRENT after major rewrite of &man.pf.4;
-    (rev <svnref>240233</svnref>).</entry>
+    (rev <revnumber>240233</revnumber>).</entry>
 </row>
 
 <row>
@@ -4466,7 +4466,7 @@ it was never committed:
   <entry>October 6, 2012</entry>
   <entry>10-CURRENT after &man.pfil.9; KBI/KPI changed
     to supply packets in net byte order to AF_INET
-    filter hooks (rev <svnref>241245</svnref>).</entry>
+    filter hooks (rev <revnumber>241245</revnumber>).</entry>
 </row>
 
 <row>
@@ -4474,7 +4474,7 @@ it was never committed:
   <entry>October 16, 2012</entry>
   <entry>10-CURRENT after the network interface cloning
     KPI changed and struct if_clone becoming opaque (rev
-    <svnref>241610</svnref>).</entry>
+    <revnumber>241610</revnumber>).</entry>
 </row>
 
 <row>
@@ -4483,8 +4483,8 @@ it was never committed:
   <entry>10-CURRENT after removal of support for
     non-MPSAFE filesystems and addition of support for
     FUSEFS (rev
-    <svnref>241519</svnref>,
-    <svnref>241897</svnref>).</entry>
+    <revnumber>241519</revnumber>,
+    <revnumber>241897</revnumber>).</entry>
 </row>
 
 <row>
@@ -4492,7 +4492,7 @@ it was never committed:
   <entry>October 22, 2012</entry>
   <entry>10-CURRENT after the entire IPv4 stack switched
     to network byte order for IP packet header storage
-    (rev <svnref>241913</svnref>).</entry>
+    (rev <revnumber>241913</revnumber>).</entry>
 </row>
 
 <row>
@@ -4502,7 +4502,7 @@ it was never committed:
     serial driver code, to temporarily store characters
     if the TTY buffer is full.  Add flow stop and start
     signals when this happens (rev
-    <svnref>242619</svnref>).</entry>
+    <revnumber>242619</revnumber>).</entry>
 </row>
 
 <row>
@@ -4510,7 +4510,7 @@ it was never committed:
   <entry>November 5, 2012</entry>
   <entry>10-CURRENT after clang was made the default
     compiler on i386 and amd64
-    (rev <svnref>242624</svnref>).</entry>
+    (rev <revnumber>242624</revnumber>).</entry>
 </row>
 
 <row>
@@ -4522,14 +4522,14 @@ it was never committed:
     the userland via sysctl or routing socket.  This means
     the KAME-specific embedded scope id in
     sin6_addr.s6_addr[2] is always cleared in userland
-    application (rev <svnref>243443</svnref>).</entry>
+    application (rev <revnumber>243443</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000026</entry>
   <entry>January 11, 2013</entry>
   <entry>10-CURRENT after install gained the -N flag (rev
-    <svnref>245313</svnref>).  May also be used to
+    <revnumber>245313</revnumber>).  May also be used to
     indicate the presence of nmtree.</entry>
 </row>
 
@@ -4537,7 +4537,7 @@ it was never committed:
   <entry>1000027</entry>
   <entry>January 29, 2013</entry>
   <entry>10-CURRENT after cat gained the -l flag (rev
-    <svnref>246083</svnref>).</entry>
+    <revnumber>246083</revnumber>).</entry>
 </row>
 
 <row>
@@ -4545,7 +4545,7 @@ it was never committed:
   <entry>February 13, 2013</entry>
   <entry>10-CURRENT after USB moved to the driver
     structure requiring a rebuild of all USB modules (rev
-    <svnref>246759</svnref>).</entry>
+    <revnumber>246759</revnumber>).</entry>
 </row>
 
 <row>
@@ -4553,7 +4553,7 @@ it was never committed:
   <entry>March 4, 2013</entry>
   <entry>10-CURRENT after the introduction of tickless
     callout facility which also changed the layout of
-    struct callout (rev <svnref>247777</svnref>).</entry>
+    struct callout (rev <revnumber>247777</revnumber>).</entry>
 </row>
 
 <row>
@@ -4561,7 +4561,7 @@ it was never committed:
   <entry>March 12, 2013</entry>
   <entry>10-CURRENT after KPI breakage introduced in the
     VM subsystem to support read/write locking (rev
-    <svnref>248084</svnref>).</entry>
+    <revnumber>248084</revnumber>).</entry>
 </row>
 
 <row>
@@ -4570,7 +4570,7 @@ it was never committed:
   <entry>10-CURRENT after the dst parameter of the
     ifnet <function>if_output</function> method was
     changed to take const qualifier (rev
-    <svnref>249925</svnref>).</entry>
+    <revnumber>249925</revnumber>).</entry>
 </row>
 
 <row>
@@ -4578,16 +4578,16 @@ it was never committed:
   <entry>May 1, 2013</entry>
   <entry>10-CURRENT after the introduction of the
     <function>accept4</function> (rev
-    <svnref>250154</svnref>) and
+    <revnumber>250154</revnumber>) and
     <function>pipe2</function> (rev
-    <svnref>250159</svnref>) system calls.</entry>
+    <revnumber>250159</revnumber>) system calls.</entry>
 </row>
 
 <row>
   <entry>1000033</entry>
   <entry>May 21, 2013</entry>
   <entry>10-CURRENT after flex 2.5.37 import (rev
-    <svnref>250881</svnref>).</entry>
+    <revnumber>250881</revnumber>).</entry>
 </row>
 
 <row>
@@ -4611,7 +4611,7 @@ it was never committed:
     <function>log10l</function>,
     <function>log1pl</function>,
     <function>expm1l</function> (rev
-    <svnref>251294</svnref>).</entry>
+    <revnumber>251294</revnumber>).</entry>
 </row>
 
 <row>
@@ -4619,7 +4619,7 @@ it was never committed:
   <entry>June 8, 2013</entry>
   <entry>10-CURRENT after the introduction of the
     <function>aio_mlock</function> system call (rev
-    <svnref>251526</svnref>).</entry>
+    <revnumber>251526</revnumber>).</entry>
 </row>
 
 <row>
@@ -4628,7 +4628,7 @@ it was never committed:
   <entry>10-CURRENT after the addition of a new function
     to the kernel GSSAPI module's
     function call interface (rev
-    <svnref>253049</svnref>).</entry>
+    <revnumber>253049</revnumber>).</entry>
 </row>
 
 <row>
@@ -4653,7 +4653,7 @@ it was never committed:
     <literal>pimstat</literal>,
     <literal>rip6stat</literal>,
     <literal>udpstat</literal> (rev
-    <svnref>253081</svnref>).</entry>
+    <revnumber>253081</revnumber>).</entry>
 </row>
 
 <row>
@@ -4662,7 +4662,7 @@ it was never committed:
   <entry>10-CURRENT after making <literal>ARM
       EABI</literal> the default ABI on arm,
     armeb, armv6, and armv6eb architectures
-    (rev <svnref>253396</svnref>).</entry>
+    (rev <revnumber>253396</revnumber>).</entry>
 </row>
 
 <row>
@@ -4670,14 +4670,14 @@ it was never committed:
   <entry>July 22, 2013</entry>
   <entry>10-CURRENT after <literal>CAM</literal>
     and &man.mps.4; driver scanning changes
-    (rev <svnref>253549</svnref>).</entry>
+    (rev <revnumber>253549</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000040</entry>
   <entry>July 24, 2013</entry>
   <entry>10-CURRENT after addition of libusb
-    pkgconf files (rev <svnref>253638</svnref>).</entry>
+    pkgconf files (rev <revnumber>253638</revnumber>).</entry>
 </row>
 
 <row>
@@ -4687,7 +4687,7 @@ it was never committed:
     <function>time_second</function> to
     <function>time_uptime</function>
     in <literal>PF_INET6</literal>
-    (rev <svnref>253970</svnref>).</entry>
+    (rev <revnumber>253970</revnumber>).</entry>
 </row>
 
 <row>
@@ -4695,19 +4695,19 @@ it was never committed:
   <entry>August 9, 2013</entry>
   <entry>10-CURRENT after VM subsystem change to unify
     soft and hard busy mechanisms
-    (rev <svnref>254138</svnref>).</entry>
+    (rev <revnumber>254138</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000043</entry>
   <entry>August 13, 2013</entry>
-  <entry>10-CURRENT after <makevar>WITH_ICONV</makevar> is
+  <entry>10-CURRENT after <varname>WITH_ICONV</varname> is
     enabled by default.  A new &man.src.conf.5; option,
-    <makevar>WITH_LIBICONV_COMPAT</makevar> (disabled by
+    <varname>WITH_LIBICONV_COMPAT</varname> (disabled by
     default) adds <function>libiconv_open</function> to
     provide compatibility with the
     <package>libiconv</package> port (rev
-    <svnref>254273</svnref>).</entry>
+    <revnumber>254273</revnumber>).</entry>
 </row>
 
 <row>
@@ -4716,8 +4716,8 @@ it was never committed:
   <entry>10-CURRENT after <literal>libc.so</literal>
     conversion to an &man.ld.1;
     script (rev
-    <svnref>251668</svnref>,
-    <svnref>254358</svnref>).</entry>
+    <revnumber>251668</revnumber>,
+    <revnumber>254358</revnumber>).</entry>
 </row>
 
 <row>
@@ -4727,7 +4727,7 @@ it was never committed:
     change by replacing the cdevsw flag
     <literal>D_UNMAPPED_IO</literal> with the struct cdev
     flag <literal>SI_UNMAPPED</literal> (rev
-    <svnref>254389</svnref>).</entry>
+    <revnumber>254389</revnumber>).</entry>
 </row>
 
 <row>
@@ -4736,8 +4736,8 @@ it was never committed:
   <entry>10-CURRENT after addition of
     <literal>M_PROTO[9-12]</literal> and removal of
     <literal>M_FRAG|M_FIRSTFRAG|M_LASTFRAG</literal>
-    mbuf flags (rev <svnref>254524</svnref>,
-    <svnref>254526</svnref>).</entry>
+    mbuf flags (rev <revnumber>254524</revnumber>,
+    <revnumber>254526</revnumber>).</entry>
 </row>
 
 <row>
@@ -4746,7 +4746,7 @@ it was never committed:
   <entry>10-CURRENT after &man.stat.2; update to allow
     storing some Windows/DOS and CIFS file attributes
     as &man.stat.2; flags (rev
-    <svnref>254627</svnref>).</entry>
+    <revnumber>254627</revnumber>).</entry>
 </row>
 
 <row>
@@ -4754,7 +4754,7 @@ it was never committed:
   <entry>August 22, 2013</entry>
   <entry>10-CURRENT after modification of structure
     <literal>xsctp_inpcb</literal>
-    (rev <svnref>254672</svnref>).</entry>
+    (rev <revnumber>254672</revnumber>).</entry>
 </row>
 
 <row>
@@ -4763,7 +4763,7 @@ it was never committed:
   <entry>10-CURRENT after &man.physio.9; support for
     devices that do not function properly with split
     I/O, such as &man.sa.4; (rev
-    <svnref>254760</svnref>).</entry>
+    <revnumber>254760</revnumber>).</entry>
 </row>
 
 <row>
@@ -4771,17 +4771,17 @@ it was never committed:
   <entry>August 24, 2013</entry>
   <entry>10-CURRENT after modifications of structure
     <literal>mbuf</literal>
-    (rev <svnref>254780</svnref>, <svnref>254799</svnref>,
-    <svnref>254804</svnref>, <svnref>254807</svnref>
-    <svnref>254842</svnref>).</entry>
+    (rev <revnumber>254780</revnumber>, <revnumber>254799</revnumber>,
+    <revnumber>254804</revnumber>, <revnumber>254807</revnumber>
+    <revnumber>254842</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000051</entry>
   <entry>August 25, 2013</entry>
   <entry>10-CURRENT after Radeon KMS driver import
-    (rev <svnref>254885</svnref>,
-    <svnref>254887</svnref>).</entry>
+    (rev <revnumber>254885</revnumber>,
+    <revnumber>254887</revnumber>).</entry>
 </row>
 
 <row>
@@ -4789,7 +4789,7 @@ it was never committed:
   <entry>September 3, 2013</entry>
   <entry>10-CURRENT after import of NetBSD
     <literal>libexecinfo</literal> is connected to the
-    build (rev <svnref>255180</svnref>).</entry>
+    build (rev <revnumber>255180</revnumber>).</entry>
 </row>
 
 <row>
@@ -4797,7 +4797,7 @@ it was never committed:
   <entry>September 6, 2013</entry>
   <entry>10-CURRENT after API and ABI changes to the
     Capsicum framework (rev
-    <svnref>255305</svnref>).</entry>
+    <revnumber>255305</revnumber>).</entry>
 </row>
 
 <row>
@@ -4805,7 +4805,7 @@ it was never committed:
   <entry>September 6, 2013</entry>
   <entry>10-CURRENT after <literal>gcc</literal> and
     <literal>libstdc++</literal> are no longer built by
-    default (rev <svnref>255321</svnref>).</entry>
+    default (rev <revnumber>255321</revnumber>).</entry>
 </row>
 
 <row>
@@ -4813,19 +4813,19 @@ it was never committed:
   <entry>September 6, 2013</entry>
   <entry>10-CURRENT after addition of
     <literal>MMAP_32BIT</literal> &man.mmap.2; flag
-    (rev <svnref>255426</svnref>).</entry>
+    (rev <revnumber>255426</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000500</entry>
   <entry>October 10, 2013</entry>
   <entry>10-STABLE after branch from <literal>head/</literal>
-    (rev <svnref>256283</svnref>).</entry>
+    (rev <revnumber>256283</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1100000</entry>
   <entry>October 10, 2013</entry>
   <entry>11.0-CURRENT.
-    (rev <svnref>256284</svnref>).</entry>
+    (rev <revnumber>256284</revnumber>).</entry>
 </row>
diff --git a/en_US.ISO8859-1/share/xml/mailing-lists.ent b/en_US.ISO8859-1/share/xml/mailing-lists.ent
index 2f2ca58ec2..bdb1ab5099 100644
--- a/en_US.ISO8859-1/share/xml/mailing-lists.ent
+++ b/en_US.ISO8859-1/share/xml/mailing-lists.ent
@@ -110,8 +110,8 @@
 <!ENTITY a.ctm-src-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-9.url;'>ctm-src-9</link>">
 
 <!ENTITY a.ctm-src-10.url "&a.mailman.listinfo;/ctm-src-10">
-<!ENTITY a.ctm-src-10 "<ulink url='&a.ctm-src-10.url;'>CTM 10-STABLE src branch distribution mailing list</ulink>">
-<!ENTITY a.ctm-src-10.name "<ulink url='&a.ctm-src-10.url;'>ctm-src-10</ulink>">
+<!ENTITY a.ctm-src-10 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-10.url;'>CTM 10-STABLE src branch distribution mailing list</link>">
+<!ENTITY a.ctm-src-10.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-10.url;'>ctm-src-10</link>">
 
 <!ENTITY a.ctm-src-cur.url "&a.mailman.listinfo;/ctm-src-cur">
 <!ENTITY a.ctm-src-cur "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ctm-src-cur.url;'>CTM -CURRENT src branch distribution mailing list</link>">
@@ -501,8 +501,8 @@
 <!ENTITY a.svn-src-stable-9.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-9.url;'>svn-src-stable-9</link>">
 
 <!ENTITY a.svn-src-stable-10.url "&a.mailman.listinfo;/svn-src-stable-10">
-<!ENTITY a.svn-src-stable-10 "<ulink url='&a.svn-src-stable-10.url;'>SVN commit messages for only the 10-stable src tree</ulink>">
-<!ENTITY a.svn-src-stable-10.name "<ulink url='&a.svn-src-stable-10.url;'>svn-src-stable-10</ulink>">
+<!ENTITY a.svn-src-stable-10 "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-10.url;'>SVN commit messages for only the 10-stable src tree</link>">
+<!ENTITY a.svn-src-stable-10.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-10.url;'>svn-src-stable-10</link>">
 
 <!ENTITY a.svn-src-stable-other.url "&a.mailman.listinfo;/svn-src-stable-other">
 <!ENTITY a.svn-src-stable-other "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.svn-src-stable-other.url;'>SVN commit messages for the old stable src trees</link>">
diff --git a/en_US.ISO8859-1/share/xml/teams.ent b/en_US.ISO8859-1/share/xml/teams.ent
index f73ea78b01..8a42d88669 100644
--- a/en_US.ISO8859-1/share/xml/teams.ent
+++ b/en_US.ISO8859-1/share/xml/teams.ent
@@ -1,4 +1,4 @@
-<!-
+<!--
      Names and email address of teams of people working on specified
      tasks. Usually they're just mail aliases set up at hub.FreeBSD.org
 
diff --git a/ru_RU.KOI8-R/books/porters-handbook/uses.xml b/ru_RU.KOI8-R/books/porters-handbook/uses.xml
index e571b20d16..bffe7dd9c6 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/uses.xml
+++ b/ru_RU.KOI8-R/books/porters-handbook/uses.xml
@@ -14,7 +14,7 @@
 
   <entry>����������� �� ����������� � ����������
     <application>Ada</application>.  ��������������� �������
-    ������������ �������� <makevar>CC</makevar>.</entry>
+    ������������ �������� <varname>CC</varname>.</entry>
 </row>
 
 <row>
@@ -35,10 +35,10 @@
   <entry>������������� ��������� <filename>charset.alias</filename>.
     ���� ���� ������ ��������������� ������ ��������� � <filename
       role="package">converters/libiconv</filename>.  �����
-    <makevar>CHARSETFIX_MAKEFILEIN</makevar> ����� ������� ������
-    ���� ������������ <makevar>WRKSRC</makevar>, ����
+    <varname>CHARSETFIX_MAKEFILEIN</varname> ����� ������� ������
+    ���� ������������ <varname>WRKSRC</varname>, ����
     <filename>charset.alias</filename> ��������������� ����� ��� �����
-    <makevar>WRKSRC</makevar>/<filename>Makefile.in</filename>.</entry>
+    <varname>WRKSRC</varname>/<filename>Makefile.in</filename>.</entry>
 </row>
 
 <row>
@@ -112,7 +112,7 @@
   <entry>(���)</entry>
   <entry>������������� ������������� <filename
       role="package">devel/open-motif</filename> � �������� ����������.
-    �������� ������������ ����� ������ <makevar>WANT_LESSTIF</makevar>
+    �������� ������������ ����� ������ <varname>WANT_LESSTIF</varname>
     ��� ������ <filename role="package">devel/open-motif</filename> ��
     <filename role="package">devel/lesstif</filename>.</entry>
 </row>
@@ -178,7 +178,7 @@
   <entry>(���), port</entry>
   <entry>������������� ������������� ����������
     <application>readline</application> � �� ������������� �������������
-    ���������� <makevar>CPPFLAGS</makevar> � <makevar>LDFLAGS</makevar>.
+    ���������� <varname>CPPFLAGS</varname> � <varname>LDFLAGS</varname>.
   </entry>
 </row>
 
@@ -201,14 +201,14 @@
     ���� � �������������� (shebang), � ������ ������� ��� ��������
     <filename>/usr/bin/perl</filename> � <filename>/bin/bash</filename>.
     ��� �������� ���������� ������ shebang � ���������, �������������
-    � <makevar>SHEBANG_FILES</makevar>.  �� ��������� ������
+    � <varname>SHEBANG_FILES</varname>.  �� ��������� ������
     �������������� <application>Perl</application>,
     <application>Python</application>, <application>Bash</application>,
     <application>Ruby</application> � <application>PHP</application>.
     ��� ��������� ������ ��������������� ���������� ���������������
-    �������� <makevar>SHEBANG_LANG</makevar> (��������,
-    <literal><makevar>SHEBANG_LANG</makevar>=lua</literal>),
-    <makevar>lua_OLD_CMD</makevar> � <makevar>lua_CMD</makevar>.</entry>
+    �������� <varname>SHEBANG_LANG</varname> (��������,
+    <literal>SHEBANG_LANG=lua</literal>),
+    <varname>lua_OLD_CMD</varname> � <varname>lua_CMD</varname>.</entry>
 </row>
 
 <row>
diff --git a/ru_RU.KOI8-R/books/porters-handbook/versions.xml b/ru_RU.KOI8-R/books/porters-handbook/versions.xml
index b28e3e3247..996f71f87d 100644
--- a/ru_RU.KOI8-R/books/porters-handbook/versions.xml
+++ b/ru_RU.KOI8-R/books/porters-handbook/versions.xml
@@ -2739,7 +2739,7 @@
   <entry>800005</entry>
   <entry>4 ������� 2007</entry>
   <entry>8.0-CURRENT ����� ��������� � �������������� jumbo-�������
-    (���. <svnref>174247</svnref>).</entry>
+    (���. <revnumber>174247</revnumber>).</entry>
 </row>
 
 <row>
@@ -2944,7 +2944,7 @@
   <entry>8 ������ 2008</entry>
   <entry>8.0-CURRENT ����� ���������� ��������� &man.write.2; ���
     &man.psm.4; � �������� ������������ ������.  ������ �
-    <devicename>/dev/psm%d</devicename> ����� ���������� ������������
+    <filename>/dev/psm%d</filename> ����� ���������� ������������
     ������� � ��������� �� ���� ������� ���������.</entry>
 </row>
 
@@ -3681,7 +3681,7 @@
   <entry>15 ������� 2012</entry>
   <entry>8.2-STABLE ����� ��������� ������ ������������ ����������
     sysctl(3) NET_RT_IFLISTL ��� ��������� ������ ������� (���.
-    <svnref>231769</svnref>).</entry>
+    <revnumber>231769</revnumber>).</entry>
 </row>
 
 <row>
@@ -4069,14 +4069,14 @@
   <entry>15 ������� 2012</entry>
   <entry>9.0-STABLE ����� ��������� ������ ������������ ����������
     sysctl(3) NET_RT_IFLISTL ��� ��������� ������ ������� (���.
-    <svnref>231768</svnref>).</entry>
+    <revnumber>231768</revnumber>).</entry>
 </row>
 
 <row>
   <entry>900504</entry>
   <entry>3 ����� 2012</entry>
   <entry>9.0-STABLE ����� ��������� ��������� ������������ ��������
-    ������ � jail (���. <svnref>232728</svnref>).</entry>
+    ������ � jail (���. <revnumber>232728</revnumber>).</entry>
 </row>
 
 <row>
@@ -4084,7 +4084,7 @@
   <entry>13 ����� 2012</entry>
   <entry>9.0-STABLE ����� ��������� ����� ���������� ������ tcp(4):
     TCP_KEEPINIT, TCP_KEEPIDLE, TCP_KEEPINTVL � TCP_KEEPCNT (���.
-    <svnref>232945</svnref>).</entry>
+    <revnumber>232945</revnumber>).</entry>
 </row>
 
 <row>
@@ -4092,7 +4092,7 @@
   <entry>22 ��� 2012</entry>
   <entry>9.0-STABLE ����� ��������� �������
     <function>quick_exit</function> � ��������������� ���������,
-    ��������� � C++11 (���. <svnref>235786</svnref>).</entry>
+    ��������� � C++11 (���. <revnumber>235786</revnumber>).</entry>
 </row>
 
 <row>
@@ -4112,8 +4112,8 @@
   <entry>901501</entry>
   <entry>11 ������ 2012</entry>
   <entry>9.1-STABLE ����� ���������� LIST_PREV() � queue.h (���.
-    <svnref>242893</svnref>) � ��������� � KPI ����������������
-    ��������� USB (���. <svnref>240659</svnref>).</entry>
+    <revnumber>242893</revnumber>) � ��������� � KPI ����������������
+    ��������� USB (���. <revnumber>240659</revnumber>).</entry>
 </row>
 
 <row>
@@ -4143,14 +4143,14 @@
   <entry>901505</entry>
   <entry>13 ���� 2013</entry>
   <entry>9.1-STABLE ����� ����������� � ������������� ctfmerge (���.
-    <svnref>249243</svnref>).</entry>
+    <revnumber>249243</revnumber>).</entry>
 </row>
 
 <row>
   <entry>902001</entry>
   <entry>3 ������� 2013</entry>
   <entry>��������� ����� <literal>releng/9.2</literal> ��
-    <literal>stable/9</literal> (���. <svnref>253912</svnref>).
+    <literal>stable/9</literal> (���. <revnumber>253912</revnumber>).
   </entry>
 </row>
 
@@ -4158,7 +4158,7 @@
   <entry>902501</entry>
   <entry>August 2, 2013</entry>
   <entry>9.2-STABLE ����� �������� �����
-    <literal>releng/9.2</literal> (���. <svnref>253913</svnref>).
+    <literal>releng/9.2</literal> (���. <revnumber>253913</revnumber>).
   </entry>
 </row>
 
@@ -4180,8 +4180,8 @@
   <entry>12 ������� 2011</entry>
   <entry>10-CURRENT ����� ����������� ������� true/false �
     sys/types.h, �������� sizeof(bool) ����� ���������� (���.
-    <svnref>228444</svnref>).  10-CURRENT ����� ��������� xlocale.h
-    (���. <svnref>r227753</svnref>).</entry>
+    <revnumber>228444</revnumber>).  10-CURRENT ����� ��������� xlocale.h
+    (���. <revnumber>r227753</revnumber>).</entry>
 </row>
 
 <row>
@@ -4189,15 +4189,15 @@
   <entry>15 ������� 2011</entry>
   <entry>10-CURRENT ����� ������� ��������� � carp(4), ���������
     ������� �������� in_aliasreq, in6_aliasreq (���.
-    <svnref>228571</svnref>) � ����� ������� �������� ����������
-    SIOCAIFADDR (��� <svnref>228574</svnref>).</entry>
+    <revnumber>228571</revnumber>) � ����� ������� �������� ����������
+    SIOCAIFADDR (��� <revnumber>228574</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000004</entry>
   <entry>1 ������ 2012</entry>
   <entry>10-CURRENT ����� �������� skpc(9) � ���������� memcchr(9)
-    (���. <svnref>229200</svnref>).</entry>
+    (���. <revnumber>229200</revnumber>).</entry>
 </row>
 
 <row>
@@ -4205,14 +4205,14 @@
   <entry>16 ������ 2012</entry>
   <entry>10-CURRENT ����� �������� ��������� ioctl SIOCSIFADDR,
     SIOCSIFNETMASK, SIOCSIFBRDADDR, SIOCSIFDSTADDR (���.
-    <svnref>230207</svnref>).</entry>
+    <revnumber>230207</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000006</entry>
   <entry>26 ������ 2012</entry>
   <entry>10-CURRENT ����� ��������� ����������� ����������� � �������
-    ������� ������ � ������ cam(4) (���. <svnref>230590</svnref>).
+    ������� ������ � ������ cam(4) (���. <revnumber>230590</revnumber>).
   </entry>
 </row>
 
@@ -4221,7 +4221,7 @@
   <entry>5 ������� 2012</entry>
   <entry>10-CURRENT ����� ��������� ����� ���������� ������ tcp(4):
     TCP_KEEPINIT, TCP_KEEPIDLE, TCP_KEEPINTVL � TCP_KEEPCNT (���.
-    <svnref>231025</svnref>).</entry>
+    <revnumber>231025</revnumber>).</entry>
 </row>
 
 <row>
@@ -4229,84 +4229,84 @@
   <entry>11 ������� 2012</entry>
   <entry>10-CURRENT ����� ��������� ������ ������������ ����������
     sysctl(3) NET_RT_IFLISTL ��� ��������� ������ ������� (���.
-    <svnref>231505</svnref>).</entry>
+    <revnumber>231505</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000009</entry>
   <entry>25 ������� 2012</entry>
   <entry>10-CURRENT ����� ������� libarchive 3.0.3 (���.
-    <svnref>232153</svnref>).</entry>
+    <revnumber>232153</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000010</entry>
   <entry>31 ����� 2012</entry>
   <entry>10-CURRENT ����� ����������� � xlocale (���.
-    <svnref>233757</svnref>).</entry>
+    <revnumber>233757</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000011</entry>
   <entry>16 ������ 2012</entry>
   <entry>10-CURRENT ����� ������� LLVM/Clang 3.1 trunk r154661 (���.
-    <svnref>234353</svnref>).</entry>
+    <revnumber>234353</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000012</entry>
   <entry>2 ��� 2012</entry>
   <entry>10-CURRENT ����� ������� jemalloc (���.
-    <svnref>234924</svnref>).</entry>
+    <revnumber>234924</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000013</entry>
   <entry>22 ��� 2012</entry>
   <entry>10-CURRENT ����� ������� byacc (���.
-    <svnref>235788</svnref>).</entry>
+    <revnumber>235788</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000014</entry>
   <entry>27 ���� 2012</entry>
   <entry>10-CURRENT ����� ��������� sort �� ��������� �� BSD sort
-    (���. <svnref>237629</svnref>).</entry>
+    (���. <revnumber>237629</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000015</entry>
   <entry>12 ���� 2012</entry>
   <entry>10-CURRENT ����� ������� OpenSSL 1.0.1c (���.
-    <svnref>238405</svnref>).</entry>
+    <revnumber>238405</revnumber>).</entry>
 </row>
 
 <row>
   <entry>(�� ��������)</entry>
   <entry>13 ���� 2012</entry>
   <entry>10-CURRENT ����� ����������� ��������� � LLVM/Clang 3.1
-    (���. <svnref>238429</svnref>).</entry>
+    (���. <revnumber>238429</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000016</entry>
   <entry>8 ������� 2012</entry>
   <entry>10-CURRENT ����� ��������� KBI � &man.ucom.4; (���.
-    <svnref>239179</svnref>).</entry>
+    <revnumber>239179</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000017</entry>
   <entry>8 ������� 2012</entry>
   <entry>10-CURRENT ����� ���������� ���������������� streams �
-    USB-���� (���. <svnref>239214</svnref>).</entry>
+    USB-���� (���. <revnumber>239214</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000018</entry>
   <entry>8 �������� 2012</entry>
   <entry>10-CURRENT ����� ������������� ������������� &man.pf.4;
-    (���. <svnref>240233</svnref>).</entry>
+    (���. <revnumber>240233</revnumber>).</entry>
 </row>
 
 <row>
@@ -4314,7 +4314,7 @@
   <entry>6 ������� 2012</entry>
   <entry>10-CURRENT ����� ��������� KPI/KBI � &man.pfil.9; ���
     �������� ������� � ������� ������� ������ � ������-�������
-    AF_INET (���. <svnref>241245</svnref>).</entry>
+    AF_INET (���. <revnumber>241245</revnumber>).</entry>
 </row>
 
 <row>
@@ -4322,7 +4322,7 @@
   <entry>16 ������� 2012</entry>
   <entry>10-CURRENT ����� ��������� KPI ������������ �������
     �����������; ��������� if_clone ���������� ������������ (���.
-    <svnref>241610</svnref>).</entry>
+    <revnumber>241610</revnumber>).</entry>
 </row>
 
 <row>
@@ -4330,7 +4330,7 @@
   <entry>22 ������� 2012</entry>
   <entry>10-CURRENT ����� �������� ��������� �������� ������, ��
     ���������� MPSAFE, � ���������� ��������� FUSEFS (���.
-    <svnref>241519</svnref>, <svnref>241897</svnref>).</entry>
+    <revnumber>241519</revnumber>, <revnumber>241897</revnumber>).</entry>
 </row>
 
 <row>
@@ -4338,7 +4338,7 @@
   <entry>22 ������� 2012</entry>
   <entry>10-CURRENT ����� ������������ ����� ����� IPv4 �� ��������
     ���������� IP-������� � ������� ������� ������ (���.
-    <svnref>241913</svnref>).</entry>
+    <revnumber>241913</revnumber>).</entry>
 </row>
 
 <row>
@@ -4348,14 +4348,14 @@
     ��������� ���������������� ��������� USB ��� ���������� ��������
     �������� ��� ���������� ������ TTY.  ��������� �������
     �����-������� ������������� ��� ������������� ���� �������� (���.
-    <svnref>242619</svnref>).</entry>
+    <revnumber>242619</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000024</entry>
   <entry>5 ������ 2012</entry>
   <entry>10-CURRENT ����� ������������ ����������� �� ��������� ��
-    clang �� ���������� i386 � amd64 (���. <svnref>242624</svnref>).
+    clang �� ���������� i386 � amd64 (���. <revnumber>242624</revnumber>).
   </entry>
 </row>
 
@@ -4367,7 +4367,7 @@
     ��������� ��������� � ���������������� ����� ����������� sysctl
     ��� ������ �������������.  ��� ��������, ��� ����������� ��� KAME
     embedded scope id � sin6_addr.s6_addr[2] � ����������������
-    ���������� ������ ��������� (���. <svnref>243443</svnref>).
+    ���������� ������ ��������� (���. <revnumber>243443</revnumber>).
   </entry>
 </row>
 
@@ -4375,7 +4375,7 @@
   <entry>1000026</entry>
   <entry>11 ������ 2013</entry>
   <entry>10-CURRENT ����� ���������� � install ��������� -N (���.
-    <svnref>245313</svnref>).  ����� ������ ����������� �������
+    <revnumber>245313</revnumber>).  ����� ������ ����������� �������
     nmtree.</entry>
 </row>
 
@@ -4383,7 +4383,7 @@
   <entry>1000027</entry>
   <entry>29 ������ 2013</entry>
   <entry>10-CURRENT ����� ���������� � cat ��������� -l (���.
-    <svnref>246083</svnref>).</entry>
+    <revnumber>246083</revnumber>).</entry>
 </row>
 
 <row>
@@ -4391,7 +4391,7 @@
   <entry>13 ������� 2013</entry>
   <entry>10-CURRENT ����� ��������� � ��������� USB ��������,
     ��������� ���������� ���� USB ������� (���.
-    <svnref>246759</svnref>).</entry>
+    <revnumber>246759</revnumber>).</entry>
 </row>
 
 <row>
@@ -4399,7 +4399,7 @@
   <entry>4 ����� 2013</entry>
   <entry>10-CURRENT ����� ��������� ��������� tickless callout, ���
     ����� ������ ��������� � struct callout (���.
-    <svnref>247777</svnref>).</entry>
+    <revnumber>247777</revnumber>).</entry>
 </row>
 
 <row>
@@ -4407,7 +4407,7 @@
   <entry>12 ����� 2013</entry>
   <entry>10-CURRENT ����� ��������� KPI � ���������� �����������
     ������ ��� ��������� ���������� ������/������ (���.
-    <svnref>248084</svnref>).</entry>
+    <revnumber>248084</revnumber>).</entry>
 </row>
 
 <row>
@@ -4415,15 +4415,15 @@
   <entry>26 ������ 2013</entry>
   <entry>10-CURRENT ����� ��������� ���������� dst �������������
     const � ������ ifnet <function>if_output</function> (���.
-    <svnref>249925</svnref>).</entry>
+    <revnumber>249925</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000032</entry>
   <entry>1 ��� 2013</entry>
   <entry>10-CURRENT ����� ��������� ��������� �������
-    <function>accept4</function> (���. <svnref>250154</svnref>) �
-    <function>pipe2</function> (���. <svnref>250159</svnref>).
+    <function>accept4</function> (���. <revnumber>250154</revnumber>) �
+    <function>pipe2</function> (���. <revnumber>250159</revnumber>).
   </entry>
 </row>
 
@@ -4431,7 +4431,7 @@
   <entry>1000033</entry>
   <entry>21 ��� 2013</entry>
   <entry>10-CURRENT ����� ������� flex 2.5.37 (���.
-    <svnref>250881</svnref>).</entry>
+    <revnumber>250881</revnumber>).</entry>
 </row>
 
 <row>
@@ -4446,7 +4446,7 @@
     <function>catanh</function>, <function>catanhf</function>,
     <function>logl</function>, <function>log2l</function>,
     <function>log10l</function>, <function>log1pl</function>,
-    <function>expm1l</function> (���. <svnref>251294</svnref>).
+    <function>expm1l</function> (���. <revnumber>251294</revnumber>).
   </entry>
 </row>
 
@@ -4454,7 +4454,7 @@
   <entry>1000035</entry>
   <entry>8 ���� 2013</entry>
   <entry>10-CURRENT ����� ��������� ���������� ������
-    <function>aio_mlock</function> (���. <svnref>251526</svnref>).
+    <function>aio_mlock</function> (���. <revnumber>251526</revnumber>).
   </entry>
 </row>
 
@@ -4462,7 +4462,7 @@
   <entry>1000036</entry>
   <entry>9 ���� 2013</entry>
   <entry>10-CURRENT ����� ���������� ����� ������� � �����������
-    ��������� ������ ���� GSSAPI (���. <svnref>253049</svnref>).
+    ��������� ������ ���� GSSAPI (���. <revnumber>253049</revnumber>).
   </entry>
 </row>
 
@@ -4479,7 +4479,7 @@
     <literal>mrt6stat</literal>, <literal>mrtstat</literal>,
     <literal>pfkeystat</literal>, <literal>pim6stat</literal>,
     <literal>pimstat</literal>, <literal>rip6stat</literal>,
-    <literal>udpstat</literal> (���. <svnref>253081</svnref>).
+    <literal>udpstat</literal> (���. <revnumber>253081</revnumber>).
   </entry>
 </row>
 
@@ -4488,7 +4488,7 @@
   <entry>16 ���� 2013</entry>
   <entry>10-CURRENT ����� ������������ ABI, ������������� ��
     ���������, �� <literal>ARM EABI</literal> ��� ���������� arm,
-    armeb, armv6, and armv6eb (���. <svnref>253396</svnref>).</entry>
+    armeb, armv6, and armv6eb (���. <revnumber>253396</revnumber>).</entry>
 </row>
 
 <row>
@@ -4496,14 +4496,14 @@
   <entry>22 ���� 2013</entry>
   <entry>10-CURRENT ����� ��������� � ���������
     <literal>CAM</literal> � &man.mps.4; (���.
-    <svnref>253549</svnref>).</entry>
+    <revnumber>253549</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000040</entry>
   <entry>24 ���� 2013</entry>
   <entry>10-CURRENT ����� ���������� ������ pkgconf � libusb (���.
-    <svnref>253638</svnref>).</entry>
+    <revnumber>253638</revnumber>).</entry>
 </row>
 
 <row>
@@ -4511,7 +4511,7 @@
   <entry>5 ������� 2013</entry>
   <entry>10-CURRENT ����� ������ <function>time_second</function> ��
     <function>time_uptime</function> ��� <literal>PF_INET6</literal>
-    (���. <svnref>253970</svnref>).</entry>
+    (���. <revnumber>253970</revnumber>).</entry>
 </row>
 
 <row>
@@ -4519,26 +4519,26 @@
   <entry>9 ������� 2013</entry>
   <entry>10-CURRENT ����� ��������� � ���������� ����������� ������
     ��� ���������� ���������� ������� � ֣������ ������� (���.
-    <svnref>254138</svnref>).</entry>
+    <revnumber>254138</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000043</entry>
   <entry>13 ������� 2013</entry>
-  <entry>10-CURRENT ����� ��������� <makevar>WITH_ICONV</makevar> ��
+  <entry>10-CURRENT ����� ��������� <varname>WITH_ICONV</varname> ��
     ���������.  ����� �������� � &man.src.conf.5;
-    <makevar>WITH_LIBICONV_COMPAT</makevar> (�� ��������� ��������)
+    <varname>WITH_LIBICONV_COMPAT</varname> (�� ��������� ��������)
     ��������� <function>libiconv_open</function> ��� �����������
     ������������� � ������ <package>libiconv</package> (���.
-    <svnref>254273</svnref>).</entry>
+    <revnumber>254273</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000044</entry>
   <entry>15 ������� 2013</entry>
   <entry>10-CURRENT ����� �������� <literal>libc.so</literal> ��
-    ������������� �������� &man.ld.1; (���. <svnref>251668</svnref>,
-    <svnref>254358</svnref>).</entry>
+    ������������� �������� &man.ld.1; (���. <revnumber>251668</revnumber>,
+    <revnumber>254358</revnumber>).</entry>
 </row>
 
 <row>
@@ -4547,7 +4547,7 @@
   <entry>10-CURRENT ����� ��������� � ����������� ���������� devfs
     ��� ������ ����� cdevsw <literal>D_UNMAPPED_IO</literal> �� ����
     ��������� cdev <literal>SI_UNMAPPED</literal> (���.
-    <svnref>254389</svnref>).</entry>
+    <revnumber>254389</revnumber>).</entry>
 </row>
 
 <row>
@@ -4556,7 +4556,7 @@
   <entry>10-CURRENT ����� ���������� ������ mbuf
     <literal>M_PROTO[9-12]</literal> � �������� ������
     <literal>M_FRAG|M_FIRSTFRAG|M_LASTFRAG</literal> (���.
-    <svnref>254524</svnref>, <svnref>254526</svnref>).</entry>
+    <revnumber>254524</revnumber>, <revnumber>254526</revnumber>).</entry>
 </row>
 
 <row>
@@ -4564,7 +4564,7 @@
   <entry>21 ������� 2013</entry>
   <entry>10-CURRENT ����� ���������� &man.stat.2;, ������������
     ��������� ��������� �������� �������� Windows/DOS � CIFS �
-    �������� ������ &man.stat.2; (���. <svnref>254627</svnref>).
+    �������� ������ &man.stat.2; (���. <revnumber>254627</revnumber>).
   </entry>
 </row>
 
@@ -4572,7 +4572,7 @@
   <entry>1000048</entry>
   <entry>22 ������� 2013</entry>
   <entry>10-CURRENT ����� ��������� ���������
-    <literal>xsctp_inpcb</literal> (���. <svnref>254672</svnref>).
+    <literal>xsctp_inpcb</literal> (���. <revnumber>254672</revnumber>).
   </entry>
 </row>
 
@@ -4582,23 +4582,23 @@
   <entry>10-CURRENT ����� ��������� ��������� &man.physio.9; ���
     ���������, ����� ��� &man.sa.4;, ������� �� �������������
     ��������� � ����������� �����/������ (���.
-    <svnref>254760</svnref>).</entry>
+    <revnumber>254760</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000050</entry>
   <entry>24 ������� 2013</entry>
   <entry>10-CURRENT ����� ��������� ��������� <literal>mbuf</literal>
-    (���. <svnref>254780</svnref>, <svnref>254799</svnref>,
-    <svnref>254804</svnref>, <svnref>254807</svnref>
-    <svnref>254842</svnref>).</entry>
+    (���. <revnumber>254780</revnumber>, <revnumber>254799</revnumber>,
+    <revnumber>254804</revnumber>, <revnumber>254807</revnumber>
+    <revnumber>254842</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000051</entry>
   <entry>25 ������� 2013</entry>
   <entry>10-CURRENT ����� ������� �������� Radeon KMS (���.
-    <svnref>254885</svnref>, <svnref>254887</svnref>).</entry>
+    <revnumber>254885</revnumber>, <revnumber>254887</revnumber>).</entry>
 </row>
 
 <row>
@@ -4606,14 +4606,14 @@
   <entry>3 �������� 2013</entry>
   <entry>10-CURRENT ����� ����������� � ������ ����������
     <literal>libexecinfo</literal>, ��������������� �� NetBSD (���.
-    <svnref>255180</svnref>).</entry>
+    <revnumber>255180</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000053</entry>
   <entry>6 �������� 2013</entry>
   <entry>10-CURRENT ����� ��������� � API � ABI ��������������
-    Capsicum (���. <svnref>255305</svnref>).</entry>
+    Capsicum (���. <revnumber>255305</revnumber>).</entry>
 </row>
 
 <row>
@@ -4621,7 +4621,7 @@
   <entry>6 �������� 2013</entry>
   <entry>10-CURRENT ����� ���������� <literal>gcc</literal> �
     <literal>libstdc++</literal> �� ������ �� ��������� (���.
-    <svnref>255321</svnref>).</entry>
+    <revnumber>255321</revnumber>).</entry>
 </row>
 
 <row>
@@ -4629,18 +4629,18 @@
   <entry>6 �������� 2013</entry>
   <entry>10-CURRENT ����� ���������� �����
     <literal>MMAP_32BIT</literal> � &man.mmap.2; (���.
-    <svnref>255426</svnref>).</entry>
+    <revnumber>255426</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1000500</entry>
   <entry>10 ������� 2013</entry>
   <entry>10-STABLE ����� ��������� ����� �� <literal>head/</literal>
-    (���. <svnref>256283</svnref>).</entry>
+    (���. <revnumber>256283</revnumber>).</entry>
 </row>
 
 <row>
   <entry>1100000</entry>
   <entry>10 ������� 2013</entry>
-  <entry>11.0-CURRENT (���. <svnref>256284</svnref>).</entry>
-</row>
\ No newline at end of file
+  <entry>11.0-CURRENT (���. <revnumber>256284</revnumber>).</entry>
+</row>
diff --git a/ru_RU.KOI8-R/share/xml/mailing-lists.ent b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
index 6193170308..8187b18609 100644
--- a/ru_RU.KOI8-R/share/xml/mailing-lists.ent
+++ b/ru_RU.KOI8-R/share/xml/mailing-lists.ent
@@ -343,8 +343,8 @@
 <!ENTITY a.ports.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports.url;'>freebsd-ports</link>">
 
 <!ENTITY a.ports-announce.url "&a.mailman.listinfo;/freebsd-ports-announce">
-<!ENTITY a.ports-bugs "<ulink url='&a.ports-bugs.url;'>������ �������� ������� FreeBSD Ports</ulink>">
-<!ENTITY a.ports-announce.name "<ulink url='&a.ports-announce.url;'>freebsd-ports-announce</ulink>">
+<!ENTITY a.ports-bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>������ �������� ������� FreeBSD Ports</link>">
+<!ENTITY a.ports-announce.name "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-announce.url;'>freebsd-ports-announce</link>">
 
 <!ENTITY a.ports-bugs.url "&a.mailman.listinfo;/freebsd-ports-bugs">
 <!ENTITY a.ports-bugs "<link xmlns='http://docbook.org/ns/docbook' xlink:href='&a.ports-bugs.url;'>������ ��������, �����ݣ���� ������� � ������ FreeBSD</link>">
diff --git a/share/xml/authors.ent b/share/xml/authors.ent
index 2626972da2..519e103eb6 100644
--- a/share/xml/authors.ent
+++ b/share/xml/authors.ent
@@ -283,7 +283,7 @@
 <!ENTITY a.bp.email "&a.bp; <email xmlns='http://docbook.org/ns/docbook'>bp@FreeBSD.org</email>">
 
 <!ENTITY a.br "Ruslan Bukin">
-<!ENTITY a.br.email "&a.br; <email xmlns=''>br@FreeBSD.org</email>">
+<!ENTITY a.br.email "&a.br; <email xmlns='http://docbook.org/ns/docbook'>br@FreeBSD.org</email>">
 
 <!ENTITY a.brandon "Brandon Gillespie">
 <!ENTITY a.brandon.email "&a.brandon; <email xmlns='http://docbook.org/ns/docbook'>brandon@FreeBSD.org</email>">
@@ -451,7 +451,7 @@
 <!ENTITY a.danger.email "&a.danger; <email xmlns='http://docbook.org/ns/docbook'>danger@FreeBSD.org</email>">
 
 <!ENTITY a.danilo "Danilo Eg&ecirc;a Gondolfo">
-<!ENTITY a.danilo.email "&a.danilo; <email xmlns=''>danilo@FreeBSD.org</email>">
+<!ENTITY a.danilo.email "&a.danilo; <email xmlns='http://docbook.org/ns/docbook'>danilo@FreeBSD.org</email>">
 
 <!ENTITY a.danny "Daniel O'Callaghan">
 <!ENTITY a.danny.email "&a.danny; <email xmlns='http://docbook.org/ns/docbook'>danny@FreeBSD.org</email>">
@@ -622,7 +622,7 @@
 <!ENTITY a.ed.email "&a.ed; <email xmlns='http://docbook.org/ns/docbook'>ed@FreeBSD.org</email>">
 
 <!ENTITY a.edavis "Eric Davis">
-<!ENTITY a.edavis.email "&a.edavis; <email xmlns=''>edavis@FreeBSD.org</email>">
+<!ENTITY a.edavis.email "&a.edavis; <email xmlns='http://docbook.org/ns/docbook'>edavis@FreeBSD.org</email>">
 
 <!ENTITY a.edwin "Edwin Groothuis">
 <!ENTITY a.edwin.email "&a.edwin; <email xmlns='http://docbook.org/ns/docbook'>edwin@FreeBSD.org</email>">
@@ -1042,7 +1042,7 @@
 <!ENTITY a.jmg.email "&a.jmg; <email xmlns='http://docbook.org/ns/docbook'>jmg@FreeBSD.org</email>">
 
 <!ENTITY a.jmmv "Julio Merino">
-<!ENTITY a.jmmv.email "&a.jmmv; <email xmlns=''>jmmv@FreeBSD.org</email>">
+<!ENTITY a.jmmv.email "&a.jmmv; <email xmlns='http://docbook.org/ns/docbook'>jmmv@FreeBSD.org</email>">
 
 <!ENTITY a.jmz "Jean-Marc Zucconi">
 <!ENTITY a.jmz.email "&a.jmz; <email xmlns='http://docbook.org/ns/docbook' role='nolink'>jmz@FreeBSD.org</email>">
@@ -1723,7 +1723,7 @@
 <!ENTITY a.rm.email "&a.rm; <email xmlns='http://docbook.org/ns/docbook'>rm@FreeBSD.org</email>">
 
 <!ENTITY a.nemysis "Rusmir Dusko">
-<!ENTITY a.nemysis.email "&a.nemysis; <email xmlns=''>nemysis@FreeBSD.org</email>">
+<!ENTITY a.nemysis.email "&a.nemysis; <email xmlns='http://docbook.org/ns/docbook'>nemysis@FreeBSD.org</email>">
 
 <!ENTITY a.rmacklem "Rick Macklem">
 <!ENTITY a.rmacklem.email "&a.rmacklem; <email xmlns='http://docbook.org/ns/docbook'>rmacklem@FreeBSD.org</email>">
@@ -2230,7 +2230,7 @@
 <!ENTITY a.zarzycki.email "&a.zarzycki; <email xmlns='http://docbook.org/ns/docbook'>zarzycki@FreeBSD.org</email>">
 
 <!ENTITY a.zbb "Zbigniew Bodek">
-<!ENTITY a.zbb.email "&a.zbb; <email xmlns=''>zbb@FreeBSD.org</email>">
+<!ENTITY a.zbb.email "&a.zbb; <email xmlns='http://docbook.org/ns/docbook'>zbb@FreeBSD.org</email>">
 
 <!ENTITY a.zec "Marko Zec">
 <!ENTITY a.zec.email "&a.zec; <email xmlns='http://docbook.org/ns/docbook'>zec@FreeBSD.org</email>">
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index c8f75ba91a..aac5143c36 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -15,6 +15,7 @@
     </rule>
   </pattern>
 
+<!-- XXX: temporarily turned off
   <pattern name="Check filenames">
     <rule context="//db:filename">
       <report test="@role = 'directory'">Filename (<xsl:value-of select="."/>) has role="directory"; use class="directory"</report>
@@ -23,6 +24,7 @@
       <report test="@role != 'directory' and @role != 'package' and role != 'port'">Filename (<xsl:value-of select="."/>) has role attribute set; consider a properly set class attribute</report>
     </rule>
   </pattern>
+-->
 
   <pattern name="Check cross-reference validity">
     <rule context="//db:link">
diff --git a/share/xml/freebsd50.rnc b/share/xml/freebsd50.rnc
index 93cff05752..a240d0317a 100644
--- a/share/xml/freebsd50.rnc
+++ b/share/xml/freebsd50.rnc
@@ -30,6 +30,12 @@ include "/usr/local/share/xml/docbook/5.0/rng/docbook.rnc" inherit = db {
        | db.email )*
     }
 
+  # XXX: DocBook 5.0 disallows mixing CDATA and itemizedlist
+  db.entry =
+    element entry {
+      db.entry.attlist, (db.all.inlines|db.all.blocks)*
+    }
+
   # FreeBSD extension: add buildtarget element to allowed inlines
   db.extension.inlines = db.buildtarget
      | db.revnumber