Skip to content

Commit c52493e

Browse files
committed
Fix formatting incosistencies in info blocks
1 parent 6857418 commit c52493e

File tree

149 files changed

+214
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+214
-214
lines changed

docs/2.x/console-and-shells/code-generation-with-bake.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ $ cake bake all
5858
```
5959

6060
::: info Changed in version 2.5
61-
Test files produced by `bake test` include calls to to draw attention to empty test methods. Before 2.5, empty tests pass silently.
61+
Test files produced by `bake test` include calls to [PHPunit's markTestIncomplete()](https://phpunit.de/manual/3.7/en/incomplete-and-skipped-tests.html) to draw attention to empty test methods. Before 2.5, empty tests pass silently.
6262
:::
6363

6464
## Modify default HTML produced by "baked" templates

docs/2.x/console-and-shells/testsuite-shell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ For more information on basic usage of the test shell see
77
[Run Tests From Command Line](../development/testing#run-tests-from-command-line).
88

99
::: info Changed in version 2.1
10-
The `test` shell was added in 2.1. The 2.0 `testsuite` shell is stillavailable but the new syntax is preferred.
10+
The `test` shell was added in 2.1. The 2.0 `testsuite` shell is still available but the new syntax is preferred.
1111
:::

docs/2.x/controllers/pages-controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ created in your `app/Controller/` folder. You can also copy the file from
1212
`lib/Cake/Console/Templates/skel/Controller/PagesController.php`.
1313

1414
::: info Changed in version 2.1
15-
With CakePHP 2.0 the Pages Controller was part of `lib/Cake`. Since 2.1the Pages Controller is no longer part of the core but ships in the appfolder.
15+
With CakePHP 2.0 the Pages Controller was part of `lib/Cake`. Since 2.1 the Pages Controller is no longer part of the core but ships in the app folder.
1616
:::
1717

1818
> [!WARNING]

docs/2.x/core-libraries/behaviors/acl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $this->Post->Behaviors->load('Acl', array('type' => 'controlled'));
4242
```
4343

4444
::: info Changed in version 2.1
45-
You can now safely attach AclBehavior to AppModel. Aco, Aro and AclNodenow extend Model instead of AppModel, which would cause an infinite loop.If your application depends on having those models to extend AppModel for some reason,then copy AclNode to your application and have it extend AppModel again.
45+
You can now safely attach AclBehavior to AppModel. Aco, Aro and AclNode now extend Model instead of AppModel, which would cause an infinite loop. If your application depends on having those models to extend AppModel for some reason, then copy AclNode to your application and have it extend AppModel again.
4646
:::
4747

4848
## Using the AclBehavior

docs/2.x/core-libraries/caching.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ to implement your own caching systems. The built-in caching engines are:
3737
similar to memcached, also provides atomic operations.
3838

3939
::: info Changed in version 2.3
40-
FileEngine is always the default cache engine. In the past a number of peoplehad difficulty setting up and deploying APC correctly both in CLI + web.Using files should make setting up CakePHP simpler for new developers.
40+
FileEngine is always the default cache engine. In the past a number of people had difficulty setting up and deploying APC correctly both in CLI + web. Using files should make setting up CakePHP simpler for new developers.
4141
:::
4242

4343
::: info Changed in version 2.5
@@ -99,7 +99,7 @@ parameter for `Cache::write()` and `Cache::read()`, e.g. `Cache::read('my_data',
9999
> ensure cache files are made with the correct permissions.
100100
101101
::: info Added in version 2.4
102-
In debug mode missing directories will now be automatically created to avoid unnecessaryerrors thrown when using the FileEngine.
102+
In debug mode missing directories will now be automatically created to avoid unnecessary errors thrown when using the FileEngine.
103103
:::
104104

105105
## Creating a storage engine for Cache

docs/2.x/core-libraries/components/authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ $this->Auth->authError = "This error shows up with the user tries to access" .
359359
```
360360

361361
::: info Changed in version 2.4
362-
Sometimes, you want to display the authorization error only after the userhas already logged-in. You can suppress this message by setting its value toboolean
362+
Sometimes, you want to display the authorization error only after the user has already logged-in. You can suppress this message by setting its value to boolean false
363363
:::
364364

365365
In your controller's beforeFilter(), or component settings:
@@ -837,7 +837,7 @@ and authentication mechanics in CakePHP.
837837
> they do not have access.
838838
>
839839
> ::: info Changed in version 2.4
840-
> You can suppress authError message from being displayed by setting thisvalue to boolean .
840+
> You can suppress authError message from being displayed by setting this value to boolean false.
841841
> :::
842842
>
843843
> Set to an array of Authorization objects you want to use when

docs/2.x/core-libraries/components/flash.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $this->Flash->set('This is a message');
2424
```
2525

2626
::: info Added in version 2.10.0
27-
Flash messages now stack. Successive calls to `set()` or `__call()` withthe same key will append the messages in the `$_SESSION`. If you want tokeep the old behavior (one message even after consecutive calls), set the`clear` option to true when setting messages.
27+
Flash messages now stack. Successive calls to `set()` or `__call()` with the same key will append the messages in the `$_SESSION`. If you want to keep the old behavior (one message even after consecutive calls), set the `clear` option to true when setting messages.
2828
:::
2929

3030
To create custom Flash elements, FlashComponent's `__call` magic

docs/2.x/core-libraries/events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ order to prevent some bugs. Remember that with the flexibility of using the
113113
global manager, some additional complexity is incurred.
114114

115115
::: info Changed in version 2.5
116-
Prior to 2.5, listeners on the global manager were kept in a separate listand fired instance listeners are. After 2.5, global and instancelisteners are fired in priority order.
116+
Prior to 2.5, listeners on the global manager were kept in a separate list and fired **before** instance listeners are. After 2.5, global and instance listeners are fired in priority order.
117117
:::
118118

119119
## Dispatching Events

docs/2.x/core-libraries/helpers/cache.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Configure::write('Dispatcher.filters', array(
4242
```
4343

4444
::: info Added in version 2.3
45-
If you have a setup with multiple domains or languages you can use to store the view cache files prefixed.
45+
If you have a setup with multiple domains or languages you can use Configure::write('Cache.viewPrefix', 'YOURPREFIX'); to store the view cache files prefixed.
4646
:::
4747

4848
### Additional configuration options

docs/2.x/core-libraries/helpers/flash.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ $this->Flash->set('The user has been saved.', array(
5454
> with `h` when formatting your messages.
5555
5656
::: info Added in version 2.10.0
57-
stacks messages as of 2.10.0. If you setmultiple flash messages, when you call `render()`, each message will berendered in its own element, in the order the messages were set.
57+
[Flash](../../core-libraries/components/flash) stacks messages as of 2.10.0. If you set multiple flash messages, when you call `render()`, each message will be rendered in its own element, in the order the messages were set.
5858
:::
5959

6060
For more information about the available array options, please refer to the

0 commit comments

Comments
 (0)