diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
index 21c1540a941..e2cf36e9b2c 100644
--- a/lib/Cake/Network/Email/CakeEmail.php
+++ b/lib/Cake/Network/Email/CakeEmail.php
@@ -277,7 +277,7 @@ public function __construct() {
  * @param mixed $email
  * @param string $name
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function from($email = null, $name = null) {
 		if ($email === null) {
@@ -292,7 +292,7 @@ public function from($email = null, $name = null) {
  * @param mixed $email
  * @param string $name
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function sender($email = null, $name = null) {
 		if ($email === null) {
@@ -307,7 +307,7 @@ public function sender($email = null, $name = null) {
  * @param mixed $email
  * @param string $name
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function replyTo($email = null, $name = null) {
 		if ($email === null) {
@@ -322,7 +322,7 @@ public function replyTo($email = null, $name = null) {
  * @param mixed $email
  * @param string $name
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function readReceipt($email = null, $name = null) {
 		if ($email === null) {
@@ -337,7 +337,7 @@ public function readReceipt($email = null, $name = null) {
  * @param mixed $email
  * @param string $name
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function returnPath($email = null, $name = null) {
 		if ($email === null) {
@@ -428,7 +428,7 @@ public function addBcc($email, $name = null) {
  * @param mixed $email
  * @param mixed $name
  * @return object $this
- * @thrown SocketException
+ * @throws SocketException
  */
 	protected function _setEmail($varName, $email, $name) {
 		if (!is_array($email)) {
@@ -463,7 +463,7 @@ protected function _setEmail($varName, $email, $name) {
  * @param string $name
  * @param string $throwMessage
  * @return object $this
- * @thrown SocketExpceiton
+ * @throws SocketExpceiton
  */
 	protected function _setEmailSingle($varName, $email, $name, $throwMessage) {
 		$current = $this->{$varName};
@@ -527,7 +527,7 @@ public function subject($subject = null) {
  *
  * @param array Associative array containing headers to be set.
  * @return object $this
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function setHeaders($headers) {
 		if (!is_array($headers)) {
@@ -542,7 +542,7 @@ public function setHeaders($headers) {
  *
  * @param array $headers
  * @return mixed $this
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function addHeaders($headers) {
 		if (!is_array($headers)) {
@@ -720,7 +720,7 @@ public function viewVars($viewVars = null) {
  *
  * @param string $format
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function emailFormat($format = null) {
 		if ($format === null) {
@@ -752,7 +752,7 @@ public function transport($name = null) {
  * Return the transport class
  *
  * @return object
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function transportClass() {
 		if ($this->_transportClass) {
@@ -775,7 +775,7 @@ public function transportClass() {
  *
  * @param mixed $message True to generate a new Message-ID, False to ignore (not send in email), String to set as Message-ID
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function messageId($message = null) {
 		if ($message === null) {
@@ -797,7 +797,7 @@ public function messageId($message = null) {
  *
  * @param mixed $attachments String with the filename or array with filenames
  * @return mixed
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function attachments($attachments = null) {
 		if ($attachments === null) {
@@ -832,7 +832,7 @@ public function attachments($attachments = null) {
  *
  * @param mixed $attachments String with the filename or array with filenames
  * @return object $this
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function addAttachments($attachments) {
 		$current = $this->_attachments;
@@ -885,7 +885,7 @@ public function config($config = null) {
  * Send an email using the specified content, template and layout
  *
  * @return boolean Success
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function send($content = null) {
 		if (is_string($this->_config)) {
diff --git a/lib/Cake/Network/Email/SmtpTransport.php b/lib/Cake/Network/Email/SmtpTransport.php
index 5cf6674b9bd..4cd698e7332 100644
--- a/lib/Cake/Network/Email/SmtpTransport.php
+++ b/lib/Cake/Network/Email/SmtpTransport.php
@@ -44,7 +44,7 @@ class SmtpTransport extends AbstractTransport {
  *
  * @params object $email CakeEmail
  * @return boolean
- * @thrown SocketException
+ * @throws SocketException
  */
 	public function send(CakeEmail $email) {
 		$this->_cakeEmail = $email;
@@ -80,7 +80,7 @@ public function config($config = array()) {
  * Connect to SMTP Server
  *
  * @return void
- * @thrown SocketException
+ * @throws SocketException
  */
 	protected function _connect() {
 		$this->_generateSocket();
@@ -112,7 +112,7 @@ protected function _connect() {
  * Send authentication
  *
  * @return void
- * @thrown SocketException
+ * @throws SocketException
  */
 	protected function _auth() {
 		if (isset($this->_config['username']) && isset($this->_config['password'])) {
@@ -134,7 +134,7 @@ protected function _auth() {
  * Send emails
  *
  * @return void
- * @thrown SocketException
+ * @throws SocketException
  */
 	protected function _sendRcpt() {
 		$from = $this->_cakeEmail->from();
@@ -153,7 +153,7 @@ protected function _sendRcpt() {
  * Send Data
  *
  * @return void
- * @thrown SocketException
+ * @throws SocketException
  */
 	protected function _sendData() {
 		$this->_smtpSend('DATA', '354');
@@ -168,7 +168,7 @@ protected function _sendData() {
  * Disconnect
  *
  * @return void
- * @thrown SocketException
+ * @throws SocketException
  */
 	protected function _disconnect() {
 		$this->_smtpSend('QUIT', false);
@@ -179,7 +179,7 @@ protected function _disconnect() {
  * Helper method to generate socket
  *
  * @return void
- * @thrown SocketException
+ * @throws SocketException
  */
 	protected function _generateSocket() {
 		$this->_socket = new CakeSocket($this->_config);
@@ -191,7 +191,7 @@ protected function _generateSocket() {
  * @param string $data data to be sent to SMTP server
  * @param mixed $checkCode code to check for in server response, false to skip
  * @return void
- * @thrown SocketException
+ * @throws SocketException
  */
 	function _smtpSend($data, $checkCode = '250') {
 		if (!is_null($data)) {