diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
| commit | 042766bac61958a21ba5d6b3c53b0e4296fdcce7 (patch) | |
| tree | df9e26699ddb5d3841a0d1cc1795913c819bf611 /user_guide_src/source/general | |
| parent | 0688ac9ad88a03f1c56cfcd9e3c475b83301344d (diff) | |
| parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-cleanup
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. |