Fix several brand names

We should respect the brand names of others, the same way we expect others to pronounce CakePHP correctly. PHP http://php.net/ PostgreSQL http://www.postgresql.org/ MySQL http://www.mysql.com/ SQLite https://sqlite.org/ lighttpd http://en.wikipedia.org/wiki/Lighttpd Xdebug http://xdebug.org/ PHPUnit https://phpunit.de/ Composer http://getcomposer.org Microsoft SQL Server http://en.wikipedia.org/wiki/Microsoft_SQL_Server Apache http://httpd.apache.org/ In some cases it was difficult to determine if the text was about the RDBMS or CakePHP's datasource. Accompanying the name of the datasource with "datasource" in the sentence would help in such cases. Alternatively we could use backticks
cameri · Mar 11, 2015 · 3471b2e · 3471b2e
1 parent 222b786
commit 3471b2e
Show file tree

Hide file tree

Showing 51 changed files with 114 additions and 114 deletions.
diff --git a/config/all.py b/config/all.py
@@ -296,7 +296,7 @@
 # The GitHub branch name for this version of the docs
 branch = 'master'
 
-# Hack to render the php source code without the <?php tag
+# Hack to render the PHP source code without the <?php tag
 from sphinx.highlighting import lexers
 from pygments.lexers.web import PhpLexer
 

diff --git a/en/appendices/2-0-migration-guide.rst b/en/appendices/2-0-migration-guide.rst
@@ -1120,24 +1120,24 @@ The PDO driver will automatically escape those values for you.
   need to talk to the driver directly.
 * Treatment of boolean values changed a bit to make it more cross-database
   friendly, you may need to change your test cases.
-* Postgresql support was immensely improved, it now correctly creates schemas,
+* PostgreSQL support was immensely improved, it now correctly creates schemas,
   truncate tables, and is easier to write tests using it.
 * DboSource::insertMulti() will no longer accept sql string, just pass an array
   of fields and a nested array of values to insert them all at once
 * TranslateBehavior was refactored to use model virtualFields, this makes the
   implementation more portable.
-* All tests cases with Mysql related stuff were moved to the corresponding
+* All tests cases with MySQL related stuff were moved to the corresponding
   driver test case. This left the DboSourceTest file a bit skinny.
 * Transaction nesting support. Now it is possible to start a transaction several
   times. It will only be committed if the commit method is called the same
   amount of times.
-* Sqlite support was greatly improved. The major difference with cake 1.3 is
-  that it will only support Sqlite 3.x . It is a great alternative for
+* SQLite support was greatly improved. The major difference with cake 1.3 is
+  that it will only support SQLite 3.x . It is a great alternative for
   development apps, and quick at running test cases.
-* Boolean column values will be casted to php native boolean type automatically,
+* Boolean column values will be casted to PHP native boolean type automatically,
   so make sure you update your test cases and code if you were expecting the
   returned value to be a string or an integer: If you had a "published" column in
-  the past using mysql all values returned from a find would be numeric in the
+  the past using MySQL all values returned from a find would be numeric in the
   past, now they are strict boolean values.
 
 Behaviors

diff --git a/en/appendices/2-4-migration-guide.rst b/en/appendices/2-4-migration-guide.rst
@@ -88,10 +88,10 @@ Models
 Datasource
 ----------
 
-- Mysql, Postgres, and SQLserver now support a 'settings' array in the
+- The Mysql, Postgres, and Sqlserver datasources now support a 'settings' array in the
   connection definition. This key => value pair will be issued as ``SET`` commands when the
   connection is created.
-- Mysql driver now supports SSL options.
+- The MySQL driver now supports SSL options.
 
 
 View

diff --git a/en/contributing/documentation.rst b/en/contributing/documentation.rst
@@ -275,7 +275,7 @@ Each directive populates the index, and or the namespace index.
 Cross Referencing
 ~~~~~~~~~~~~~~~~~
 
-The following roles refer to php objects and links are generated if a
+The following roles refer to PHP objects and links are generated if a
 matching directive is found:
 
 .. rst:role:: php:func

diff --git a/en/core-libraries/caching.rst b/en/core-libraries/caching.rst
@@ -25,7 +25,7 @@ to implement your own caching systems. The built-in caching engines are:
   By default CakePHP in 2.0-2.2 will use this cache engine if it's available.
 * ``Wincache`` Wincache uses the `Wincache <http://php.net/wincache>`_
   extension. Wincache is similar to APC in features and performance, but
