diff --git a/appendices/migration54.xml b/appendices/migration54.xml
index fb91872ec6..5aed56dabf 100644
--- a/appendices/migration54.xml
+++ b/appendices/migration54.xml
@@ -1221,45 +1221,51 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     <literal>register_globals</literal> and <literal>register_long_arrays</literal>
+     <link linkend="ini.register-globals">register_globals</link> and
+     <link linkend="ini.register-long-arrays">register_long_arrays</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>magic_quotes_gpc</literal>, <literal>magic_quotes_runtime</literal>,
-     and <literal>magic_quotes_sybase</literal>
+     <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>,
+     <link linkend="ini.magic-quotes-runtime">magic_quotes_runtime</link>,
+     and <link linkend="ini.magic-quotes-sybase">magic_quotes_sybase</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>allow_call_time_pass_reference</literal>
+     <link linkend="ini.allow-call-time-pass-reference">allow_call_time_pass_reference</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>define_syslog_variables</literal>
+     <link linkend="ini.define-syslog-variables">define_syslog_variables</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>highlight.bg</literal>
+     <link linkend="ini.syntax-highlighting">highlight.bg</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>session.bug_compat_42</literal> and <literal>session.bug_compat_warn</literal>
+     <link linkend="ini.session.bug-compat-42">session.bug_compat_42</link> and
+     <link linkend="ini.session.bug-compat-warn">session.bug_compat_warn</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>y2k_compliance</literal>
+     <link linkend="ini.y2k-compliance">y2k_compliance</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>safe_mode</literal>, <literal>safe_mode_gid</literal>,
-     <literal>safe_mode_include_dir</literal>, <literal>safe_mode_exec_dir</literal>,
-     <literal>safe_mode_allowed_env_vars</literal>, and <literal>safe_mode_protected_env_vars</literal>
+     <link linkend="ini.safe-mode">safe_mode</link>,
+     <link linkend="ini.safe-mode-gid">safe_mode_gid</link>,
+     <link linkend="ini.safe-mode-include-dir">safe_mode_include_dir</link>,
+     <link linkend="ini.safe-mode-exec-dir">safe_mode_exec_dir</link>,
+     <link linkend="ini.safe-mode-allowed-env-vars">safe_mode_allowed_env_vars</link>, and
+     <link linkend="ini.safe-mode-protected-env-vars">safe_mode_protected_env_vars</link>
     </simpara>
    </listitem>
   </itemizedlist>
@@ -1269,55 +1275,64 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     <literal>cli.pager</literal> and <literal>cli.prompt</literal> for CLI SAPI using readline
+     <link linkend="ini.cli.pager">cli.pager</link> and
+     <link linkend="ini.cli.prompt">cli.prompt</link> for CLI SAPI using readline
      in interactive mode.
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>cli_server.color</literal> to enable the built-in development web server to use ANSI color coding
+     <link linkend="ini.cli-server.color">cli_server.color</link>
+     to enable the built-in development web server to use ANSI color coding 
      in terminal output.
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>max_input_vars</literal> - specifies how many GET/POST/COOKIE input variables may be
-    accepted.
+     <link linkend="ini.max-input-vars">max_input_vars</link>
+     - specifies how many GET/POST/COOKIE input variables may be accepted.
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>zend.multibyte</literal> - to control the new multibyte support.
+     <link linkend="ini.zend.multibyte">zend.multibyte</link>
+     - to control the new multibyte support.
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>zend.script_encoding</literal> - This value will be used unless a
-     "declare(encoding=...)" directive appears at the top of the script.
+     <link linkend="ini.zend.script-encoding">zend.script_encoding</link>
+     - This value will be used unless a "declare(encoding=...)" directive
+     appears at the top of the script.
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>zend.signal_check</literal> - to check for replaced signal handlers on shutdown.
+     <link linkend="ini.zend.signal-check">zend.signal_check</link>
+     - to check for replaced signal handlers on shutdown.
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>session.upload_progress.enabled</literal>, <literal>session.upload_progress.cleanup</literal>,
-     <literal>session.upload_progress.prefix</literal>, <literal>session.upload_progress.name</literal>,
-     <literal>session.upload_progress.freq</literal>, <literal>session.upload_progress.min_freq</literal>
+     <link linkend="ini.session.upload-progress.enabled">session.upload_progress.enabled</link>,
+     <link linkend="ini.session.upload-progress.cleanup">session.upload_progress.cleanup</link>,
+     <link linkend="ini.session.upload-progress.prefix">session.upload_progress.prefix</link>,
+     <link linkend="ini.session.upload-progress.name">session.upload_progress.name</link>,
+     <link linkend="ini.session.upload-progress.freq">session.upload_progress.freq</link>,
+     <link linkend="ini.session.upload-progress.min-freq">session.upload_progress.min_freq</link>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>enable_post_data_reading</literal> - When it's disabled, the POST data is not read (and processed)
+     <link linkend="ini.enable-post-data-reading">enable_post_data_reading</link>
+     - When it's disabled, the POST data is not read (and processed)
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>windows_show_crt_warning</literal> - This directive
-     shows the Windows CRT warnings when enabled. These warnings were
-     displayed by default until now.
+     <link linkend="ini.windows-show-crt-warning">windows_show_crt_warning</link>
+     - This directive shows the Windows CRT warnings when enabled. These
+     warnings were displayed by default until now.
     </simpara>
    </listitem>
    </itemizedlist>
@@ -1327,13 +1342,15 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     <literal>session.entropy_file</literal> now defaults to /dev/random or /dev/urandom depending on
-     what has been guessed at compile time.
+     <link linkend="ini.session.entropy-file">session.entropy_file</link>
+     now defaults to /dev/random or /dev/urandom depending on what has been
+     guessed at compile time.
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <literal>session.entropy_length</literal> now defaults to 32.
+     <link linkend="ini.session.entropy-length">session.entropy_length</link>
+     now defaults to 32.
     </simpara>
    </listitem>
    </itemizedlist>