aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/coding-guidelines.html
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-04-26 22:57:30 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-04-26 22:57:30 -0400
commit2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7 (patch)
tree1c3204b5d0b28102f53bf0e19c2e4c10ec55cbdf /phpBB/docs/coding-guidelines.html
parentcd6f6d2813c4436d9ca49b6a16b531def7218c9b (diff)
parent0858a8023be7b01e308959383bc1f955dbd4bf2d (diff)
downloadforums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar
forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar.gz
forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar.bz2
forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.tar.xz
forums-2a92fee06d22eb54ee9373adca1c3b50b1d3e3d7.zip
Merge PR #753 branch 'Senky/ticket/10161' into develop
* Senky/ticket/10161: [ticket/10161] added fullstop to the end of sentence [ticket/10161] coding-guidelines.html updated [ticket/10161] all "e-mail" strings in language files changed to "email"
Diffstat (limited to 'phpBB/docs/coding-guidelines.html')
-rw-r--r--phpBB/docs/coding-guidelines.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 6d428916c7..3f2c142ac6 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -356,7 +356,7 @@ phpbb_dir_subdir_class_name - includes/dir/subdir/class_name.php
<p>The basic philosophy here is to not hurt code clarity for the sake of laziness. This has to be balanced by a little bit of common sense, though; <code>print_login_status_for_a_given_user()</code> goes too far, for example -- that function would be better named <code>print_user_login_status()</code>, or just <code>print_login_status()</code>.</p>
<h4>Special Namings: </h4>
- <p>For all emoticons use the term <code>smiley</code> in singular and <code>smilies</code> in plural.</p>
+ <p>For all emoticons use the term <code>smiley</code> in singular and <code>smilies</code> in plural. For emails we use the term <code>email</code> (without dash between “e” and “m”).</p>
<a name="codelayout"></a><h3>2.ii. Code Layout</h3>