summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2015-05-31 18:36:04 +0200
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2015-05-31 18:36:04 +0200
commitf107c1522db3db81bb0ef1031250891432eaa453 (patch)
tree6e9399905aecf23283b5592cab75ef9656a24889
parent4b32f9f761ba9e911fdc53181e5c2feec7bf040d (diff)
fix documentation stuff that was reported in pull requested #194
-rw-r--r--documentation/loading-extensions.html2
-rw-r--r--documentation/your-first-extension.html2
-rw-r--r--include/fatalerror.h2
-rw-r--r--include/namespace.h4
-rw-r--r--include/value.h2
-rw-r--r--include/valueiterator.h2
-rwxr-xr-xtests/prepare.sh2
7 files changed, 8 insertions, 8 deletions
diff --git a/documentation/loading-extensions.html b/documentation/loading-extensions.html
index 3cc7059..180cb33 100644
--- a/documentation/loading-extensions.html
+++ b/documentation/loading-extensions.html
@@ -37,7 +37,7 @@ extern "C" {
/**
* Function that is called by PHP right after the PHP process
* has started, and that returns an address of an internal PHP
- * strucure with all the details and features of your extension
+ * structure with all the details and features of your extension
*
* @return void* a pointer to an address that is understood by PHP
*/
diff --git a/documentation/your-first-extension.html b/documentation/your-first-extension.html
index 2e5914e..ab5c838 100644
--- a/documentation/your-first-extension.html
+++ b/documentation/your-first-extension.html
@@ -194,7 +194,7 @@ extern "C" {
/**
* Function that is called by PHP right after the PHP process
* has started, and that returns an address of an internal PHP
- * strucure with all the details and features of your extension
+ * structure with all the details and features of your extension
*
* @return void* a pointer to an address that is understood by PHP
*/
diff --git a/include/fatalerror.h b/include/fatalerror.h
index bda717a..a5fd25c 100644
--- a/include/fatalerror.h
+++ b/include/fatalerror.h
@@ -6,7 +6,7 @@
*
* However, this will trigger a longjmp(), which will cause objects
* constructed in the extension not to be destructed. We use therefore
- * this FatalError class, which is a normally exception that _does_
+ * this FatalError class, which is a normal exception that _does_
* cause objects to be destructed.
*
* When it is caught, right before control is handed back to the Zend
diff --git a/include/namespace.h b/include/namespace.h
index bdfb8c6..d31731c 100644
--- a/include/namespace.h
+++ b/include/namespace.h
@@ -1,7 +1,7 @@
/**
* Namespace.h
*
- * Class that can be used to group various functions and classes into one
+ * Class that can be used to group various functions and classes into one
* namespace.
*
* @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
@@ -58,7 +58,7 @@ protected:
* Is the object locked?
*
* After the object is locked, no more elements can be added to it.
- * This happens after the call to get_module - it the no longer makes
+ * This happens after the call to get_module - it no longer makes
* sense to add more objects. When 'apache reload' is executed, the
* get_module() function is called for a second (or third, or fourth)
* time, but the classes, functions and namespaces will then not be
diff --git a/include/value.h b/include/value.h
index ca3fb9d..8b5c72b 100644
--- a/include/value.h
+++ b/include/value.h
@@ -241,7 +241,7 @@ public:
Value &operator%=(double value);
/**
- * Assignment operator
+ * Addition operator
* @param value
* @return Value
*/
diff --git a/include/valueiterator.h b/include/valueiterator.h
index 92c26aa..9e51f15 100644
--- a/include/valueiterator.h
+++ b/include/valueiterator.h
@@ -103,7 +103,7 @@ public:
bool operator!=(const ValueIterator &that) const;
/**
- * Derefecence, this returns a std::pair with the current key and value
+ * Dereference, this returns a std::pair with the current key and value
* @return std::pair
*/
const std::pair<Value,Value> &operator*() const;
diff --git a/tests/prepare.sh b/tests/prepare.sh
index 6c0e331..5339fff 100755
--- a/tests/prepare.sh
+++ b/tests/prepare.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# do not run this script manualy.
+# do not run this script manually.
# This script is intended to be run from a script test.sh
# Create a local copy of the directory with the extension for run tests without installation
#