diff --git a/en_US.ISO8859-1/articles/releng/article.xml b/en_US.ISO8859-1/articles/releng/article.xml
index 15b8bf57d6..a611c04eef 100644
--- a/en_US.ISO8859-1/articles/releng/article.xml
+++ b/en_US.ISO8859-1/articles/releng/article.xml
@@ -332,7 +332,7 @@
         described in the <link xlink:href="&url.articles.committers-guide;/subversion-primer.html#subversion-primer-base-layout">Committer's Guide</link>.
         The first step in creating a branch is to
         identify the revision of the
-        <literal>stable/X</literal> sources
+        <literal>stable/<replaceable>X</replaceable></literal> sources
         that you want to branch <emphasis>from</emphasis>.</para>
 
       <screen>&prompt.root; <userinput>svn log -v $FSVN/stable/9</userinput></screen>
@@ -549,7 +549,7 @@
 
       <itemizedlist>
         <listitem>
-          <para><filename>share/images/articles/releng/branches-relengX.pic</filename></para>
+          <para><filename>share/images/articles/releng/branches-releng<replaceable>X</replaceable>.pic</filename></para>
         </listitem>
 
         <listitem>
@@ -852,7 +852,7 @@
 
   <variablelist>
     <varlistentry>
-      <term><filename>/pub/FreeBSD/releases/arch/X.Y-RELEASE/</filename></term>
+      <term><filename>/pub/FreeBSD/releases/<replaceable>arch</replaceable>/<replaceable>X.Y</replaceable>-RELEASE/</filename></term>
       <listitem>
         <para>The installable FTP directory as output from <command>make
           release</command>.</para>
@@ -860,25 +860,25 @@
     </varlistentry>
 
     <varlistentry>
-      <term><filename>/pub/FreeBSD/ports/arch/packages-X.Y-release/</filename></term>
+      <term><filename>/pub/FreeBSD/ports/<replaceable>arch</replaceable>/packages-<replaceable>X.Y</replaceable>-release/</filename></term>
       <listitem><para>The complete package build for this
         release.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><filename>/pub/FreeBSD/releases/arch/X.Y-RELEASE/tools</filename></term>
+      <term><filename>/pub/FreeBSD/releases/<replaceable>arch</replaceable>/<replaceable>X.Y</replaceable>-RELEASE/tools</filename></term>
       <listitem><para>A symlink to
       <filename>../../../tools</filename>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><filename>/pub/FreeBSD/releases/arch/X.Y-RELEASE/packages</filename></term>
+      <term><filename>/pub/FreeBSD/releases/<replaceable>arch</replaceable>/<replaceable>X.Y</replaceable>-RELEASE/packages</filename></term>
       <listitem><para>A symlink to
-      <filename>../../../ports/arch/packages-X.Y-release</filename>.</para></listitem>
+      <filename>../../../ports/<replaceable>arch</replaceable>/packages-<replaceable>X.Y</replaceable>-release</filename>.</para></listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><filename>/pub/FreeBSD/releases/arch/ISO-IMAGES/X.Y/X.Y-RELEASE-arch-*.iso</filename></term>
+      <term><filename>/pub/FreeBSD/releases/<replaceable>arch</replaceable>/ISO-IMAGES/<replaceable>X.Y</replaceable>/<replaceable>X.Y</replaceable>-RELEASE-<replaceable>arch</replaceable>-*.iso</filename></term>
       <listitem><para>The ISO images.  The <quote>*</quote> is
 	<filename>disc1</filename>, <filename>disc2</filename>, etc.
 	Only if there is a <filename>disc1</filename> and there is an