Merge branch '0.7.0' of https://github.com/phalcon/docs into 0.7.0

Conflicts:
	en/reference/install.rst

.gitignore

@@ -1,6 +1,7 @@
 build
 en/_build
+zh/_build
 _templates
 *.komodoproject
 *.sublime-*
-.idea/
+.idea/

en/_static/docs.css

@@ -26,6 +26,11 @@ h2 {
 	margin: 25px 0 0;
 }
 
+h3 {
+    font-weight: 600;
+    margin: 15px 0 10px;
+}
+
 /*p, li {
 	color: #434343;
 }*/
@@ -462,6 +467,15 @@ div.highlight {
     font-weight: bold;
 }
 
+.highlight .kn {
+    color: #000000;
+    font-weight: normal;
+}
+
+.highlight .sr {
+    color: #717171;
+}
+
 pre {
 	font-family: Monaco,Menlo,Consolas,"Courier New",monospace;
-}
+}

en/api/Phalcon_Acl_AdapterInterface.rst

@@ -19,7 +19,7 @@ Returns the default ACL access level
 
 
 
-abstract public *boolean*  **addRole** (:doc:`Phalcon\\Mvc\\RoleInterface <Phalcon_Mvc_RoleInterface>` $roleObject, *array* $accessInherits)
+abstract public *boolean*  **addRole** (:doc:`Phalcon\\Acl\\RoleInterface <Phalcon_Acl_RoleInterface>` $roleObject, *array* $accessInherits)
 
 Adds a role to the ACL list. Second parameter lets to inherit access data from other existing role
 

en/api/Phalcon_CLI_Dispatcher.rst

@@ -121,6 +121,18 @@ Sets the default action suffix
 
 
 
+public  **setNamespaceName** (*string* $namespaceName) inherited from Phalcon\\Dispatcher
+
+Sets a namespace to be prepended to the handler name
+
+
+
+public *string*  **getNamespaceName** () inherited from Phalcon\\Dispatcher
+
+Gets a namespace to be prepended to the current handler name
+
+
+
 public  **setDefaultNamespace** (*string* $namespace) inherited from Phalcon\\Dispatcher
 
 Sets the default namespace
@@ -169,7 +181,7 @@ Set a param by its name or numeric index
 
 
 
-public *mixed*  **getParam** (*mixed* $param, *string|array* $filters) inherited from Phalcon\\Dispatcher
+public *mixed*  **getParam** (*mixed* $param, *string|array* $filters, *mixed* $defaultValue) inherited from Phalcon\\Dispatcher
 
 Gets a param by its name or numeric index
 

en/api/Phalcon_Cache_Backend.rst

@@ -7,7 +7,7 @@ This class implements common functionality for backend adapters. All the backend
 Methods
 ---------
 
-public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontendObject, *array* $backendOptions)
+public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontend, *array* $options)
 
 Phalcon\\Cache\\Backend constructor
 
@@ -31,6 +31,12 @@ Returns front-end instance adapter related to the back-end
 
 
 
+public *array*  **getOptions** ()
+
+Returns the backend options
+
+
+
 public *boolean*  **isFresh** ()
 
 Checks whether the last cache is fresh or cached
@@ -43,14 +49,15 @@ Checks whether the cache has starting buffering or not
 
 
 
-public *string*  **getLastKey** ()
+public  **setLastKey** (*string* $lastKey)
+
+Sets the last key used in the cache
 
-Gets the last key stored by the cache
 
 
+public *string*  **getLastKey** ()
 
-abstract public  **get** ()
+Gets the last key stored by the cache
 
-...
 
 

en/api/Phalcon_Cache_BackendInterface.rst

@@ -7,7 +7,7 @@ Phalcon\\Cache\\BackendInterface initializer
 Methods
 ---------
 
-abstract public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontendObject, *array* $backendOptions)
+abstract public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontend, *array* $options)
 
 Phalcon\\Cache\\Backend constructor
 
@@ -31,6 +31,12 @@ Returns front-end instance adapter related to the back-end
 
 
 
+abstract public *array*  **getOptions** ()
+
+Returns the backend options
+
+
+
 abstract public *boolean*  **isFresh** ()
 
 Checks whether the last cache is fresh or cached
@@ -43,15 +49,45 @@ Checks whether the cache has starting buffering or not
 
 
 
+abstract public  **setLastKey** (*string* $lastKey)
+
+Sets the last key used in the cache
+
+
+
 abstract public *string*  **getLastKey** ()
 
 Gets the last key stored by the cache
 
 
 
-abstract public  **get** (*unknown* $key)
+abstract public *mixed*  **get** (*int|string* $keyName, *long* $lifetime)
+
+Returns a cached content
+
+
+
+abstract public  **save** (*int|string* $keyName, *string* $content, *long* $lifetime, *boolean* $stopBuffer)
+
+Stores cached content into the file backend and stops the frontend
+
+
+
+abstract public *boolean*  **delete** (*int|string* $keyName)
+
+Deletes a value from the cache by its key
+
+
+
+abstract public *array*  **queryKeys** (*string* $prefix)
+
+Query the existing cached keys
+
+
+
+abstract public *boolean*  **exists** (*string* $keyName, *long* $lifetime)
 
-Returns data from the backend
+Checks if cache exists and it hasn't expired
 
 
 

en/api/Phalcon_Cache_Backend_Apc.rst

@@ -58,13 +58,13 @@ Query the existing cached keys
 
 
 
-public *boolean*  **exists** (*string* $keyName)
+public *boolean*  **exists** (*string* $keyName, *long* $lifetime)
 
-Checks if cache exists.
+Checks if cache exists and it hasn't expired
 
 
 
