diff --git a/chapters/install.xml b/chapters/install.xml
index adc36d9b38..be4a9a5624 100644
--- a/chapters/install.xml
+++ b/chapters/install.xml
@@ -237,9 +237,9 @@
- Enables IBM DB2 support. The parameter to this option is the
- DB2 base install directory and defaults to /home/db2inst1/sqllib.
+ Enables IBM DB2 support. The parameter to this option is the
+ DB2 base install directory and defaults to
+ /home/db2inst1/sqllib.
IBM DB2 home page
diff --git a/functions/info.xml b/functions/info.xml
index 5c9e0bdc71..044225ba14 100644
--- a/functions/info.xml
+++ b/functions/info.xml
@@ -1,6 +1,129 @@
PHP options & informationPHP options/info
+
+
+
+ assert
+ Checks if assertion is false
+
+
+ Description
+
+
+ int assert
+ string|bool assertion
+
+
+
+ assert will check the given
+ assertion and take appropriate
+ action if its result is false.
+
+
+ If the assertion is given as a string it
+ will be evaluated as PHP code by assert.
+ The advantages of a string assertion
+ are less overhead when assertion checking is off and messages
+ containing the assertion expression when
+ an assertion failes.
+
+
+ Assertion should be used as a debugging feature only. You may
+ use them for sanity-checks that test for conditions that should
+ always be true and that indicate some programming errors if not
+ or to check for the presence of certain features like extension
+ functions or certain system limits and features.
+
+
+ Assertions should not be used for normal runtime operations
+ like input parameter checks. As a rule of thumb your code
+ should always be able to work correct if assertion checking
+ is not activated.
+
+
+ The behavior of assert may be configured
+ by assert_options or by .ini-settings
+ described in that functions manual page.
+
+
+
+
+
+
+ assert-options
+ Set/get the various assert flags
+
+
+ Description
+
+
+ mixed assert_options
+ int what
+ mixed
+ value
+
+
+
+
+ Using assert_options you may set the various
+ assert control options or just query their
+ current settings.
+
+
+
+ assert_options will return the original
+ setting of any option or false on errors.
+
+
+
diff --git a/language/control-structures.xml b/language/control-structures.xml
index 1849a61873..cb52603d44 100644
--- a/language/control-structures.xml
+++ b/language/control-structures.xml
@@ -1108,7 +1108,7 @@ function showVar($var) {
<?php
require("foolib.inc");
-/* the following will generate and error */
+/* the following will generate an error */
require("utils.inc");
$foo = array("1",array("complex","quaternion"));
echo "this is requiring utils.inc again which is also\n";