Index: doc/info.n
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/info.n,v
retrieving revision 1.28
diff -b -u -r1.28 info.n
--- doc/info.n	23 Sep 2008 05:05:47 -0000	1.28
+++ doc/info.n	1 Oct 2008 20:10:16 -0000
@@ -458,7 +458,7 @@
 \fBinfo class variables\fI class\fR
 .VS 8.6
 This subcommand returns a list of all variables that have been declared for
-the class named \Iclass\fR (i.e. that are automatically present in the
+the class named \fIclass\fR (i.e. that are automatically present in the
 class's methods, constructor and destructor).
 .SS "OBJECT INTROSPECTION"
 .PP
Index: doc/tclvars.n
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/tclvars.n,v
retrieving revision 1.38
diff -b -u -r1.38 tclvars.n
--- doc/tclvars.n	25 Sep 2008 14:30:23 -0000	1.38
+++ doc/tclvars.n	1 Oct 2008 20:10:16 -0000
@@ -305,7 +305,7 @@
 Windows 95, the version will be 4.0; on Windows 98, the version will
 be 4.10.
 .TP
-\fBpathSeparator
+\fBpathSeparator\fR
 .VS 8.6
 '\" Defined by TIP #315
 The character that should be used to \fBsplit\fR PATH-like environment
Index: doc/variable.n
===================================================================
RCS file: /cvsroot/tcl/tcl/doc/variable.n,v
retrieving revision 1.9
diff -b -u -r1.9 variable.n
--- doc/variable.n	25 Sep 2008 19:51:28 -0000	1.9
+++ doc/variable.n	1 Oct 2008 20:10:16 -0000
@@ -14,7 +14,7 @@
 .SH NAME
 variable \- create and initialize a namespace variable
 .SH SYNOPSIS
-\fBvariable \fIname
+\fBvariable \fIname\fR
 .sp
 \fBvariable \fR?\fIname value...\fR?
 .BE
Index: tools/man2help2.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/tools/man2help2.tcl,v
retrieving revision 1.18
diff -b -u -r1.18 man2help2.tcl
--- tools/man2help2.tcl	13 Jun 2008 05:45:15 -0000	1.18
+++ tools/man2help2.tcl	1 Oct 2008 20:10:23 -0000
@@ -600,7 +600,7 @@
 	    set relativeTo [expr {$state(leftMargin) \
 		    + ($state(offset) * $state(nestingLevel))}]
 	}
-	if {[regexp {^\w'(.*)'u$} $arg -> submatch]} {
+	if {[regexp {^\\w'([^']*)'u$} $arg -> submatch]} {
 	    # Magic factor!
 	    set distance [expr {[string length $submatch] * 86.4}]
 	} else {
@@ -976,6 +976,10 @@
 	puts stderr "bad distance \"$arg\""
 	return 0
     }
+    if {[string length $units] > 1} {
+	puts stderr "additional characters after unit \"$arg\""
+	set units [string index $units 0]
+    }
     switch -- $units {
 	c	{
 	    set distance [expr {$distance * 567}]
Index: tools/man2tcl.c
===================================================================
RCS file: /cvsroot/tcl/tcl/tools/man2tcl.c,v
retrieving revision 1.14
diff -b -u -r1.14 man2tcl.c
--- tools/man2tcl.c	13 Jun 2008 05:45:15 -0000	1.14
+++ tools/man2tcl.c	1 Oct 2008 20:10:23 -0000
@@ -96,7 +96,7 @@
     char **argv)		/* Values of command-line arguments. */
 {
     FILE *f;
-#define MAX_LINE_SIZE 1000
+#define MAX_LINE_SIZE 4000
     char line[MAX_LINE_SIZE];
     char *p;
 
Index: win/buildall.vc.bat
===================================================================
RCS file: /cvsroot/tcl/tcl/win/buildall.vc.bat,v
retrieving revision 1.9
diff -b -u -r1.9 buildall.vc.bat
--- win/buildall.vc.bat	14 Oct 2005 12:31:39 -0000	1.9
+++ win/buildall.vc.bat	1 Oct 2008 20:10:23 -0000
@@ -54,7 +54,7 @@
 ::
 set OPTS=none
 if not %SYMBOLS%.==. set OPTS=symbols
-nmake -nologo -f makefile.vc release winhelp OPTS=%OPTS% %1
+nmake -nologo -f makefile.vc release htmlhelp OPTS=%OPTS% %1
 if errorlevel 1 goto error
 
 :: Build the static core, dlls and shell.
Index: win/makefile.vc
===================================================================
RCS file: /cvsroot/tcl/tcl/win/makefile.vc,v
retrieving revision 1.189
diff -b -u -r1.189 makefile.vc
--- win/makefile.vc	29 Aug 2008 12:37:18 -0000	1.189
+++ win/makefile.vc	1 Oct 2008 20:10:24 -0000
@@ -761,13 +761,12 @@
 !if exist($(CHMFILE))
 	@echo Installing compiled html help
 	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
-!else
+!endif
 !if exist($(HELPFILE))
 	@echo Installing Windows help
 	@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
 	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
 !endif
-!endif
 
 #"
 #---------------------------------------------------------------------