-  optimized for Windows and IIS.
+  optimized for Windows and Microsoft IIS.
 * ``XcacheEngine`` `Xcache <http://xcache.lighttpd.net/>`_
   is a PHP extension that provides similar features to APC.
 * ``MemcacheEngine`` Uses the `Memcache <http://php.net/memcache>`_

diff --git a/en/core-libraries/components/cookie.rst b/en/core-libraries/components/cookie.rst
@@ -117,7 +117,7 @@ The CookieComponent offers a number of methods for working with Cookies.
 
     The last parameter to write is $expires – the number of seconds
     until your cookie will expire. For convenience, this parameter can
-    also be passed as a string that the php strtotime() function
+    also be passed as a string that the PHP strtotime() function
     understands::
 
         // Both cookies expire in one hour.

diff --git a/en/core-libraries/components/pagination.rst b/en/core-libraries/components/pagination.rst
@@ -186,7 +186,7 @@ from::
 
 You also need to override the core ``paginateCount()``, this method
 expects the same arguments as ``Model::find('count')``. The example
-below uses some Postgres-specifc features, so please adjust
+below uses some PostgresSQL-specifc features, so please adjust
 accordingly depending on what database you are using::
 
     /**

diff --git a/en/development/configuration.rst b/en/development/configuration.rst
@@ -73,7 +73,7 @@ schema
     Used in PostgreSQL database setups to specify which schema to use.
 unix_socket
     Used by drivers that support it to connect via unix socket files. If you are
-    using postgres and want to use unix sockets, leave the host key blank.
+    using PostgreSQL and want to use unix sockets, leave the host key blank.
 ssl_key
     The file path to the SSL key file. (Only supported by MySQL, requires PHP
     5.3.7+).
@@ -86,7 +86,7 @@ ssl_ca
 settings
     An array of key/value pairs that should be sent to the database server as
     ``SET`` commands when the connection is created. This option is only
-    supported by MySQL, Postgres, and SQLserver at this time.
+    supported by the Mysql, Postgres, and Sqlserver datasources at this time.
 
 .. versionchanged:: 2.4
     The ``settings``, ``ssl_key``, ``ssl_cert`` and ``ssl_ca`` keys
@@ -113,7 +113,7 @@ bakers, pastry\_stores, and savory\_cakes.
 .. todo::
 
     Add information about specific options for different database
-    vendors, such as SQLServer, Postgres and MySQL.
+    vendors, such as Microsoft SQL Server, PostgreSQL and MySQL.
 
 Additional Class Paths
 ======================

diff --git a/en/development/debugging.rst b/en/development/debugging.rst
@@ -205,12 +205,12 @@ primarily provides a toolbar in the rendered HTML, that provides a plethora of
 information about your application and the current request. You can download
 `DebugKit <https://github.com/cakephp/debug_kit>`_ from GitHub.
 
-xdebug
+Xdebug
 ======
 
-If your environment supplies the xdebug php extension, fatal errors will show
-additional xdebug stack trace details. Details about
-`xdebug <http://xdebug.org>`_ .
+If your environment supplies the Xdebug PHP extension, fatal errors will show
+additional Xdebug stack trace details. Details about
+`Xdebug <http://xdebug.org>`_ .
 
 
 .. meta::

diff --git a/en/development/errors.rst b/en/development/errors.rst
@@ -30,7 +30,7 @@ You have 5 built-in options when configuring error handlers:
 * ``handler`` - callback - The callback to handle errors. You can set this to any
   callable type, including anonymous functions.
 * ``level`` - int - The level of errors you are interested in capturing. Use the
-  built-in php error constants, and bitmasks to select the level of error you
+  built-in PHP error constants, and bitmasks to select the level of error you
   are interested in.
 * ``trace`` - boolean - Include stack traces for errors in log files. Stack traces
   will be included in the log after each error. This is helpful for finding

diff --git a/en/development/testing.rst b/en/development/testing.rst
@@ -16,7 +16,7 @@ for making sure your code does what you think it does.
 
 Install via Composer
 --------------------
-The newer versions of phpunit do not currently work with cake::
+The newer versions of PHPUnit do not currently work with cake::
 
     "phpunit/phpunit": "3.7.32"
     
@@ -210,7 +210,7 @@ results.
 Viewing code coverage
 ~~~~~~~~~~~~~~~~~~~~~
 
-If you have `XDebug <http://xdebug.org>`_ installed, you can view code coverage
+If you have `Xdebug <http://xdebug.org>`_ installed, you can view code coverage
 results. Code coverage is useful for telling you what parts of your code your
 tests do not reach. Coverage is useful for determining where you should add
 tests in the future, and gives you one measurement to track your testing
@@ -223,7 +223,7 @@ progress with.
 The inline code coverage uses green lines to indicate lines that have been run.
 If you hover over a green line a tooltip will indicate which tests covered the
 line. Lines in red did not run, and have not been exercised by your tests. Grey
-lines are considered unexecutable code by xdebug.
+lines are considered unexecutable code by Xdebug.
 
 .. _run-tests-from-command-line:
 

diff --git a/en/installation.rst b/en/installation.rst
@@ -5,7 +5,7 @@ CakePHP is fast and easy to install. The minimum requirements are a
 webserver and a copy of CakePHP, that's it! While this manual focuses
 primarily on setting up on Apache (because it's the most commonly used),
 you can configure CakePHP to run on a variety of web servers such as
-LightHTTPD or Microsoft IIS.
+lighttpd or Microsoft IIS.
 
 Requirements
 ============
@@ -223,4 +223,4 @@ uncomment one line in ``app/Config/core.php``::
 
 .. meta::
     :title lang=en: Installation
-    :keywords lang=en: apache mod rewrite,microsoft sql server,tar bz2,tmp directory,database storage,archive copy,tar gz,source application,current releases,web servers,microsoft iis,copyright notices,database engine,bug fixes,lighthttpd,repository,enhancements,source code,cakephp,incorporate
+    :keywords lang=en: apache mod rewrite,microsoft sql server,tar bz2,tmp directory,database storage,archive copy,tar gz,source application,current releases,web servers,microsoft iis,copyright notices,database engine,bug fixes,lighttpd,repository,enhancements,source code,cakephp,incorporate
diff --git a/en/installation/advanced-installation.rst b/en/installation/advanced-installation.rst
@@ -27,7 +27,7 @@ Installing CakePHP with Composer
 Composer is a dependency management tool for PHP 5.3+. It solves many of the
 problems the PEAR installer has, and simplifies managing multiple versions of
 libraries. Since CakePHP publishes a PEAR package you can install CakePHP using
-`composer <http://getcomposer.org>`_. Before installing CakePHP you'll need to
+`Composer <http://getcomposer.org>`_. Before installing CakePHP you'll need to
 setup a ``composer.json`` file. A composer.json file for a CakePHP application
 would look like the following::
 

diff --git a/en/models/datasources.rst b/en/models/datasources.rst
@@ -3,13 +3,13 @@ DataSources
 
 DataSources are the link between models and the source of data that
 models represent. In many cases, the data is retrieved from a
-relational database such as MySQL, PostgreSQL or MSSQL. CakePHP is
+relational database such as MySQL, PostgreSQL or Microsoft SQL Server. CakePHP is
 distributed with several database-specific datasources (see the
 class files in ``lib/Cake/Model/Datasource/Database``), a summary
 of which is listed here for your convenience:
 
 
-- MySql
+- Mysql
 - Postgres
 - Sqlite
 - Sqlserver
@@ -26,7 +26,7 @@ known about datasources, you've been using them all along.
 
 All of the above sources derive from a base ``DboSource`` class, which
 aggregates some logic that is common to most relational databases. If you decide
-to write a RDBMS datasource, working from one of these (e.g. Mysql, or Sqlite)
+to write a RDBMS datasource, working from one of these (e.g. MySQL, or SQLite)
 is your best bet.
 
 Most people, however, are interested in writing datasources for external sources
@@ -316,5 +316,5 @@ Client are installed properly.
 
 .. meta::
     :title lang=en: DataSources
-    :keywords lang=en: array values,model fields,connection configuration,implementation details,relational databases,best bet,mysql postgresql,sqlite,external sources,ldap server,database connection,rdbms,sqlserver,postgres,relational database,mssql,aggregates,apis,repository,signatures
+    :keywords lang=en: array values,model fields,connection configuration,implementation details,relational databases,best bet,mysql postgresql,sqlite,external sources,ldap server,database connection,rdbms,sqlserver,postgres,relational database,microsoft sql server,aggregates,apis,repository,signatures
 
diff --git a/en/models/saving-your-data.rst b/en/models/saving-your-data.rst
@@ -987,7 +987,7 @@ Datatables
 
 While CakePHP can have datasources that aren't database driven, most of the
 time, they are. CakePHP is designed to be agnostic and will work with MySQL,
-MSSQL, PostgreSQL and others. You can create your database tables as you
+Microsoft SQL Server, PostgreSQL and others. You can create your database tables as you
 normally would. When you create your Model classes, they'll automatically map to
 the tables that you've created. Table names are by convention lowercase and
 pluralized with multi-word table names separated by underscores. For example, a

diff --git a/en/plugins/how-to-create-plugins.rst b/en/plugins/how-to-create-plugins.rst
@@ -320,7 +320,7 @@ Publish Your Plugin
 You can add your plugin to `plugins.cakephp.org <http://plugins.cakephp.org>`_.
 
 Also, you might want to create a composer.json file and publish your plugin at `packagist.org <https://packagist.org/>`_.
-This way it can easily be used through composer.
+This way it can easily be used through Composer.
 
 Choose a semantically meaningful name for the package name. This should ideally be prefixed with the dependency, in this case "cakephp" as the framework.
 The vendor name will usually be your GitHub username.

diff --git a/...xamples/simple-acl-controlled-application/simple-acl-controlled-application.rst b/...xamples/simple-acl-controlled-application/simple-acl-controlled-application.rst
@@ -302,7 +302,7 @@ http://example.com/users/add. I made the following groups:
 I also created a user in each group so I had a user of each
 different access group to test with later. Write everything down or
 use easy passwords so you don't forget. If you do a
-``SELECT * FROM aros;`` from a mysql prompt you should get
+``SELECT * FROM aros;`` from a MySQL prompt you should get
 something like the following::
 
     +----+-----------+-------+-------------+-------+------+------+

diff --git a/es/installation.rst b/es/installation.rst
@@ -4,7 +4,7 @@ Instalación
 CakePHP se instala de forma fácil y rápidamente. Los requisitos mínimos son: un servidor
 web y una copia de los archivos de CakePHP ¡Eso es todo! Aunque este manual se centra en 
 la configuración de Apache, ya que es el servidor web más común, se puede configurar 
-CakePHP para que funcione en otros servidores como LightHTTPD o Microsoft IIS.
+CakePHP para que funcione en otros servidores como lighttpd o Microsoft IIS.
 
 Vamos a preparar el proceso de instalación, que consta de los siguientes pasos:
 

diff --git a/es/models/datasources.rst b/es/models/datasources.rst
@@ -12,4 +12,4 @@ DataSources
 
 .. meta::
     :title lang=es: DataSources
-    :keywords lang=es: array values,model fields,connection configuration,implementation details,relational databases,best bet,mysql postgresql,sqlite,external sources,ldap server,database connection,rdbms,sqlserver,postgres,relational database,mssql,aggregates,apis,repository,signatures
+    :keywords lang=es: array values,model fields,connection configuration,implementation details,relational databases,best bet,mysql postgresql,sqlite,external sources,ldap server,database connection,rdbms,sqlserver,postgres,relational database,microsoft sql server,aggregates,apis,repository,signatures
diff --git a/es/tutorials-and-examples/blog/blog.rst b/es/tutorials-and-examples/blog/blog.rst
@@ -205,17 +205,17 @@ defecto está activo.
 Sobre mod\_rewrite
 ==================
 
-Si eres nuevo usuario de apache, puedes encontrar alguna dificultad con
+Si eres nuevo usuario de Apache, puedes encontrar alguna dificultad con
 mod\_rewrite, así que lo trataremos aquí.
 
 Si al cargar la página de bienvenida de CakePHP ves cosas raras (no se cargan
 las imágenes ni los estilos y se ve todo en blanco y negro), esto significa que
-probablemente la configuración necesita ser revisada en el servidor apache.
+probablemente la configuración necesita ser revisada en el servidor Apache.
 Prueba lo siguiente:
 
 
 #. Asegúrate de que existe la configuración para procesar los ficheros
-   .htaccess. En el fichero de configuración de apache: 'httpd.conf' debería
+   .htaccess. En el fichero de configuración de Apache: 'httpd.conf' debería
    existir una sección para cada 'Directory' de tu servidor. Asegúrate de que
    ``AllowOverride`` está fijado a ``All`` para el directorio que contiene tu
    aplicación web. Para tu seguridad, es mejor que no asignes ``All`` a tu
@@ -224,18 +224,18 @@ Prueba lo siguiente:
 
 #. Asegúrate que estás editando el fichero httpd.conf correcto, ya que en
    algunos sistemas hay ficheros de este tipo por usuario o por aplicación web.
-   Consulta la documentación de apache para tu sistema.
+   Consulta la documentación de Apache para tu sistema.
 
 #. Comprueba que existen los ficheros .htaccess en el directorio en el que está
    instalada tu aplicación web. A veces al descomprimir el archivo o al copiarlo
    desde otra ubicación, estos ficheros no se copian correctamente. Si no están
    ahí, obtén otra copia de CakePHP desde el servidor oficial de descargas.
 
-#. Asegúrate de tener activado el módulo mod\_rewrite en la configuración de apache. Deberías tener algo así::
+#. Asegúrate de tener activado el módulo mod\_rewrite en la configuración de Apache. Deberías tener algo así::
 
         LoadModule rewrite_module       libexec/httpd/mod_rewrite.so
 
-    (para apache 1.3)::
+    (para Apache 1.3)::
 
         AddModule       mod_rewrite.c
 

diff --git a/fr/appendices/2-0-migration-guide.rst b/fr/appendices/2-0-migration-guide.rst
@@ -1203,28 +1203,28 @@ Le driver PDO va automatiquement echapper ces valeurs pour vous.
   cas où vous auriez besoin de parler directement au driver.
 * Le traitement des valeurs boléennes a changé un peu pour pouvoir faciliter le
   croisement de base de données, vous devrez peut-être changer vos cas de test.
-* Le support de Postgresql a été immensément amélioré, il crée maintenant
+* Le support de PostgreSQL a été immensément amélioré, il crée maintenant
   correctement les schémas, vide les tables, et il est plus facile d'écrire des
   tests en l'utilisant.
 * DboSource::insertMulti() n'acceptera plus les chaînes sql, passez juste un
   tableau de champs et un tableau imbriqué de valeurs pour les insérer tous en
   une fois.
 * TranslateBehavior a été reconstruit pour utiliser les vituaFields des
   models, cela rend l'implémentation plus portable.
-* Tous les cas de test avec les choses liées de Mysql ont été déplacés vers le
+* Tous les cas de test avec les choses liées de MySQL ont été déplacés vers le
   cas de test du driver correspondant. Cela a laissé le fichier DboSourceTest
   un peu maigre.
 * Support de l'imbrication des transactions. Maintenant il est possible de
   démarrer une transaction plusieurs fois. Il ne peut être engagé si la méthode
   de validation est appelé le même nombre de fois.
-* Le support Sqlite a été grandement amélioré. La différence majeure avec cake
-  1.3 est qu'il ne supportera que Sqlite 3.x. C'est une bonne alternative pour
+* Le support SQLite a été grandement amélioré. La différence majeure avec cake
+  1.3 est qu'il ne supportera que SQLite 3.x. C'est une bonne alternative pour
   le développement des apps, et rapidement en lançant les cas de test.
 * Les valeurs des colonnes boléennes vont être lancées automatiquement vers le
   type booléen natif de php, donc assurez vous de mettre à jour vos cas de test
   et code si vous attendiez une valeur retournée de type chaîne de caractère ou
   un entier: Si vous aviez une colonne "published" dans le passé en utilisant
-  mysql, toutes les valeurs retournées d'un find auraient été numériques dans
+  MySQL, toutes les valeurs retournées d'un find auraient été numériques dans
   le passé, maintenant elles sont strictement des valeurs boléennes.
 
 BehaviorCollection

diff --git a/fr/appendices/2-4-migration-guide.rst b/fr/appendices/2-4-migration-guide.rst
@@ -102,10 +102,10 @@ Models
 Datasource
 ----------
 
-- Mysql, Postgres, et SQLserver supportent maintenant un tableau 'settings'
+- Mysql, Postgres, et Sqlserver supportent maintenant un tableau 'settings'
   dans la définition de connexion. Cette paire de clé => valeur émettra des
   commandes ``SET`` lorque la connexion est créée.
-- Mysql driver supporte maintenant les options SSL.
+- MySQL driver supporte maintenant les options SSL.
 
 View
 ====

diff --git a/fr/console-and-shells.rst b/fr/console-and-shells.rst
@@ -108,7 +108,7 @@ Ajouter cake à votre système path
 Si vous êtes sur un système \*nix (linux, MacOSX), les étapes suivantes vous
 permettront de rendre cake executable dans votre système path.
 
-#. Localisez où se trouve votre installation de cakephp et le cake exécutable.
+#. Localisez où se trouve votre installation de CakePHP et le cake exécutable.
    Par exemple ``/Users/mark/cakephp/lib/Cake/Console/cake``
 #. Modifiez votre fichier ``.bashrc`` ou ``.bash_profile`` dans votre
    répertoire home, et ajoutez ce qui suit::

diff --git a/fr/contributing/documentation.rst b/fr/contributing/documentation.rst
@@ -292,7 +292,7 @@ Chaque directive remplit l'index, et l'index des espaces de nom.
 Référencement croisé
 ~~~~~~~~~~~~~~~~~~~~
 
-Les modèles suivants se réfèrent aux objets php et les liens sont générés
+Les modèles suivants se réfèrent aux objets PHP et les liens sont générés
 si une directive assortie est trouvée:
 
 .. rst:role:: php:func