ref: fbb3031887c9a92a68ee02711e89811af638f6be
parent: 0418d6cb0bbc2b9cf72167eeb3211dc9fa6ad8c4
parent: 6bd49a24a91cc0408d34feca90652be88c92af22
author: uriel <[email protected]>
date: Wed Sep 23 08:28:20 EDT 2009
Merge.
--- a/.hgtags
+++ b/.hgtags
@@ -21,3 +21,9 @@
736f86ef82319a53532f09a823fc62e250985a4a LATEST-RELEASE
736f86ef82319a53532f09a823fc62e250985a4a LATEST-RELEASE
4e19df0f133d432fafa0b320da29cfe271bc9701 LATEST-RELEASE
+f3802fe8231b1fcce5feb954bc36327a6c5279ff 1.1.1
+4e19df0f133d432fafa0b320da29cfe271bc9701 LATEST-RELEASE
+20d3644520b26551ae13450c433bc915a8c6dfb3 LATEST-RELEASE
+ef459ebbec9a44657e86eebd764ca2e63f25bc32 1.2
+20d3644520b26551ae13450c433bc915a8c6dfb3 LATEST-RELEASE
+e9ce8c4b5391175207ad5ca48bad6d1f85f82027 LATEST-RELEASE
--- a/apps/wman/app.rc
+++ b/apps/wman/app.rc
@@ -68,7 +68,7 @@
fn wman_page_gen {#troff -manhtml $1| troff2html -t 'Plan 9 from User Space'
- nroff -man $1 \
+ troff -N -man $1 \
| escape_html \
| sed 's!([\.\-a-zA-Z0-9]+)\(('^`{echo $wman_cat_list|tr ' ' '|'}^')\)!<a href="../\2/\1">&</a>!g' \ | awk '/^$/ {if(n != 1) print; n=1; next} /./ {n=0; print}'