Change ID for basic/advanced string interpolation

Also fix token descriptions

Author: Girgias

appendices/tokens.xml

@@ -204,8 +204,10 @@ defined('T_FN') || define('T_FN', 10001);
     <row>
      <entry><constant>T_CURLY_OPEN</constant></entry>
      <entry>{$</entry>
-     <entry><link linkend="language.types.string.parsing.complex">complex
-     variable parsed syntax</link></entry>
+     <entry>
+      <link linkend="language.types.string.parsing.advanced">advanced</link>
+      variable string interpolation
+     </entry>
     </row>
     <row>
      <entry><constant>T_DEC</constant></entry>
@@ -255,8 +257,10 @@ defined('T_FN') || define('T_FN', 10001);
     <row>
      <entry><constant>T_DOLLAR_OPEN_CURLY_BRACES</constant></entry>
      <entry>${</entry>
-     <entry><link linkend="language.types.string.parsing.complex">complex
-     variable parsed syntax</link></entry>
+     <entry>
+      <link linkend="language.types.string.parsing.basic">basic</link>
+      variable string interpolation
+     </entry>
     </row>
     <row>
      <entry><constant>T_DOUBLE_ARROW</constant></entry>
@@ -799,8 +803,10 @@ defined('T_FN') || define('T_FN', 10001);
     <row>
      <entry><constant>T_STRING_VARNAME</constant></entry>
      <entry>"${a</entry>
-     <entry><link linkend="language.types.string.parsing.complex">complex
-     variable parsed syntax</link></entry>
+     <entry>
+      <link linkend="language.variables.variable">variable variables</link>
+      to interpolate in a string
+     </entry>
     </row>
     <row>
      <entry><constant>T_SWITCH</constant></entry>

language/types/string.xml

@@ -692,8 +692,8 @@ EOT;
 
    <simpara>
     There are two types of syntax: a
-    <link linkend="language.types.string.parsing.simple">basic</link> one and an
-    <link linkend="language.types.string.parsing.complex">advanced</link> one.
+    <link linkend="language.types.string.parsing.basic">basic</link> one and an
+    <link linkend="language.types.string.parsing.advanced">advanced</link> one.
     The basic syntax is the most common and convenient. It provides a way to
     embed a variable, an <type>array</type> value, or an <type>object</type>
     property in a <type>string</type> with a minimum of effort.
@@ -704,7 +704,7 @@ EOT;
     curly braces surrounding the expression.
    </simpara>
 
-   <sect4 xml:id="language.types.string.parsing.simple">
+   <sect4 xml:id="language.types.string.parsing.basic">
     <title>Basic syntax</title>
 
     <simpara>
@@ -800,7 +800,7 @@ string(3) "bar"
 ]]>
        </screen>
       </informalexample>
-      The <link linkend="language.types.string.parsing.complex">advanced</link>
+      The <link linkend="language.types.string.parsing.advanced">advanced</link>
       string interpolation syntax should be used instead.
      </para>
     </warning>
@@ -868,7 +868,7 @@ He drank some purple juice.
       The basic syntax does not permit access to an array entry which has a key
       containing a minus (<literal>-</literal>) sign.
       Attempting to do will result in a parse error. The
-      <link linkend="language.types.string.parsing.complex">advanced</link>
+      <link linkend="language.types.string.parsing.advanced">advanced</link>
       syntax must be used instead.
       <informalexample>
        <programlisting role="php">
@@ -893,7 +893,7 @@ Parse error: syntax error, unexpected token "-", expecting "]" in file on line 3
      <simpara>
       Because the array key is unquoted, it is not possible to refer to a
       constant with the basic syntax. Use the
-      <link linkend="language.types.string.parsing.complex">advanced</link>
+      <link linkend="language.types.string.parsing.advanced">advanced</link>
       syntax instead.
      </simpara>
     </note>
@@ -998,12 +998,12 @@ Fatal error: Uncaught Error: Object of class A could not be converted to string
 
     <simpara>
      For anything more complex, the
-     <link linkend="language.types.string.parsing.complex">advanced</link>
+     <link linkend="language.types.string.parsing.advanced">advanced</link>
      syntax must be used.
     </simpara>
    </sect4>
 
-   <sect4 xml:id="language.types.string.parsing.complex">
+   <sect4 xml:id="language.types.string.parsing.advanced">
     <title>Advanced (curly) syntax</title>
 
     <simpara>