summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/database
diff options
context:
space:
mode:
authorklemens <ka7@github.com>2017-01-16 21:01:58 +0100
committerklemens <ka7@github.com>2017-01-16 21:01:58 +0100
commit24fedeb2075194f0da475f45f400a0866d9577f9 (patch)
tree8fd8dadad68bb36bb523bff05d1c578233912c2f /user_guide_src/source/database
parentf41b4e33d1d5fe8d17b3d572b9676b0fdfedc8f7 (diff)
spelling fixes
Diffstat (limited to 'user_guide_src/source/database')
-rw-r--r--user_guide_src/source/database/queries.rst2
-rw-r--r--user_guide_src/source/database/transactions.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index d4ffd16cf..f626f1e83 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -165,7 +165,7 @@ Handling Errors
**$this->db->error();**
-If you need to get the last error that has occured, the error() method
+If you need to get the last error that has occurred, the error() method
will return an array containing its code and message. Here's a quick
example::
diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index e25b8ed14..cfd6a566d 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -87,7 +87,7 @@ If you would like to disable transactions you can do so using
$this->db->query('AN SQL QUERY...');
$this->db->trans_complete();
-When transactions are disabled, your queries will be auto-commited, just as
+When transactions are disabled, your queries will be auto-committed, just as
they are when running queries without transactions, practically ignoring
any calls to ``trans_start()``, ``trans_complete()``, etc.