merge madness

This commit is contained in:
friendica
2014-10-19 16:12:05 -07:00
parent 6d3619c8b1
commit bae3029c63
64 changed files with 1261 additions and 1337 deletions

View File

@@ -28,10 +28,10 @@ Currently there are three layout templates, unless your site provides additional
edgestwo - two column layout with fixed side margins
edgesthree - three column layout with fixed side margins
full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar
redable
A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column.
redable
A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column.
[/code]
@@ -45,11 +45,11 @@ To choose a layout template, use the 'template' tag.
To choose the "choklet" template with the "three" flavour:
[code]
[template=three]choklet[/template]
[/code]
Or the "redable" (sic) template:
[template=three]choklet[/template]
[/code]
Or the "redable" (sic) template:
[code]
[template]redable[/template]
[/code]
@@ -188,4 +188,4 @@ The 'comment' tag is used to delimit comments. These comments will not appear on
[/region]
[/code]
Return to the [url=[baseurl]/help/main]Main documentation page[/url]
#include doc/macros/main_footer.bb;