Updated Kohana to r4737

1 files changed, 19 insertions, 11 deletions

diff --git a/system/config/encryption.php b/system/config/encryption.php
index 589a9def..12ff7ae5 100644
--- a/system/config/encryption.php
+++ b/system/config/encryption.php
@@ -1,27 +1,35 @@
 <?php defined('SYSPATH') OR die('No direct access allowed.');
 /**
- * @package  Encrypt
- *
  * Encrypt configuration is defined in groups which allows you to easily switch
  * between different encryption settings for different uses.
- * Note: all groups inherit and overwrite the default group.
  *
+ * [!!] All groups inherit and overwrite the default group.
+ *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+/**
  * Group Options:
- *  key    - Encryption key used to do encryption and decryption. The default option
+ *
+ *  For best security, your encryption key should be at least 16 characters
+ *  long and contain letters, numbers, and symbols.
+ *
+ * - key    - Encryption key used to do encryption and decryption. The default option
  *           should never be used for a production website.
  *
- *           For best security, your encryption key should be at least 16 characters
- *           long and contain letters, numbers, and symbols.
- *           @note Do not use a hash as your key. This significantly lowers encryption entropy.
+ *  [!!] Do not use a hash as your key. This significantly lowers encryption entropy.
  *
- *  mode   - MCrypt encryption mode. By default, MCRYPT_MODE_NOFB is used. This mode
+ * - mode   - MCrypt encryption mode. By default, MCRYPT_MODE_NOFB is used. This mode
  *           offers initialization vector support, is suited to short strings, and
  *           produces the shortest encrypted output.
- *           @see http://php.net/mcrypt
  *
- *  cipher - MCrypt encryption cipher. By default, the MCRYPT_RIJNDAEL_128 cipher is used.
+ * - cipher - MCrypt encryption cipher. By default, the MCRYPT_RIJNDAEL_128 cipher is used.
  *           This is also known as 128-bit AES.
- *           @see http://php.net/mcrypt
+ *
+ * 	For more information about mcrypt modes and cipers see the [mcrypt php docs](http://php.net/mcrypt).
  */
 $config['default'] = array
 (