From a10431e64957df74fc51d967785764e6031c0760 Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Fri, 21 Sep 2012 09:41:44 +1000 Subject: [PATCH 1/2] removed extra "the" in text --- components/http_foundation/sessions.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst index 448f6c6a740..4d7ded9bbbb 100644 --- a/components/http_foundation/sessions.rst +++ b/components/http_foundation/sessions.rst @@ -200,7 +200,7 @@ the array:: $tokens['c'] = $value; $session->set('tokens', $tokens); -With structured namespacing, the the key can be translated to the array +With structured namespacing, the key can be translated to the array structure like this using a namespace character (defaults to `/`):: $session->set('tokens/c', $value); From 6bdb47a6793c5cc4fa748fd1c44a8d954d047051 Mon Sep 17 00:00:00 2001 From: Ulrich Date: Sun, 23 Sep 2012 16:17:04 +0300 Subject: [PATCH 2/2] Update book/forms.rst field_label, field_widget, field_errors and fields_row are deprecated in sf 2.1 --- book/forms.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/book/forms.rst b/book/forms.rst index e9da0f9ef12..2bbf2cb3bd4 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -1221,13 +1221,13 @@ rendered (e.g. ``label``, ``widget``, ``errors``, etc). By default, there are 4 possible *parts* of a form that can be rendered: +-------------+--------------------------+---------------------------------------------------------+ -| ``label`` | (e.g. ``field_label``) | renders the field's label | +| ``label`` | (e.g. ``form_label``) | renders the field's label | +-------------+--------------------------+---------------------------------------------------------+ -| ``widget`` | (e.g. ``field_widget``) | renders the field's HTML representation | +| ``widget`` | (e.g. ``form_widget``) | renders the field's HTML representation | +-------------+--------------------------+---------------------------------------------------------+ -| ``errors`` | (e.g. ``field_errors``) | renders the field's errors | +| ``errors`` | (e.g. ``form_errors``) | renders the field's errors | +-------------+--------------------------+---------------------------------------------------------+ -| ``row`` | (e.g. ``field_row``) | renders the field's entire row (label, widget & errors) | +| ``row`` | (e.g. ``form_row``) | renders the field's entire row (label, widget & errors) | +-------------+--------------------------+---------------------------------------------------------+ .. note::