Skip to content

Commit

Permalink
Capitalize Windows, the OS
Browse files Browse the repository at this point in the history
  • Loading branch information
ravage84 committed Jul 9, 2015
1 parent 92b906b commit d1d29dd
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions en/console-and-shells.rst
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ no styling is done at all. There are three modes you can use.
* ``ConsoleOutput::COLOR`` - Output with color escape codes in place.

By default on \*nix systems ConsoleOutput objects default to colour output.
On windows systems, plain output is the default unless the ``ANSICON`` environment
On Windows systems, plain output is the default unless the ``ANSICON`` environment
variable is present.

Configuring options and generating help
Expand Down Expand Up @@ -948,7 +948,7 @@ Shell API
);

By default on \*nix systems ConsoleOutput objects default to colour output.
On windows systems, plain output is the default unless the ``ANSICON`` environment
On Windows systems, plain output is the default unless the ``ANSICON`` environment
variable is present.

.. php:method:: overwrite($message = null, $newlines = 1, $size = null)
Expand Down
2 changes: 1 addition & 1 deletion en/core-libraries/global-constants-and-functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Most of the following constants refer to paths in your application.

.. php:const:: DS
Short for PHP's DIRECTORY\_SEPARATOR, which is / on Linux and \\ on windows.
Short for PHP's DIRECTORY\_SEPARATOR, which is / on Linux and \\ on Windows.

.. php:const:: FULL_BASE_URL
Expand Down
2 changes: 1 addition & 1 deletion en/core-utility-libraries/file-folder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Folder API
.. php:attr:: mode
Mode to be used when creating folders. Defaults to ``0755``. Does nothing on
windows machines.
Windows machines.

.. php:staticmethod:: addPathElement(string $path, string $element)
Expand Down
2 changes: 1 addition & 1 deletion en/core-utility-libraries/time.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Formatting
:rtype: string

Converts a string representing the format for the function
strftime and returns a windows safe and i18n aware format.
strftime and returns a Windows safe and i18n aware format.

.. php:method:: dayAsSql($dateString, $field_name, $timezone = NULL)
Expand Down
2 changes: 1 addition & 1 deletion en/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ After restarting your webserver, you should see the changes reflected in

.. note::

If you are on windows, separate include paths with ; instead of :
If you are on Windows, separate include paths with ; instead of :

Having finished setting up your ``include_path`` your applications should be able to
find CakePHP automatically.
Expand Down
4 changes: 2 additions & 2 deletions fr/console-and-shells.rst
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ que vous pouvez utiliser:
* ``ConsoleOutput::COLOR`` - La sortie avec couleur enlève les codes en place.

Par défaut sur les systèmes \*nix, les objets ConsoleOutput ont par défaut
de la couleur. Sur les systèmes windows, la sortie simple est mise par défaut
de la couleur. Sur les systèmes Windows, la sortie simple est mise par défaut
sauf si la variable d'environnement ``ANSICON`` est présente.

Configurer les options et générer de l'aide
Expand Down Expand Up @@ -1021,7 +1021,7 @@ API de Shell

Par défaut sur les systèmes \*nix, les objets ConsoleOutput ont par défaut
une sortie colorée.
Sur les systèmes windows, la sortie brute est la sortie par défaut sauf si
Sur les systèmes Windows, la sortie brute est la sortie par défaut sauf si
la variable d'environnement ``ANSICON`` est présente.

.. php:method:: overwrite($message = null, $newlines = 1, $size = null)
Expand Down
4 changes: 2 additions & 2 deletions fr/core-utility-libraries/file-folder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ API de Folder
.. php:attr:: mode
Mode à utiliser pour la création de dossiers. par défaut à ``0755``. Ne
fait rien sur les machines windows.
fait rien sur les machines Windows.

.. php:staticmethod:: addPathElement(string $path, string $element)
Expand Down Expand Up @@ -543,7 +543,7 @@ L'API de File

Prépare une chaîne de caractères ascii pour l'écriture. Convertit les
lignes de fin en un terminator correct pour la plateforme courante. Si
c'est windows "\r\n" sera utilisé, toutes les autres plateformes
c'est Windows "\r\n" sera utilisé, toutes les autres plateformes
utiliseront "\n"

.. php:method:: pwd()
Expand Down
2 changes: 1 addition & 1 deletion fr/core-utility-libraries/time.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Formatage
:rtype: string

