Merge branch 'master' of /var/www/trunk

diff --combined htaccess.sample
index f187395ec84e8e8cc3ec7666a57628df39c62830,b80dd88fe010417af705c2e2d6add1941a9b2e94..d94652bfd13187f719380c908e0754dedf934c2a
--- 1/htaccess.sample
--- 2/htaccess.sample
+++ b/htaccess.sample
@@@ -21,6 -21,9 +21,9 @@@ RewriteRule ^doc/openid$ index.php?acti
  RewriteRule ^doc/openmublog$ index.php?action=doc&title=openmublog [L,QSA]
  RewriteRule ^doc/privacy$ index.php?action=doc&title=privacy [L,QSA]
  RewriteRule ^doc/source$ index.php?action=doc&title=source [L,QSA]
+ RewriteRule ^doc/tags$ index.php?action=doc&title=tags [L,QSA]
+ RewriteRule ^doc/groups$ index.php?action=doc&title=groups [L,QSA]
+ RewriteRule ^doc/sms$ index.php?action=doc&title=sms [L,QSA]
  
  RewriteRule ^facebook/$ index.php?action=facebookhome [L,QSA]
  RewriteRule ^facebook/index.php$ index.php?action=facebookhome [L,QSA]
@@@ -62,7 -65,6 +65,7 @@@ RewriteRule ^settings/sms$ index.php?ac
  RewriteRule ^settings/twitter$ index.php?action=twittersettings [L,QSA]
  RewriteRule ^settings/other$ index.php?action=othersettings [L,QSA]
  
 +RewriteRule ^search/group$ index.php?action=groupsearch [L,QSA]
  RewriteRule ^search/people$ index.php?action=peoplesearch [L,QSA]
  RewriteRule ^search/notice$ index.php?action=noticesearch [L,QSA]
  RewriteRule ^search/notice/rss$ index.php?action=noticesearchrss [L,QSA]