From 02cc32b901d29df4b67c0d09c02370cbaf61170d Mon Sep 17 00:00:00 2001
From: Senky <jakubsenko@gmail.com>
Date: Mon, 16 Apr 2012 15:19:10 +0200
Subject: [PATCH] [ticket/10161] coding-guidelines.html updated

PHPBB3-10161
---
 phpBB/docs/coding-guidelines.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 6d428916c7..e60d20cd43 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>