Convertit une chaîne de caractères représentant le format pour la fonction
strftime et retourne un format windows safe et i18n aware.
strftime et retourne un format Windows safe et i18n aware.

.. php:method:: dayAsSql($dateString, $field_name, $timezone = NULL)
Expand Down
2 changes: 1 addition & 1 deletion fr/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ dans ``phpinfo()``.

.. note::

Si vous êtes sur windows, les chemins d'inclusion sont séparés par des
Si vous êtes sur Windows, les chemins d'inclusion sont séparés par des
; au lieu de :

Une fois que vous avez configuré votre ``include_path``, vos applications
Expand Down
2 changes: 1 addition & 1 deletion fr/models/datasources.rst
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ pdo_sqlsrv. Cette extension PHP n'est pas inclue dans l'installation de base
de PHP et doit être installée séparément.

Le Client Native du Serveur SQL doit aussi être installé pour que l'extension
fonctionne. Puisque le Client Native est disponible seulement pour windows,
fonctionne. Puisque le Client Native est disponible seulement pour Windows,
vous ne serez pas capable de l'installer sur Linux, Mac OS X ou FreeBSD.

Donc si les erreurs de la source de données Sqlserver sortent::
Expand Down
4 changes: 2 additions & 2 deletions ja/core-libraries/global-constants-and-functions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ CakePHPを使った皆さんの日常のほとんどの業務ではコアクラ

.. php:const:: DS
.. Short for PHP's DIRECTORY\_SEPARATOR, which is / on Linux and \\ on windows.
.. Short for PHP's DIRECTORY\_SEPARATOR, which is / on Linux and \\ on Windows.
PHP の DIRECTORY\_SEPARATOR (Linux の場合は / windows の場合は \\) のショートカット。
PHP の DIRECTORY\_SEPARATOR (Linux の場合は / Windows の場合は \\) のショートカット。

.. php:const:: FULL_BASE_URL
Expand Down
2 changes: 1 addition & 1 deletion ja/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ini ファイルを見つけたら、 ``include_path`` の設定を変更して

.. note::

windowsでは、インクルードパスの区切りは : ではなく ; になります。
Windowsでは、インクルードパスの区切りは : ではなく ; になります。

``include_path`` の設定が完了したので、アプリケーションはCakePHPのファイルを見つけられるようになりました。

Expand Down
4 changes: 2 additions & 2 deletions pt/core-utility-libraries/file-folder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Folder API
.. php:attr:: mode
Mode para ser usado quando criar a pasta. Padrão ``0755``. Isto não vale
para ambientes windows.
para ambientes Windows.

.. php:staticmethod:: addPathElement(string $path, string $element)
Expand Down Expand Up @@ -148,7 +148,7 @@ Folder API
:rtype: string

Retorna o tipo de barras correto $path ('\\' para windows e
Retorna o tipo de barras correto $path ('\\' para Windows e
'/' para outros).

.. php:method:: create(string $pathname, integer $mode = false)
Expand Down
2 changes: 1 addition & 1 deletion pt/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Depois de reiniciar seu servidor web, você deve ver as mudanças refletidas em

.. note::

Se você estiver no windows, separe os caminhos de inclusão com ; ao invés de :
Se você estiver no Windows, separe os caminhos de inclusão com ; ao invés de :

Finalizando a definição do seu ``include_path`` suas aplicações devem estar prontas para
encontrar o CakePHP automaticamente.
Expand Down
2 changes: 1 addition & 1 deletion themes/cakephp/static/jquery.js
Original file line number Diff line number Diff line change
Expand Up @@ -3069,7 +3069,7 @@ jQuery.event = {

beforeunload: {
setup: function( data, namespaces, eventHandle ) {
// We only want to do this special case on windows
// We only want to do this special case on Windows
if ( jQuery.isWindow( this ) ) {
this.onbeforeunload = eventHandle;
}
Expand Down
2 changes: 1 addition & 1 deletion zh/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ CakePHP 应用程序。

.. note::

如果是在 windows 系统中,用 ; 代替 : 分隔多个包含路径。
如果是在 Windows 系统中,用 ; 代替 : 分隔多个包含路径。

一旦设置好 ``include_path`` ,应用程序应当能够自动找到 CakePHP。

Expand Down

0 comments on commit d1d29dd

Please sign in to comment.