-public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontendObject, *array* $backendOptions) inherited from Phalcon\\Cache\\Backend
+public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontend, *array* $options) inherited from Phalcon\\Cache\\Backend
 
 Phalcon\\Cache\\Backend constructor
 
@@ -88,6 +88,12 @@ Returns front-end instance adapter related to the back-end
 
 
 
+public *array*  **getOptions** () inherited from Phalcon\\Cache\\Backend
+
+Returns the backend options
+
+
+
 public *boolean*  **isFresh** () inherited from Phalcon\\Cache\\Backend
 
 Checks whether the last cache is fresh or cached
@@ -100,6 +106,12 @@ Checks whether the cache has starting buffering or not
 
 
 
+public  **setLastKey** (*string* $lastKey) inherited from Phalcon\\Cache\\Backend
+
+Sets the last key used in the cache
+
+
+
 public *string*  **getLastKey** () inherited from Phalcon\\Cache\\Backend
 
 Gets the last key stored by the cache

en/api/Phalcon_Cache_Backend_File.rst

@@ -36,9 +36,9 @@ Allows to cache output fragments using a file backend
 Methods
 ---------
 
-public  **__construct** (*mixed* $frontendObject, *array* $backendOptions)
+public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontend, *array* $options)
 
-Phalcon\\Backend\\Adapter\\File constructor
+Phalcon\\Cache\\Backend\\File constructor
 
 
 
@@ -66,9 +66,9 @@ Query the existing cached keys
 
 
 
-public *boolean*  **exists** (*string* $keyName)
+public *boolean*  **exists** (*string* $keyName, *long* $lifetime)
 
-Checks if cache exists.
+Checks if cache exists and it isn't expired
 
 
 
@@ -90,6 +90,12 @@ Returns front-end instance adapter related to the back-end
 
 
 
+public *array*  **getOptions** () inherited from Phalcon\\Cache\\Backend
+
+Returns the backend options
+
+
+
 public *boolean*  **isFresh** () inherited from Phalcon\\Cache\\Backend
 
 Checks whether the last cache is fresh or cached
@@ -102,6 +108,12 @@ Checks whether the cache has starting buffering or not
 
 
 
+public  **setLastKey** (*string* $lastKey) inherited from Phalcon\\Cache\\Backend
+
+Sets the last key used in the cache
+
+
+
 public *string*  **getLastKey** () inherited from Phalcon\\Cache\\Backend
 
 Gets the last key stored by the cache

en/api/Phalcon_Cache_Backend_Memcache.rst

@@ -34,9 +34,9 @@ Allows to cache output fragments, PHP data or raw data to a memcache backend  Th
 Methods
 ---------
 
-public  **__construct** (*mixed* $frontendObject, *array* $backendOptions)
+public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontend, *array* $options)
 
-Phalcon\\Backend\\Adapter\\Memcache constructor
+Phalcon\\Cache\\Backend\\Memcache constructor
 
 
 
@@ -70,9 +70,9 @@ Query the existing cached keys
 
 
 
-public *boolean*  **exists** (*string* $keyName)
+public *boolean*  **exists** (*string* $keyName, *long* $lifetime)
 
-Checks if cache exists.
+Checks if cache exists and it hasn't expired
 
 
 
@@ -100,6 +100,12 @@ Returns front-end instance adapter related to the back-end
 
 
 
+public *array*  **getOptions** () inherited from Phalcon\\Cache\\Backend
+
+Returns the backend options
+
+
+
 public *boolean*  **isFresh** () inherited from Phalcon\\Cache\\Backend
 
 Checks whether the last cache is fresh or cached
@@ -112,6 +118,12 @@ Checks whether the cache has starting buffering or not
 
 
 
+public  **setLastKey** (*string* $lastKey) inherited from Phalcon\\Cache\\Backend
+
+Sets the last key used in the cache
+
+
+
 public *string*  **getLastKey** () inherited from Phalcon\\Cache\\Backend
 
 Gets the last key stored by the cache

en/api/Phalcon_Cache_Backend_Mongo.rst

@@ -34,9 +34,9 @@ Allows to cache output fragments, PHP data or raw data to a MongoDb backend
 Methods
 ---------
 
-public  **__construct** (*mixed* $frontendObject, *array* $backendOptions)
+public  **__construct** (:doc:`Phalcon\\Cache\\FrontendInterface <Phalcon_Cache_FrontendInterface>` $frontend, *array* $options)
 
-Phalcon\\Backend\\Adapter\\Mongo constructor
+Phalcon\\Cache\\Backend\\Mongo constructor
 
 
 
@@ -70,9 +70,9 @@ Query the existing cached keys
 
 
 
-public *boolean*  **exists** (*string* $keyName)
+public *boolean*  **exists** (*string* $keyName, *long* $lifetime)
 
-Checks if cache exists.
+Checks if cache exists and it hasn't expired
 
 
 
@@ -94,6 +94,12 @@ Returns front-end instance adapter related to the back-end
 
 
 
+public *array*  **getOptions** () inherited from Phalcon\\Cache\\Backend
+
+Returns the backend options
+
+
+
 public *boolean*  **isFresh** () inherited from Phalcon\\Cache\\Backend
 
 Checks whether the last cache is fresh or cached
@@ -106,6 +112,12 @@ Checks whether the cache has starting buffering or not
 
 
 
+public  **setLastKey** (*string* $lastKey) inherited from Phalcon\\Cache\\Backend
+
+Sets the last key used in the cache
+
+
+
 public *string*  **getLastKey** () inherited from Phalcon\\Cache\\Backend
 
 Gets the last key stored by the cache