Skip to content

Commit

Permalink
Kill more newlines.
Browse files Browse the repository at this point in the history
  • Loading branch information
markstory committed Nov 20, 2012
1 parent f75866c commit 6fe149d
Show file tree
Hide file tree
Showing 26 changed files with 13 additions and 300 deletions.
2 changes: 1 addition & 1 deletion en/cakephp-overview.rst
Expand Up @@ -21,4 +21,4 @@ used in context.

.. meta::
:title lang=en: CakePHP Overview
:keywords lang=en: web application framework,model view controller,object oriented programming,piece of cake,cookbook,functionality,xml,cakephp
:keywords lang=en: web application framework,model view controller,object oriented programming,piece of cake,cookbook,functionality,xml,cakephp
2 changes: 1 addition & 1 deletion en/contributing.rst
Expand Up @@ -16,4 +16,4 @@ cover the various ways you can contribute to CakePHP:

.. meta::
:title lang=en: Contributing
:keywords lang=en: coding conventions,documentation,maxdepth
:keywords lang=en: coding conventions,documentation,maxdepth
2 changes: 1 addition & 1 deletion en/core-libraries/components/email.rst
Expand Up @@ -49,4 +49,4 @@ documentation.

.. meta::
:title lang=en: EmailComponent
:keywords lang=en: component subject,component delivery,php class,template layout,custom headers,template method,filenames,alias,lib,array,email,migration,attachments,elements,sun
:keywords lang=en: component subject,component delivery,php class,template layout,custom headers,template method,filenames,alias,lib,array,email,migration,attachments,elements,sun
3 changes: 0 additions & 3 deletions en/core-libraries/components/sessions.rst
Expand Up @@ -98,7 +98,6 @@ Creating notification messages
This will create a one-time message that can be displayed to the user,
using the SessionHelper::

<?php
// In the view.
echo $this->Session->flash();

Expand Down Expand Up @@ -142,7 +141,6 @@ Creating notification messages
example adding "class" in the $params array will apply a class to the
``div`` output using ``$this->Session->flash()`` in your layout or view.::

<?php
$this->Session->setFlash('Example message text', 'default', array('class' => 'example_class'));

The output from using ``$this->Session->flash()`` with the above example
Expand All @@ -153,7 +151,6 @@ Creating notification messages
To use an element from a plugin just specify the plugin in the
``$params``::

<?php
// Will use /app/Plugin/Comment/View/Elements/flash_no_spam.ctp
$this->Session->setFlash('Message!', 'flash_no_spam', array('plugin' => 'Comment'));

Expand Down
6 changes: 1 addition & 5 deletions en/core-libraries/helpers/cache.rst
Expand Up @@ -29,7 +29,6 @@ files when handling requests.
Once you've uncommented the ``Cache.check`` line you will need to add the helper
to your controller's ``$helpers`` array::

<?php
class PostsController extends AppController {
public $helpers = array('Cache');
}
Expand All @@ -47,7 +46,6 @@ expressed in a ``strtotime()`` format. (ie. "1 hour", or "3 minutes").
Using the example of an ArticlesController, that receives a lot of
traffic that needs to be cached::

<?php
public $cacheAction = array(
'view' => 36000,
'index' => 48000
Expand All @@ -57,14 +55,12 @@ This will cache the view action 10 hours, and the index action 13 hours. By
making ``$cacheAction`` a ``strtotime()`` friendly value you can cache every action in the
controller::

<?php
public $cacheAction = "1 hour";

You can also enable controller/component callbacks for cached views
created with ``CacheHelper``. To do so you must use the array
format for ``$cacheAction`` and create an array like the following::

<?php
public $cacheAction = array(
'view' => array('callbacks' => true, 'duration' => 21600),
'add' => array('callbacks' => true, 'duration' => 36000),
Expand Down Expand Up @@ -139,4 +135,4 @@ cached view files. If you need to clear the cached view files, use
.. meta::
:title lang=en: CacheHelper
:description lang=en: The Cache helper assists in caching entire layouts and views, saving time repetitively retrieving data.
:keywords lang=en: cache helper,view caching,cache action,cakephp cache,nocache,clear cache
:keywords lang=en: cache helper,view caching,cache action,cakephp cache,nocache,clear cache

0 comments on commit 6fe149d

Please sign in to comment.