Merge pull request cakephp#3369 from cakephp/2.x-rm-sphinx-build-warn…

…ings remove all sphinx build errors
denchev · Oct 7, 2015 · 9d45c9d · 9d45c9d
2 parents 0bfbf31 + 7ce1e8d
commit 9d45c9d
Show file tree

Hide file tree

Showing 19 changed files with 122 additions and 9 deletions.
diff --git a/en/controllers/request-response.rst b/en/controllers/request-response.rst
@@ -123,7 +123,7 @@ below for how you can access those request bodies.
 Accessing XML or JSON data
 ==========================
 
-Applications employing :doc:`/development/rest` often exchange data in non-URL-encoded 
+Applications employing :doc:`/development/rest` often exchange data in non-URL-encoded
 post bodies. You can read input data in any format using
 :php:meth:`CakeRequest::input()`. By providing a decoding function, you can
 receive the content in a deserialized format::
@@ -168,7 +168,7 @@ to create new kinds of detectors. There are four different types of detectors
 that you can create:
 
 * Environment value comparison - Compares a
-  value fetched from :php:func:`env()` for equality 
+  value fetched from :php:func:`env()` for equality
   with the provided value.
 * Pattern value comparison - Pattern value comparison allows you to compare a
   value fetched from :php:func:`env()` to a regular expression.
@@ -234,7 +234,7 @@ CakeRequest and RequestHandlerComponent
 Since many of the features :php:class:`CakeRequest` offers used to be the realm of
 :php:class:`RequestHandlerComponent`, some rethinking was required to figure out how it
 still fits into the picture. For 2.0, :php:class:`RequestHandlerComponent`
-provides a layer of sugar, such as switching layout 
+provides a layer of sugar, such as switching layout
 and views based on content, on top of the utility that
 :php:class:`CakeRequest` affords.
 This separation of utility and sugar between the two classes lets you
@@ -437,8 +437,8 @@ Changing the response class
 ===========================
 
 CakePHP uses :php:class:`CakeResponse` by default. :php:class:`CakeResponse` is a flexible and
-transparent class. If you need to override it with your own application-specific class, 
-you can replace :php:class:`CakeResponse` in ``app/webroot/index.php``. 
+transparent class. If you need to override it with your own application-specific class,
+you can replace :php:class:`CakeResponse` in ``app/webroot/index.php``.
 This will make all the controllers in your application use ``CustomResponse``
 instead of :php:class:`CakeResponse`. You can also replace the response
 instance by setting ``$this->response`` in your controllers. Overriding the

diff --git a/es/controllers.rst b/es/controllers.rst
@@ -10,6 +10,11 @@ Controllers
     Usted puede hacer referencia a la versión en Inglés en el menú de selección superior
     para obtener información sobre el tema de esta página.
 
+.. _controller-methods:
+
+Controller Methods
+==================
+
 .. toctree::
     :maxdepth: 1
 

diff --git a/es/controllers/request-response.rst b/es/controllers/request-response.rst
@@ -10,6 +10,11 @@ Request and Response objects
     Usted puede hacer referencia a la versión en Inglés en el menú de selección superior
     para obtener información sobre el tema de esta página.
 
+.. _cake-response-file:
+
+Sending files
+=============
+
 .. meta::
     :title lang=es: Request and Response objects
     :keywords lang=es: request controller,request parameters,array indexes,purpose index,response objects,domain information,request object,request data,interrogating,params,previous versions,introspection,dispatcher,rout,data structures,arrays,ip address,migration,indexes,cakephp
diff --git a/es/development/routing.rst b/es/development/routing.rst
@@ -10,6 +10,11 @@ Routing
     Usted puede hacer referencia a la versión en Inglés en el menú de selección superior
     para obtener información sobre el tema de esta página.
 
+.. _routes-configuration:
+
+Routes Configuration
+====================
+
 .. meta::
     :title lang=es: Routing
     :keywords lang=es: controller actions,default routes,mod rewrite,code index,string url,php class,incoming requests,dispatcher,url url,meth,maps,match,parameters,array,config,cakephp,apache,router
diff --git a/es/models/retrieving-your-data.rst b/es/models/retrieving-your-data.rst
@@ -10,6 +10,11 @@ Retrieving Your Data
     Usted puede hacer referencia a la versión en Inglés en el menú de selección superior
     para obtener información sobre el tema de esta página.
 
