Skip to content

Commit

Permalink
Update links
Browse files Browse the repository at this point in the history
  • Loading branch information
Girgias committed Jan 10, 2021
1 parent 2b8375f commit 116241a
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 23 deletions.
8 changes: 4 additions & 4 deletions appendices/reserved.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<link linkend="control-structures.switch">case</link>
</entry>
<entry>
<link linkend="language.exceptions">catch</link>
<link linkend="control-structures.catch">catch</link>
</entry>
<entry>
<link linkend="language.oop5.basic.class">class</link>
Expand Down Expand Up @@ -137,7 +137,7 @@
<link linkend="language.oop5.final">final</link>
</entry>
<entry>
<link linkend="language.exceptions">finally</link> (as of PHP 5.5)
<link linkend="control-structures.finally">finally</link> (as of PHP 5.5)
</entry>
<entry>
<link linkend="functions.arrow">fn</link> (as of PHP 7.4)
Expand Down Expand Up @@ -236,13 +236,13 @@
</row>
<row>
<entry>
<link linkend="language.exceptions">throw</link>
<link linkend="control-structures.throw">throw</link>
</entry>
<entry>
<link linkend="language.oop5.traits">trait</link> (as of PHP 5.4)
</entry>
<entry>
<link linkend="language.exceptions">try</link>
<link linkend="control-structures.try">try</link>
</entry>
<entry>
<function>unset</function>
Expand Down
8 changes: 4 additions & 4 deletions appendices/tokens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<row>
<entry><constant>T_CATCH</constant></entry>
<entry>catch</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.catch"/></entry>
</row>
<row>
<entry><constant>T_CLASS</constant></entry>
Expand Down Expand Up @@ -354,7 +354,7 @@
<row>
<entry><constant>T_FINALLY</constant></entry>
<entry>finally</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.finally"/></entry>
</row>
<row>
<entry><constant>T_FN</constant></entry>
Expand Down Expand Up @@ -747,7 +747,7 @@
<row>
<entry><constant>T_THROW</constant></entry>
<entry>throw</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.throw"/></entry>
</row>
<row>
<entry><constant>T_TRAIT</constant></entry>
Expand All @@ -762,7 +762,7 @@
<row>
<entry><constant>T_TRY</constant></entry>
<entry>try</entry>
<entry><xref linkend="language.exceptions"/></entry>
<entry><xref linkend="control-structures.try"/></entry>
</row>
<row>
<entry><constant>T_UNSET</constant></entry>
Expand Down
2 changes: 1 addition & 1 deletion language/oop5/autoload.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<para>
Prior to PHP 5.3, exceptions thrown in the <function>__autoload</function>
function could not be caught in the
<link linkend="language.exceptions">catch</link> block and would result in
<link linkend="control-structures.catch">catch</link> block and would result in
a fatal error. From PHP 5.3 and upwards, this is possible provided that if
a custom exception is thrown, then the custom exception class is available.
The <function>__autoload</function> function may be used recursively to
Expand Down
2 changes: 1 addition & 1 deletion language/oop5/basic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ $this is not defined.
To create an instance of a class, the <literal>new</literal> keyword must
be used. An object will always be created unless the object has a
<link linkend="language.oop5.decon">constructor</link> defined that throws an
<link linkend="language.exceptions">exception</link> on error. Classes
<classname>Exception</classname> on error. Classes
should be defined before instantiation (and in some cases this is a
requirement).
</para>
Expand Down
6 changes: 3 additions & 3 deletions language/oop5/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
<row>
<entry>5.5.0</entry>
<entry>
Added: <link linkend="language.exceptions">finally</link> to handle exceptions.
Added: <link linkend="control-structures.finally">finally</link> to handle exceptions.
</entry>
</row>
<row>
Expand Down Expand Up @@ -231,9 +231,9 @@
<entry>
Changed: Prior to 5.3.0, exceptions thrown in the
<function>__autoload</function> function could not be
caught in the <link linkend="language.exceptions">catch</link> block, and
caught in the <link linkend="control-structures.catch">catch</link> block, and
would result in a fatal error. Exceptions now thrown in the __autoload function
can be caught in the <link linkend="language.exceptions">catch</link> block, with
can be caught in the <link linkend="control-structures.catch">catch</link> block, with
one provison. If throwing a custom exception, then the custom exception class must
be available. The __autoload function may be used recursively to autoload the
custom exception class.
Expand Down
2 changes: 1 addition & 1 deletion reference/dom/domexception.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ FIXME: Remove me once you perform substitutions
when an operation is impossible to perform for logical reasons.
</para>
<para>
See also <xref linkend="language.exceptions"/>.
See also <xref linkend="language.error-handling.throwable"/>.
</para>
</section>
<!-- }}} -->
Expand Down
2 changes: 1 addition & 1 deletion reference/errorfunc/functions/set-exception-handler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ echo "Not Executed\n";
<member><function>restore_exception_handler</function></member>
<member><function>restore_error_handler</function></member>
<member><function>error_reporting</function></member>
<member><link linkend="language.exceptions">PHP 5 Exceptions</link></member>
<member><xref linkend="language.error-handling.throwable"/></member>
</simplelist>
</para>
</refsect1><!-- }}} -->
Expand Down
4 changes: 2 additions & 2 deletions reference/pdo/error-handling.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
checking the return value of each database call.
</para>
<para>
See <link linkend="language.exceptions">Exceptions</link> for more
information about Exceptions in PHP.
See <xref linkend="language.error-handling.throwable"/> for more
information about handling Exceptions in PHP.
</para>
</listitem>
</itemizedlist>
Expand Down
5 changes: 3 additions & 2 deletions reference/pdo/pdoexception.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
<para>
Represents an error raised by PDO. You should not throw a
<classname>PDOException</classname> from your own code.
See <link linkend="language.exceptions">Exceptions</link> for more
information about Exceptions in PHP.
</para>
<para>
See also <xref linkend="language.error-handling.throwable"/>.
</para>
</section>
<!-- }}} -->
Expand Down
2 changes: 1 addition & 1 deletion reference/sdo/reference.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
</para>
<section> &reftitle.methods;
<para>One method is added to those inherited from the built in
<link linkend="language.exceptions.extending">Exception</link> class:
<classname>Exception</classname> class:
</para>
<itemizedlist>
<listitem>
Expand Down
5 changes: 3 additions & 2 deletions reference/snmp/snmpexception.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
<para>
Represents an error raised by SNMP. You should not throw a
<classname>SNMPException</classname> from your own code.
See <link linkend="language.exceptions">Exceptions</link> for more
information about Exceptions in PHP.
</para>
<para>
See also <xref linkend="language.error-handling.throwable"/>.
</para>
</section>
<!-- }}} -->
Expand Down
5 changes: 4 additions & 1 deletion reference/stomp/stompexception.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
<section xml:id="stompexception.intro">
&reftitle.intro;
<para>
Represents an error raised by the stomp extension. See <link linkend="language.exceptions">Exceptions</link> for more information about Exceptions in PHP.
Represents an error raised by the stomp extension.
</para>
<para>
See also <xref linkend="language.error-handling.throwable"/>.
</para>
</section>
<!-- }}} -->
Expand Down

0 comments on commit 116241a

Please sign in to comment.