diff options
| author | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 14:51:41 +0100 |
|---|---|---|
| committer | Jonathon Hill <jhill@brandmovers.com> | 2012-11-12 14:51:41 +0100 |
| commit | 3978fc33d82dd7f778d1adbf30744f4dfac41c25 (patch) | |
| tree | f32be1ae610f0cfeff65c35abecd14e8ea5cadc6 /user_guide_src/source/helpers/directory_helper.rst | |
| parent | 275cf274860c6ed181d50b398efd3a21d7ba9135 (diff) | |
| parent | a9ab46d7a031bda304eb9b6658ffaf693b8d9bcb (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
user_guide_src/source/changelog.rst
Signed-off-by: Jonathon Hill <jhill@brandmovers.com>
Diffstat (limited to 'user_guide_src/source/helpers/directory_helper.rst')
| -rw-r--r-- | user_guide_src/source/helpers/directory_helper.rst | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/user_guide_src/source/helpers/directory_helper.rst b/user_guide_src/source/helpers/directory_helper.rst index cf88732d3..a785ebc8c 100644 --- a/user_guide_src/source/helpers/directory_helper.rst +++ b/user_guide_src/source/helpers/directory_helper.rst @@ -57,7 +57,7 @@ be numerically indexed. Here is an example of a typical array:: ( [0] => benchmark.html [1] => config.html - [database] => Array + ["database/"] => Array ( [0] => query_builder.html [1] => binds.html @@ -76,5 +76,4 @@ be numerically indexed. Here is an example of a typical array:: [7] => loader.html [8] => pagination.html [9] => uri.html - ) - + )
\ No newline at end of file |