diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index 2fa3341e61..e14c6b426d 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -33,10 +33,12 @@
         <title><filename>bitbake/</filename></title>
 
         <para>
-            The <ulink url='source-directory'>Source Directory</ulink>
+            The <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>
             includes a copy of BitBake for ease of use.
             The copy usually matches the current stable BitBake release from the BitBake project.
-            BitBake, a metadata interpreter, reads the Yocto Project metadata and runs the tasks
+            BitBake, a
+            <ulink url='&YOCTO_DOCS_DEV_URL;#metadata'>Metadata</ulink>
+            interpreter, reads the Yocto Project metadata and runs the tasks
             defined by that data.
             Failures are usually from the metadata and not from BitBake itself.
             Consequently, most users do not need to worry about BitBake.
@@ -46,7 +48,7 @@
             When you run the <filename>bitbake</filename> command, the wrapper script in
             <filename>scripts/</filename> is executed to run the main BitBake executable,
             which resides in the <filename>bitbake/bin/</filename> directory.
-            Sourcing the <link linkend="structure-core-script">&OE_INIT_FILE;</link>
+            Sourcing the <link linkend="structure-core-script"><filename>&OE_INIT_FILE;</filename></link>
             script places the <filename>scripts</filename> and <filename>bitbake/bin</filename>
             directories (in that order) into the shell's <filename>PATH</filename> environment
             variable.