Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 6 insertions, 1 deletions

diff --git a/doc/comanche.bb b/doc/comanche.bb
index 3afe14489..eb881fbdc 100644
--- a/doc/comanche.bb
+++ b/doc/comanche.bb
@@ -100,7 +100,7 @@ This places the menu called "mymenu" at this location on the page, whi
 [code]

 	[menu=horizontal]mymenu[/menu]

 [/code]

-This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" style to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. 

+This places the menu called "mymenu" at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. 

 

 

 [code]

@@ -109,6 +109,11 @@ This places the menu called "mymenu" at this location on the page, whi
 This places a block named "contributors" in this region.

 

 [code]

+	[block=someclass]contributors[/block]

+[/code]

+This places a block named "contributors" in this region. Additionally it applies the "someclass" class to the block. This replaces the default block classes "bblock widget".

+

+[code]

 	[block][var=wrap]none[/var]contributors[/block]

 [/code]

 The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block.