diff --git a/ompi/mpi/man/man3/MPI_File_close.3in b/ompi/mpi/man/man3/MPI_File_close.3in
index 46e56a3833..b454b397de 100644
--- a/ompi/mpi/man/man3/MPI_File_close.3in
+++ b/ompi/mpi/man/man3/MPI_File_close.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_close 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_close(MPI_File \fI*fh\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_delete.3in b/ompi/mpi/man/man3/MPI_File_delete.3in
index 7dd43a1ab7..6b871fd739 100644
--- a/ompi/mpi/man/man3/MPI_File_delete.3in
+++ b/ompi/mpi/man/man3/MPI_File_delete.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_delete 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_delete(const char \fI*filename\fP, MPI_Info \fIinfo\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_amode.3in b/ompi/mpi/man/man3/MPI_File_get_amode.3in
index 701ab7159d..c41af6008e 100644
--- a/ompi/mpi/man/man3/MPI_File_get_amode.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_amode.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_amode 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_amode(MPI_File \fIfh\fP, int \fI*amode\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_atomicity.3in b/ompi/mpi/man/man3/MPI_File_get_atomicity.3in
index def57fc653..3147f4cb8e 100644
--- a/ompi/mpi/man/man3/MPI_File_get_atomicity.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_atomicity.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_atomicity 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_atomicity(MPI_File \fIfh\fP, int \fI*flag\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_byte_offset.3in b/ompi/mpi/man/man3/MPI_File_get_byte_offset.3in
index cd17a318ff..f2b2128aad 100644
--- a/ompi/mpi/man/man3/MPI_File_get_byte_offset.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_byte_offset.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_byte_offset 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_byte_offset(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	MPI_Offset \fI*disp\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_get_errhandler.3in b/ompi/mpi/man/man3/MPI_File_get_errhandler.3in
index 89ec740ade..c4ab3ef0d7 100644
--- a/ompi/mpi/man/man3/MPI_File_get_errhandler.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_errhandler.3in
@@ -2,6 +2,8 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
+.\" Copyright 2016      Research Organization for Information Science
+.\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
@@ -34,8 +36,8 @@ MPI_File_get_errhandler(\fIfile\fP, \fIerrhandler\fP, \fIierror\fP)
 
 .fi
 .SH C++ Syntax
-#include <mpi.h>
 .nf
+#include <mpi.h>
 MPI::Errhandler MPI::File::Get_errhandler() const
 
 .fi
diff --git a/ompi/mpi/man/man3/MPI_File_get_group.3in b/ompi/mpi/man/man3/MPI_File_get_group.3in
index 1ff7fa39bf..4dd92bc7f5 100644
--- a/ompi/mpi/man/man3/MPI_File_get_group.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_group.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_group 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_group(MPI_File \fIfh\fP, MPI_Group \fI*group\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_info.3in b/ompi/mpi/man/man3/MPI_File_get_info.3in
index fa4618144e..c0f52d2b73 100644
--- a/ompi/mpi/man/man3/MPI_File_get_info.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_info.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_info 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_info(MPI_File \fIfh\fP, MPI_Info \fI*info_used\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_position.3in b/ompi/mpi/man/man3/MPI_File_get_position.3in
index 23121976d3..8a7fe609ee 100644
--- a/ompi/mpi/man/man3/MPI_File_get_position.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_position.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_position 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_position(MPI_File \fIfh\fP, MPI_Offset \fI*offset\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_size.3in b/ompi/mpi/man/man3/MPI_File_get_size.3in
index 76f92ef442..e368c362b7 100644
--- a/ompi/mpi/man/man3/MPI_File_get_size.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_size.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_size(MPI_File \fIfh\fP, MPI_Offset \fI*size\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_type_extent.3in b/ompi/mpi/man/man3/MPI_File_get_type_extent.3in
index 2241ff12fd..c1ed7517e4 100644
--- a/ompi/mpi/man/man3/MPI_File_get_type_extent.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_type_extent.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_type_extent 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_type_extent(MPI_File \fIfh\fP, MPI_Datatype
 	\fIdatatype\fP, MPI_Aint \fI*extent\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_get_view.3in b/ompi/mpi/man/man3/MPI_File_get_view.3in
index b304486855..604f08a6e9 100644
--- a/ompi/mpi/man/man3/MPI_File_get_view.3in
+++ b/ompi/mpi/man/man3/MPI_File_get_view.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_get_view 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_get_view(MPI_File \fIfh\fP, MPI_Offset \fI*disp\fP,
 	MPI_Datatype \fI*etype\fP, MPI_Datatype \fI*filetype\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_iread.3in b/ompi/mpi/man/man3/MPI_File_iread.3in
index d9eb61d961..c59024efcf 100644
--- a/ompi/mpi/man/man3/MPI_File_iread.3in
+++ b/ompi/mpi/man/man3/MPI_File_iread.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iread 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iread(MPI_File \fIfh\fP, void  \fI*buf\fP, int  \fIcount\fP,
 	MPI_Datatype  \fIdatatype\fP, MPI_Request  \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_iread_all.3in b/ompi/mpi/man/man3/MPI_File_iread_all.3in
index 736a884e41..39f29cc07e 100644
--- a/ompi/mpi/man/man3/MPI_File_iread_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_iread_all.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iread_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iread_all(MPI_File \fIfh\fP, void  \fI*buf\fP, int  \fIcount\fP,
 	MPI_Datatype  \fIdatatype\fP, MPI_Request  \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_iread_at.3in b/ompi/mpi/man/man3/MPI_File_iread_at.3in
index d94a2c9b20..7b8144b673 100644
--- a/ompi/mpi/man/man3/MPI_File_iread_at.3in
+++ b/ompi/mpi/man/man3/MPI_File_iread_at.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iread_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iread_at(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	void \fI*buf\fP, int \fIcount\fP, MPI_Datatype \fIdatatype\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_iread_at_all.3in b/ompi/mpi/man/man3/MPI_File_iread_at_all.3in
index ce66563990..7efefa6d87 100644
--- a/ompi/mpi/man/man3/MPI_File_iread_at_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_iread_at_all.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iread_at_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iread_at_all(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	void \fI*buf\fP, int \fIcount\fP, MPI_Datatype \fIdatatype\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_iread_shared.3in b/ompi/mpi/man/man3/MPI_File_iread_shared.3in
index 5a1a67c0a5..74cc355dbd 100644
--- a/ompi/mpi/man/man3/MPI_File_iread_shared.3in
+++ b/ompi/mpi/man/man3/MPI_File_iread_shared.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iread_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iread_shared(MPI_File \fIfh\fP, void \fI*buf\fP, int \fIcount\fP,
 	MPI_Datatype \fIdatatype\fP, MPI_Request \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite.3in b/ompi/mpi/man/man3/MPI_File_iwrite.3in
index 385a759db9..6a31b6eaac 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite.3in
+++ b/ompi/mpi/man/man3/MPI_File_iwrite.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iwrite 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iwrite(MPI_File \fIfh\fP, const void \fI*buf\fP, int \fIcount\fP,
 	MPI_Datatype \fIdatatype\fP, MPI_Request \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite_all.3in b/ompi/mpi/man/man3/MPI_File_iwrite_all.3in
index 3f939eb260..c392792657 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_iwrite_all.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iwrite_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iwrite_all(MPI_File \fIfh\fP, const void \fI*buf\fP, int \fIcount\fP,
 	MPI_Datatype \fIdatatype\fP, MPI_Request \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite_at.3in b/ompi/mpi/man/man3/MPI_File_iwrite_at.3in
index 84306b83f7..1ef43b4a66 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite_at.3in
+++ b/ompi/mpi/man/man3/MPI_File_iwrite_at.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iwrite_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iwrite_at(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	const void \fI*buf\fP, int \fIcount\fP, MPI_Datatype \fIdatatype\fP, MPI_Request \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite_at_all.3in b/ompi/mpi/man/man3/MPI_File_iwrite_at_all.3in
index db3819e58e..afcd52d0af 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite_at_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_iwrite_at_all.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iwrite_at_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iwrite_at_all(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	const void \fI*buf\fP, int \fIcount\fP, MPI_Datatype \fIdatatype\fP, MPI_Request \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite_shared.3in b/ompi/mpi/man/man3/MPI_File_iwrite_shared.3in
index 60c865c74c..f2d098d5b8 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite_shared.3in
+++ b/ompi/mpi/man/man3/MPI_File_iwrite_shared.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_iwrite_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -16,6 +16,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_iwrite_shared(MPI_File \fIfh\fP, const void \fI*buf\fP, int \fIcount\fP, MPI_Datatype
 	\fIdatatype\fP, MPI_Request \fI*request\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_open.3in b/ompi/mpi/man/man3/MPI_File_open.3in
index 00e7e0e484..8fe252edba 100644
--- a/ompi/mpi/man/man3/MPI_File_open.3in
+++ b/ompi/mpi/man/man3/MPI_File_open.3in
@@ -3,7 +3,7 @@
 .\" Copyright (c) 2010-2015 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_open 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_open(MPI_Comm \fIcomm\fP, const char \fI*filename\fP,
 	int \fIamode\fP, MPI_Info \fIinfo\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_preallocate.3in b/ompi/mpi/man/man3/MPI_File_preallocate.3in
index 495220ccf9..1470348f09 100644
--- a/ompi/mpi/man/man3/MPI_File_preallocate.3in
+++ b/ompi/mpi/man/man3/MPI_File_preallocate.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_preallocate 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_preallocate(MPI_File \fIfh\fP, MPI_Offset \fIsize\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_read.3in b/ompi/mpi/man/man3/MPI_File_read.3in
index 7c8667534e..932fca999d 100644
--- a/ompi/mpi/man/man3/MPI_File_read.3in
+++ b/ompi/mpi/man/man3/MPI_File_read.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read(MPI_File \fIfh\fP, void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP, MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_read_all.3in b/ompi/mpi/man/man3/MPI_File_read_all.3in
index 3c56955adc..e236192f6d 100644
--- a/ompi/mpi/man/man3/MPI_File_read_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_all.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_all(MPI_File \fIfh\fP, void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP, MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_read_all_begin.3in b/ompi/mpi/man/man3/MPI_File_read_all_begin.3in
index bef6fddd63..0cf4717f31 100644
--- a/ompi/mpi/man/man3/MPI_File_read_all_begin.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_all_begin.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_all_begin(MPI_File \fIfh\fP, void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_read_all_end.3in b/ompi/mpi/man/man3/MPI_File_read_all_end.3in
index dc4727f9b2..ed639216a0 100644
--- a/ompi/mpi/man/man3/MPI_File_read_all_end.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_all_end.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_all_end(MPI_File \fIfh\fP, void \fI*buf\fP,
 	MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_read_at.3in b/ompi/mpi/man/man3/MPI_File_read_at.3in
index 513bd76a52..7781fa4dec 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_at.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_at(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	void \fI*buf\fP, int \fIcount\fP, MPI_Datatype \fIdatatype\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_read_at_all.3in b/ompi/mpi/man/man3/MPI_File_read_at_all.3in
index d96999b28b..48b26d9dee 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_at_all.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_at_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_at_all(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	void \fI*buf\fP, int \fIcount\fP, MPI_Datatype \fIdatatype\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3in b/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3in
index 9e112f4d68..18e316317d 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_at_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_at_all_begin(MPI_File \fIfh\fP, MPI_Offset
 	\fIoffset\fP, void \fI*buf\fP, int \fIcount\fP, MPI_Datatype
diff --git a/ompi/mpi/man/man3/MPI_File_read_at_all_end.3in b/ompi/mpi/man/man3/MPI_File_read_at_all_end.3in
index e7d2cba597..4964964947 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at_all_end.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_at_all_end.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_at_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_at_all_end(MPI_File \fIfh\fP, void \fI*buf\fP,
 	MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3in b/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3in
index 38177b4da7..f582501417 100644
--- a/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_ordered_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_ordered_begin(MPI_File \fIfh\fP, void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_read_ordered_end.3in b/ompi/mpi/man/man3/MPI_File_read_ordered_end.3in
index dfca393245..6020c9c8fd 100644
--- a/ompi/mpi/man/man3/MPI_File_read_ordered_end.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_ordered_end.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_ordered_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_ordered_end(MPI_File \fIfh\fP, void \fI*buf\fP,
 	MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_read_shared.3in b/ompi/mpi/man/man3/MPI_File_read_shared.3in
index 5953fa4e7c..9da3ba64ed 100644
--- a/ompi/mpi/man/man3/MPI_File_read_shared.3in
+++ b/ompi/mpi/man/man3/MPI_File_read_shared.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_read_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_read_shared(MPI_File \fIfh\fP, void \fI*buf\fP, int \fIcount\fP,
 	MPI_Datatype \fIdatatype\fP, MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_seek.3in b/ompi/mpi/man/man3/MPI_File_seek.3in
index bb7a4227ae..7c85c7c093 100644
--- a/ompi/mpi/man/man3/MPI_File_seek.3in
+++ b/ompi/mpi/man/man3/MPI_File_seek.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_seek 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_seek(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	int \fIwhence\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_seek_shared.3in b/ompi/mpi/man/man3/MPI_File_seek_shared.3in
index 6a0a7ba6c5..60ee345718 100644
--- a/ompi/mpi/man/man3/MPI_File_seek_shared.3in
+++ b/ompi/mpi/man/man3/MPI_File_seek_shared.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_seek_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_seek_shared(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	int \fIwhence\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_set_atomicity.3in b/ompi/mpi/man/man3/MPI_File_set_atomicity.3in
index d8a30e0b56..00fdcbc96d 100644
--- a/ompi/mpi/man/man3/MPI_File_set_atomicity.3in
+++ b/ompi/mpi/man/man3/MPI_File_set_atomicity.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_set_atomicity 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_set_atomicity(MPI_File \fIfh\fP, int \fIflag\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_info.3in b/ompi/mpi/man/man3/MPI_File_set_info.3in
index 6ed978b118..e597c40850 100644
--- a/ompi/mpi/man/man3/MPI_File_set_info.3in
+++ b/ompi/mpi/man/man3/MPI_File_set_info.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_set_info 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_set_info(MPI_File \fIfh\fP, MPI_Info \fIinfo\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_size.3in b/ompi/mpi/man/man3/MPI_File_set_size.3in
index f6ba1b08d4..b9017ae062 100644
--- a/ompi/mpi/man/man3/MPI_File_set_size.3in
+++ b/ompi/mpi/man/man3/MPI_File_set_size.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_set_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_set_size(MPI_File \fIfh\fP, MPI_Offset \fIsize\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_view.3in b/ompi/mpi/man/man3/MPI_File_set_view.3in
index 359914fade..328450015e 100644
--- a/ompi/mpi/man/man3/MPI_File_set_view.3in
+++ b/ompi/mpi/man/man3/MPI_File_set_view.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_set_view 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_set_view(MPI_File \fIfh\fP, MPI_Offset \fIdisp\fP,
 	MPI_Datatype \fIetype\fP, MPI_Datatype \fIfiletype\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_sync.3in b/ompi/mpi/man/man3/MPI_File_sync.3in
index 7fcbffa8ec..8686bdd8a8 100644
--- a/ompi/mpi/man/man3/MPI_File_sync.3in
+++ b/ompi/mpi/man/man3/MPI_File_sync.3in
@@ -2,7 +2,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_sync 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -13,6 +13,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_sync(MPI_File \fIfh\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_write.3in b/ompi/mpi/man/man3/MPI_File_write.3in
index 9b6f407ac9..5ec5706f24 100644
--- a/ompi/mpi/man/man3/MPI_File_write.3in
+++ b/ompi/mpi/man/man3/MPI_File_write.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write(MPI_File \fIfh\fP, const void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP,
diff --git a/ompi/mpi/man/man3/MPI_File_write_all.3in b/ompi/mpi/man/man3/MPI_File_write_all.3in
index 12280a01b9..c697af8158 100644
--- a/ompi/mpi/man/man3/MPI_File_write_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_all.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_all(MPI_File \fIfh\fP, const void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP, MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_all_begin.3in b/ompi/mpi/man/man3/MPI_File_write_all_begin.3in
index 54fc60331b..d1d13a83c7 100644
--- a/ompi/mpi/man/man3/MPI_File_write_all_begin.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_all_begin.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_all_begin(MPI_File \fIfh\fP, const void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_all_end.3in b/ompi/mpi/man/man3/MPI_File_write_all_end.3in
index f110876775..3a63c52ad8 100644
--- a/ompi/mpi/man/man3/MPI_File_write_all_end.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_all_end.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_all_end(MPI_File \fIfh\fP, const void \fI*buf\fP, MPI_Status \fI*status\fP)
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_at.3in b/ompi/mpi/man/man3/MPI_File_write_at.3in
index 23f3c47867..5348cf15b2 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_at.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_at(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP, const void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP, MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_at_all.3in b/ompi/mpi/man/man3/MPI_File_write_at_all.3in
index cc3b58b16e..ee0aaa8e10 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at_all.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_at_all.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_at_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_at_all(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP, const void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP, MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3in b/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3in
index 13c68803b2..78abd2b520 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_at_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_at_all_begin(MPI_File \fIfh\fP, MPI_Offset \fIoffset\fP,
 	const void \fI*buf\fP, int \fIcount\fP, MPI_Datatype \fIdatatype\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_at_all_end.3in b/ompi/mpi/man/man3/MPI_File_write_at_all_end.3in
index c3f8629374..c054b44194 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at_all_end.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_at_all_end.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_at_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_at_all_end(MPI_File \fIfh\fP, const void \fI*buf\fP,
 	MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3in b/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3in
index dbd2aac105..44a5049ac6 100644
--- a/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_ordered_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_ordered_begin(MPI_File \fIfh\fP, const void \fI*buf\fP,
 	int \fIcount\fP, MPI_Datatype \fIdatatype\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_ordered_end.3in b/ompi/mpi/man/man3/MPI_File_write_ordered_end.3in
index b762fd4d2d..ed7c23e9bd 100644
--- a/ompi/mpi/man/man3/MPI_File_write_ordered_end.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_ordered_end.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_ordered_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_ordered_end(MPI_File \fIfh\fP, const void \fI*buf\fP,
 	MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_File_write_shared.3in b/ompi/mpi/man/man3/MPI_File_write_shared.3in
index 8c4d7a2f1e..4325dd481a 100644
--- a/ompi/mpi/man/man3/MPI_File_write_shared.3in
+++ b/ompi/mpi/man/man3/MPI_File_write_shared.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_File_write_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_File_write_shared(MPI_File \fIfh\fP, const void \fI*buf\fP, int \fIcount\fP,
 	MPI_Datatype \fIdatatype\fP, MPI_Status \fI*status\fP)
diff --git a/ompi/mpi/man/man3/MPI_Register_datarep.3in b/ompi/mpi/man/man3/MPI_Register_datarep.3in
index d6113e42c3..541f8483b6 100644
--- a/ompi/mpi/man/man3/MPI_Register_datarep.3in
+++ b/ompi/mpi/man/man3/MPI_Register_datarep.3in
@@ -3,7 +3,7 @@
 .\" Copyright 2010 Cisco Systems, Inc.  All rights reserved.
 .\" Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\" Copyright 2015      Research Organization for Information Science
+.\" Copyright 2015-2016 Research Organization for Information Science
 .\"                     and Technology (RIST). All rights reserved.
 .\" $COPYRIGHT$
 .TH MPI_Register_datarep 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
@@ -14,6 +14,7 @@
 .ft R
 .nf
 .SH C Syntax
+.nf
 #include <mpi.h>
 int MPI_Register_datarep(const char \fI*datarep\fP,
 	MPI_Datarep_conversion_function \fI*read_conversion_fn\fP,