diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:16:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:16:35 +0200 |
| commit | 87ac4260063e3a62805cc8f6f73cd2eb18da663a (patch) | |
| tree | 8a2463b964a5e7dd6aa606349a4251f70191fce1 /user_guide_src/source/general | |
| parent | a58c0b695a0590aff07a42ad2ad81b544e226af9 (diff) | |
| parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlsrv
Diffstat (limited to 'user_guide_src/source/general')
| -rw-r--r-- | user_guide_src/source/general/models.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/general/styleguide.rst | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/user_guide_src/source/general/models.rst b/user_guide_src/source/general/models.rst index b816f958a..0156b0460 100644 --- a/user_guide_src/source/general/models.rst +++ b/user_guide_src/source/general/models.rst @@ -55,7 +55,7 @@ model class might look like:: } .. note:: The functions in the above example use the :doc:`Active - Record <../database/active_record>` database functions. + Record <../database/query_builder>` database functions. .. note:: For the sake of simplicity in this example we're using $_POST directly. This is generally bad practice, and a more common approach diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst index 2b91d1cc0..925954c03 100644 --- a/user_guide_src/source/general/styleguide.rst +++ b/user_guide_src/source/general/styleguide.rst @@ -149,7 +149,7 @@ months down the line. There is not a required format for comments, but the following are recommended. `DocBlock <http://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.docblock>`_ -style comments preceding class and method declarations so they can be +style comments preceding class, method, and property declarations so they can be picked up by IDEs:: /** @@ -172,6 +172,17 @@ picked up by IDEs:: * @return string */ function xml_encode($str) + +:: + + /** + * Data for class manipulation + * + * @var array + */ + public $data + + Use single line comments within code, leaving a blank line between large comment blocks and code. |