+.. _model-query:
+
+:php:meth:`Model::query()`
+==========================
+
 .. meta::
     :title lang=es: Retrieving Your Data
     :keywords lang=es: upper case character,array model,order array,controller code,retrieval functions,model layer,model methods,model class,model data,data retrieval,field names,workhorse,desc,neighbors,parameters,storage,models
diff --git a/ja/core-libraries/components/security-component.rst b/ja/core-libraries/components/security-component.rst
@@ -13,6 +13,11 @@ Security
     You can referer to the english version in the select top menu to have
     information about this page's topic.
 
+.. _security-csrf:
+
+CSRF protection
+===============
+
 .. meta::
     :title lang=ja: Security
     :keywords lang=ja: configurable parameters,security component,configuration parameters,invalid request,protection features,tighter security,holing,php class,meth,404 error,period of inactivity,csrf,array,submission,security class,disable security,unlockActions
diff --git a/ja/core-libraries/helpers/js.rst b/ja/core-libraries/helpers/js.rst
@@ -13,6 +13,11 @@ JsHelper
     You can referer to the english version in the select top menu to have
     information about this page's topic.
 
+.. _ajax-pagination:
+
+AJAX Pagination
+===============
+
 .. meta::
     :title lang=ja: JsHelper
     :description lang=ja: The Js Helper supports the JavaScript libraries Prototype, jQuery and Mootools and provides methods for manipulating javascript.

diff --git a/ja/core-libraries/logging.rst b/ja/core-libraries/logging.rst
@@ -11,6 +11,18 @@ Logging
     You can referer to the english version in the select top menu to have
     information about this page's topic.
 
+.. _logging-scopes:
+
+Logging Scopes
+==============
+
+.. _file-log:
+
+.. _syslog-log:
+
+Logging to Syslog
+=================
+
 .. meta::
     :title lang=ja: Logging
     :description lang=ja: Log CakePHP data to the disk to help debug your application over longer periods of time.

diff --git a/ja/core-utility-libraries/httpsocket.rst b/ja/core-utility-libraries/httpsocket.rst
@@ -13,6 +13,11 @@ HttpSocket
     You can referer to the english version in the select top menu to have
     information about this page's topic.
 
+.. _http-socket-ssl-options:
+
+Handling SSL certificates
+-------------------------
+
 .. meta::
     :title lang=ja: HttpSocket
     :keywords lang=ja: array name,array data,query parameter,query string,php class,string query,test type,string data,google,query results,webservices,apis,parameters,cakephp,meth,search results
diff --git a/pt/controllers/request-response.rst b/pt/controllers/request-response.rst
@@ -571,3 +571,6 @@ API do CakeResponse
     automaticamente no final de cada requisição pelo :php:class:`Dispatcher`.
 
 .. _cake-response-caching:
+
+Fine tuning HTTP cache
+======================
diff --git a/pt/core-utility-libraries/app.rst b/pt/core-utility-libraries/app.rst
@@ -12,6 +12,11 @@ App Class
     Você pode referenciar-se à versão inglesa no menu de seleção superior
     para obter informações sobre o tópico desta página.
 
+.. _app-build-register:
+
+Add new packages to an application
+----------------------------------
+
 .. meta::
     :title lang=pt: App Class
     :keywords lang=pt: compatible implementation,model behaviors,path management,loading files,php class,class loading,model behavior,class location,component model,management class,autoloader,classname,directory location,override,conventions,lib,textile,cakephp,php classes,loaded
diff --git a/pt/core-utility-libraries/file-folder.rst b/pt/core-utility-libraries/file-folder.rst
@@ -133,7 +133,7 @@ Folder API
     * ``Folder::MERGE`` mescla os diretórios destinatario/destino. Arquivos do
       diretório de origem irá substituir os arquivos no diretório de destino. Os
       conteudos serão mesclados.
-    * ``Folder::OVERWRITE``sobreescreve arquivos existentes e diretórios no
+    * ``Folder::OVERWRITE`` sobreescreve arquivos existentes e diretórios no
       diretório de destino com os arquivos de origem. Se ambos os diretórios
       possuem um mesmo sub-diretório o sub-diretório de origem sera removido
       e o de destino entrara no lugar dele.

diff --git a/pt/development/configuration.rst b/pt/development/configuration.rst
@@ -12,6 +12,12 @@ Configuration
     Você pode referenciar-se à versão inglesa no menu de seleção superior
     para obter informações sobre o tópico desta página.
 
+.. index:: database.php, database.php.default
+.. _database-configuration:
+
+Database Configuration
+======================
+
 .. meta::
     :title lang=pt: Configuration
     :keywords lang=pt: finished configuration,legacy database,database configuration,value pairs,default connection,optional configuration,example database,php class,configuration database,default database,configuration steps,index database,configuration details,class database,host localhost,inflections,key value,database connection,piece of cake,basic web
