From ad5a090847ff957c87632749c368c2e272f18280 Mon Sep 17 00:00:00 2001 From: Stephen Shkardoon Date: Sat, 16 Mar 2013 17:15:50 +1300 Subject: [PATCH 1/7] Typo "nee" -> "need" Looks like Silverstripe needs the d. --- docs/en/reference/dataextension.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/reference/dataextension.md b/docs/en/reference/dataextension.md index 9750558c0..28b0a0629 100644 --- a/docs/en/reference/dataextension.md +++ b/docs/en/reference/dataextension.md @@ -9,7 +9,7 @@ implementation. Have a look at `[api:Object->useCustomClass()]`. ## Usage -Your extension will nee to be a subclass of `[api:DataExtension]` or the `[api:Extension]` class. +Your extension will need to be a subclass of `[api:DataExtension]` or the `[api:Extension]` class. :::php Date: Sat, 16 Mar 2013 23:17:02 +1300 Subject: [PATCH 2/7] Removed invalid characters No idea what those characters were meant to be, so I removed them. --- docs/en/topics/module-development.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/en/topics/module-development.md b/docs/en/topics/module-development.md index 6b9f095bf..251784fa8 100644 --- a/docs/en/topics/module-development.md +++ b/docs/en/topics/module-development.md @@ -54,5 +54,4 @@ adherence to conventions, writing documentation, and releasing updates. See [con * [Modules](modules) * [Module Release Process](module-release-process) * [Debugging methods](/topics/debugging) -* [URL Variable Tools](/reference/urlvariabletools) - Lists a number of ���page options��� , ���rendering tools��� or ���special -URL variables��� that you can use to debug your SilverStripe applications +* [URL Variable Tools](/reference/urlvariabletools) - Lists a number of page options, rendering tools or special URL variables that you can use to debug your SilverStripe applications From f4d16d01f87ef9764081a813f4b117efe38a3add Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sun, 17 Mar 2013 20:57:26 +0100 Subject: [PATCH 3/7] Adjusted docs to "simple" theme (thanks Nadeeth Lansakara) --- docs/en/tutorials/2-extending-a-basic-site.md | 16 ++++++++-------- .../5-dataobject-relationship-management.md | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/en/tutorials/2-extending-a-basic-site.md b/docs/en/tutorials/2-extending-a-basic-site.md index 90147ee33..0deaeee3d 100644 --- a/docs/en/tutorials/2-extending-a-basic-site.md +++ b/docs/en/tutorials/2-extending-a-basic-site.md @@ -245,7 +245,8 @@ First, the template for displaying a single article: :::ss -
+ <% include SideBar %> +

$Title

@@ -255,7 +256,6 @@ First, the template for displaying a single article:
$Form
- <% include SideBar %> Most of the code is just like the regular Page.ss, we include an informational div with the date and the author of the Article. @@ -278,7 +278,8 @@ We'll now create a template for the article holder. We want our news section to **themes/simple/templates/Layout/ArticleHolder.ss** :::ss -
+ <% include SideBar %> +

$Title

$Content @@ -293,7 +294,6 @@ We'll now create a template for the article holder. We want our news section to <% end_loop %> $Form
- <% include SideBar %> Here we use the page control *Children*. As the name suggests, this control allows you to iterate over the children of a page. In this case, the children are our news articles. The *$Link* variable will give the address of the article which we can use to create a link, and the *FirstParagraph* function of the `[api:HTMLText]` field gives us a nice summary of the article. The function strips all tags from the paragraph extracted. @@ -482,7 +482,8 @@ The staff section templates aren't too difficult to create, thanks to the utilit **themes/simple/templates/Layout/StaffHolder.ss** :::ss -
+ <% include SideBar %> +

$Title

$Content @@ -498,7 +499,6 @@ The staff section templates aren't too difficult to create, thanks to the utilit <% end_loop %> $Form
- <% include SideBar %> This template is very similar to the *ArticleHolder* template. The *SetWidth* method of the `[api:Image]` class @@ -512,7 +512,8 @@ The *StaffPage* template is also very straight forward. **themes/simple/templates/Layout/StaffPage.ss** :::ss -
+ <% include SideBar %> +

$Title

@@ -521,7 +522,6 @@ The *StaffPage* template is also very straight forward.
$Form
- <% include SideBar %> Here we use the *SetWidth* method to get a different sized image from the same source image. You should now have a complete staff section. diff --git a/docs/en/tutorials/5-dataobject-relationship-management.md b/docs/en/tutorials/5-dataobject-relationship-management.md index cbbf45746..d1e5e0ce3 100644 --- a/docs/en/tutorials/5-dataobject-relationship-management.md +++ b/docs/en/tutorials/5-dataobject-relationship-management.md @@ -278,7 +278,8 @@ a named list of object. **themes/simple/templates/Layout/ProjectsHolder.ss** :::ss -
+ <% include SideBar %> +

$Title

@@ -314,7 +315,6 @@ a named list of object.
- <% include SideBar %> Navigate to the holder page through your website navigation, or the "Preview" feature in the CMS. You should see a list of all projects now. @@ -336,7 +336,8 @@ we can access the "Students" and "Mentors" relationships directly in the templat **themes/simple/templates/Layout/Project.ss** :::ss -
+ <% include SideBar %> +

$Title

@@ -364,7 +365,6 @@ we can access the "Students" and "Mentors" relationships directly in the templat
- <% include SideBar %> Follow the link to a project detail from from your holder page, or navigate to it through the submenu provided by the theme. From 5f08ea3e6a09e49e54aea5b7e47751ee0c507061 Mon Sep 17 00:00:00 2001 From: Stephen Shkardoon Date: Mon, 18 Mar 2013 14:37:26 +1300 Subject: [PATCH 4/7] Fix minor formatting issues Extra spaces in front of Action. Removed the out of place text on GridField (is that meant to be a link or what?) Missing a period on the end of some entries. --- docs/en/reference/form-field-types.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en/reference/form-field-types.md b/docs/en/reference/form-field-types.md index e37d33e5b..3d45812fc 100644 --- a/docs/en/reference/form-field-types.md +++ b/docs/en/reference/form-field-types.md @@ -9,23 +9,23 @@ This is a highlevel overview of available `[api:FormField]` subclasses. An autom * `[api:ReadonlyField]`: Read-only field to display a non-editable value with a label. * `[api:TextareaField]`: Multi-line text field. * `[api:TextField]`: Single-line text field. - * `[api:PasswordField]`: Masked input field + * `[api:PasswordField]`: Masked input field. - ## Actions +## Actions * `[api:FormAction]`: Button element for forms, both for `` and `