various doc fixes
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
<table class="slogEntry parity#parity#">
<tr>
<td class="age">#date|age#</td>
<td class="author">#author|obfuscate#</td>
<td class="node"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#desc|strip|firstline|escape#</a></td>
</tr>
</table>