diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-01-17 11:01:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 11:01:00 +0100 |
| commit | 9e17059bf8d277058d1de23390e388b5fa0cc26a (patch) | |
| tree | c759a1936f3c4efc9c5c0188915c6b78a544b0bd /user_guide_src/source/database | |
| parent | f41b4e33d1d5fe8d17b3d572b9676b0fdfedc8f7 (diff) | |
| parent | e75b6de1be5872ad11543bb2b3691a7d9fd624e4 (diff) | |
[ci skip] Merge pull request #4986 from ka7/feature/spelling
Spelling fixes in comment blocks and docs
Diffstat (limited to 'user_guide_src/source/database')
| -rw-r--r-- | user_guide_src/source/database/queries.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/database/transactions.rst | 2 |
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. |