merge changes from branch 4.02 from branching (rev 14852) to 4.02.0+rc1 (rev 15121)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15125 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

2 files changed, 7 insertions, 11 deletions

diff --git a/man/ocamldoc.m b/man/ocamldoc.m
index b25833aec7..ca0a233480 100644
--- a/man/ocamldoc.m
+++ b/man/ocamldoc.m
@@ -181,7 +181,7 @@ Several
 .B -load
 options can be given.
 .TP
-.BI \-m flags
+.BI \-m \ flags
 Specify merge options between interfaces and implementations.
 .I flags
 can be one or several of the following characters:
@@ -442,11 +442,11 @@ option:
 Generate man pages only for modules, module types, classes and class types,
 instead of pages for all elements.
 .TP
-.BI \-man\-suffix suffix
+.BI \-man\-suffix \ suffix
 Set the suffix used for generated man filenames. Default is o, as in
 .IR List.o .
 .TP
-.BI \-man\-section section
+.BI \-man\-section \ section
 Set the section number used for generated man filenames. Default is 3.
 
 
diff --git a/man/ocamlopt.m b/man/ocamlopt.m
index 98ff86bf95..b1b173afa8 100644
--- a/man/ocamlopt.m
+++ b/man/ocamlopt.m
@@ -682,17 +682,13 @@ Disable Thumb/Thumb-2 code generation
 .P
 The default values for target architecture, floating-point hardware
 and thumb usage were selected at configure-time when building
-.BR ocamlopt 
-itself. This configuration can be inspected using 
-.BR ocamlopt
-.BR \-config .
+.B ocamlopt
+itself. This configuration can be inspected using
+.BR ocamlopt\ \-config .
 Target architecture depends on the "model" setting, while
 floating-point hardware and thumb support are determined from the ABI
 setting in "system" (
-.BR linux_eabi
-or
-.BR linux_eabihf
-).
+.BR linux_eabi or linux_eabihf ).
 
 .SH SEE ALSO
 .BR ocamlc (1).