[MERGE] new module: website_forum_doc + small fixes (close) in forum

bzr revid: fp@tinyerp.com-20140421205739-rki3bctinjy3amzy

diff --cc addons/website_forum/controllers/main.py
index 354aa52,a36733e..d6394b0
--- 1/addons/website_forum/controllers/main.py
--- 2/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@@ -177,8 -184,9 +179,9 @@@ class WebsiteForum(http.Controller)
          request.registry['forum.post'].set_viewed(cr, SUPERUSER_ID, [question.id], context=context)
  
          filters = 'question'
 -        values = self.prepare_question_values(forum=forum, kwargs=post)
 +        values = self._prepare_forum_values(forum=forum, searches=post)
          values.update({
+             'main_object': question,
              'question': question,
              'header': {'question_data': True},
              'filters': filters,

diff --cc addons/website_forum/views/website_forum.xml
Simple merge