diff --git a/pt/development/routing.rst b/pt/development/routing.rst
@@ -12,6 +12,43 @@ Routing
     Você pode referenciar-se à versão inglesa no menu de seleção superior
     para obter informações sobre o tópico desta página.
 
+.. index:: :controller, :action, :plugin
+.. _connecting-routes:
+
+Connecting Routes
+=================
+
+.. index:: routes.php
+
+.. _routes-configuration:
+
+Routes Configuration
+====================
+
+.. _route-elements:
+
+Route Elements
+--------------
+
+.. index:: passed arguments
+.. _passed-arguments:
+
+Passed Arguments
+================
+
+.. index:: named parameters
+
+.. _named-parameters:
+
+Named Parameters
+================
+
+.. index:: admin routing, prefix routing
+.. _prefix-routing:
+
+Prefix Routing
+--------------
+
 .. meta::
     :title lang=pt: Routing
     :keywords lang=pt: controller actions,default routes,mod rewrite,code index,string url,php class,incoming requests,dispatcher,url url,meth,maps,match,parameters,array,config,cakephp,apache,router
diff --git a/pt/development/testing.rst b/pt/development/testing.rst
@@ -12,6 +12,11 @@ Testing
     Você pode referenciar-se à versão inglesa no menu de seleção superior
     para obter informações sobre o tópico desta página.
 
+.. _running-tests:
+
+Running Tests
+=============
+
 .. meta::
     :title lang=pt: Testing
     :keywords lang=pt: web runner,phpunit,test database,database configuration,database setup,database test,public test,test framework,running one,test setup,de facto standard,pear,runners,array,databases,cakephp,php,integration
diff --git a/pt/models/retrieving-your-data.rst b/pt/models/retrieving-your-data.rst
@@ -12,6 +12,11 @@ Retrieving Your Data
     Você pode referenciar-se à versão inglesa no menu de seleção superior
     para obter informações sobre o tópico desta página.
 
+.. _model-query:
+
+:php:meth:`Model::query()`
+==========================
+
 .. meta::
     :title lang=pt: Retrieving Your Data
     :keywords lang=pt: upper case character,array model,order array,controller code,retrieval functions,model layer,model methods,model class,model data,data retrieval,field names,workhorse,desc,neighbors,parameters,storage,models
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+sphinx==1.2.3
+sphinxcontrib-phpdomain
diff --git a/zh/models/callback-methods.rst b/zh/models/callback-methods.rst
@@ -16,7 +16,7 @@ beforeFind
 该回调函数在任何与 find 相关的操作前被调用。传入该回调的 ``$query`` 参数包含当前
 查询的信息，比如：conditions、fields，等。
 
-如果不希望开始该查询操作(可能基于相关的 ``$query`` 选项而做出的决定)，请返回 
+如果不希望开始该查询操作(可能基于相关的 ``$query`` 选项而做出的决定)，请返回
 *false*。否则，返回可能修改过的 ``$query`` ，或者任何你想传递给 find 及其它类似
 方法的信息。
 
@@ -98,7 +98,7 @@ beforeSave
 对于数据保存前需要进行的处理逻辑，该回调函数非常方便。如果存储引擎需要日期使用特
 定的格式，可以从 $this->data 访问并进行修改。
 
-下面是个用 beforeSave 回调进行日期转换的例子。例子中的代码用于一个应用程序，其 
+下面是个用 beforeSave 回调进行日期转换的例子。例子中的代码用于一个应用程序，其
 begindate 字段在数据库中的格式为 YYYY-MM-DD，而显示为格式 DD-MM-YYYY。当然这很容
 易改变。在适当的模型中使用下面的代码。
 
@@ -133,7 +133,7 @@ afterSave
 ``afterSave(boolean $created, array $options = array())``
 
 如果需要在每次保存操作后执行一些逻辑，可以将这些逻辑放在该回调方法中。保存的数据
-会在 ``$this->data``中。
+会在 ``$this->data`` 中。
 
 如果是插入新记录(而不是更新记录)，参数 ``$created`` 会为 true。
 

diff --git a/zh/plugins/how-to-create-plugins.rst b/zh/plugins/how-to-create-plugins.rst
@@ -3,6 +3,9 @@ How To Create Plugins
 
 .. _plugin-models:
 
+Plugin Models
+=============
+
 .. note::
     The documentation is not currently supported in zh language for this page.