diff --git a/docs/appendixes.sgml b/docs/appendixes.sgml
index d63384b4..a8615a6a 100644
--- a/docs/appendixes.sgml
+++ b/docs/appendixes.sgml
@@ -319,7 +319,7 @@ Stock Name: {$ticker_name} Stock Price: {$ticker_price}</programlisting>
 		As of Smarty 1.5.0, there is even a cleaner way. You can include php in
 		your templates with the {include_php ...} tag. This way you can keep
 		your PHP logic separated from the template logic. See the <link
-		linkend="builtin.functions.include.php">include_php</link> function for
+		linkend="language.function.include.php">include_php</link> function for
 		more information.
         </para>
 <example>
diff --git a/docs/designers.sgml b/docs/designers.sgml
index 44d181a9..a0cfb358 100644
--- a/docs/designers.sgml
+++ b/docs/designers.sgml
@@ -317,7 +317,7 @@ email: zaphod@slartibartfast.com&lt;br&gt;</programlisting>
 			<para>
 			The output captured via {capture}..{/capture} construct can be
 			accessed using {$smarty} variable. See section on
-			<link linkend="builtin.functions.capture">capture</link> for an example.
+			<link linkend="language.function.capture">capture</link> for an example.
 			</para>
 		</sect3>
 
@@ -326,8 +326,8 @@ email: zaphod@slartibartfast.com&lt;br&gt;</programlisting>
 			<para>
 			{$smarty} variable can be used to refer to 'section' and
 			'foreach' loop properties. See docs for
-			<link linkend="builtin.functions.section">section</link> and
-			<link linkend="builtin.functions.foreach">foreach</link>.
+			<link linkend="language.function.section">section</link> and
+			<link linkend="language.function.foreach">foreach</link>.
 			</para>
 		</sect3>
 		</sect2>
@@ -2560,15 +2560,15 @@ OUTPUT:
 		</sect2>
        </sect1>
 
-       <sect1 id="language.custom.functions">
+       <sect1 id="language.custom.functions.top">
         <title>Custom Functions</title>
         <para>
-         Smarty comes with several additional functions that you can
+         Smarty comes with several custom functions that you can
          use in the templates.
         </para>
 
-        <sect2 id="language.more.functions">
-         <title>Additional Functions</title>
+        <sect2 id="language.custom.functions">
+         <title>Custom Functions</title>
 		<sect3 id="language.function.assign">
 			<title>assign</title>
             <informaltable frame=all>
diff --git a/docs/getting-started.sgml b/docs/getting-started.sgml
index 0190a7f0..ec547797 100644
--- a/docs/getting-started.sgml
+++ b/docs/getting-started.sgml
@@ -24,8 +24,8 @@
     <listitem><para>No template parsing overhead, only compiles once.</para></listitem>
     <listitem><para>It is smart about recompiling only the template
       files that have changed.</para></listitem>
-    <listitem><para>You can make <link linkend="bundled.plugins.commands">custom
-       functions</link> and custom <link linkend="variable.modifiers">variable
+    <listitem><para>You can make <link linkend="language.custom.functions">custom
+       functions</link> and custom <link linkend="language.modifiers">variable
        modifiers</link>, so the template language is extremely extensible.</para></listitem>
     <listitem><para>Configurable template delimiter tag syntax, so you can use
       {}, {{}}, &lt;!--{}--&gt;, etc.</para></listitem>
@@ -65,7 +65,7 @@
       linkend="variable.cache.lifetime">expires</link>, regenerating a new
      one. The default cache expire time can be configured from the
      class. The exception to the rule is the <link
-      linkend="builtin.functions.insert">insert</link> tag. Anything
+      linkend="language.function.insert">insert</link> tag. Anything
      generated by the insert tag is not cached, but run dynamically on
      every invocation, even within cached content.
     </para>
diff --git a/docs/programmers.sgml b/docs/programmers.sgml
index c67eb3f8..02baf9ee 100644
--- a/docs/programmers.sgml
+++ b/docs/programmers.sgml
@@ -127,7 +127,7 @@
        Server variables can be accessed through the
        $smarty variable, such as {$smarty.server.SCRIPT_NAME}. See the
        section on the
-       <link linkend="builtin.variable.smarty">$smarty</link> variable.
+       <link linkend="language.variables.smarty">$smarty</link> variable.
       </para>
 	 </note>
      </sect2>
@@ -256,7 +256,7 @@
        This tells Smarty how to handle PHP code embedded in the
        tempalates. There are four possible settings, default being
        SMARTY_PHP_PASSTHRU. Note that this does NOT affect php code
-       within <link linkend="builtin.functions.php">{php}{/php}</link>
+       within <link linkend="language.function.php">{php}{/php}</link>
        tags in the template.
       </para>    
       <itemizedlist>
@@ -270,7 +270,7 @@
       </itemizedlist>
       <para>
        NOTE: Embedding PHP code into templates is highly discouraged.
-       Use <link linkend="bundled.plugins.commands">custom functions</link> or
+       Use <link linkend="language.custom.functions">custom functions</link> or
        <link linkend="language.modifiers">modifiers</link> instead.
       </para>
      </sect2>
@@ -334,7 +334,7 @@
 	   $trusted_dir is only for use when $security is enabled. This is an array
 	   of all directories that are considered trusted. Trusted directories are
 	   where you keep php scripts that are executed directly from the templates
-	   with <link linkend="builtin.functions.include.php">{include_php}</link>.
+	   with <link linkend="language.function.include.php">{include_php}</link>.
       </para>
      </sect2>
      <sect2 id="variable.left.delimiter">
@@ -708,7 +708,7 @@ $smarty->unregister_resource("db");</programlisting>
 			<para>
                 Use this to dynamically register prefilters to run templates
                 through before they are compiled. See <link
-                linkend="section.template.prefilters">template prefilters</link> for
+                linkend="advanced.features.prefilters">template prefilters</link> for
                 more information on how to setup a prefiltering function.
 			</para>
 		</sect2>
@@ -735,7 +735,7 @@ $smarty->unregister_resource("db");</programlisting>
 			<para>
                 Use this to dynamically register postfilters to run templates
                 through after they are compiled. See <link
-                linkend="template.postfilters">template postfilters</link> for
+                linkend="advanced.features.postfilters">template postfilters</link> for
                 more information on how to setup a postfiltering function.
 			</para>
 		</sect2>
@@ -1058,7 +1058,6 @@ $smarty->display("index.tpl");
 &lt;!-- Created by Smarty! --&gt;
 {* rest of template content... *}</programlisting>
     </example>
-   </sect2>
   </sect1>
 
   <sect1 id="section.template.cache.handler.func">
@@ -1980,7 +1979,7 @@ function smarty_resource_db_trusted($tpl_name, &amp;$smarty)
    <sect1 id="plugins.inserts"><title>Inserts</title>
     <para>
      Insert plugins are used to implement functions that are invoked by
-     <link linkend="builtin.functions.insert"><command>insert</command></link>
+     <link linkend="language.function.insert"><command>insert</command></link>
      tags in the template.
     </para>
     <funcsynopsis>