From 9175da1e02baf41e5ba70ca053c9845488fc9b5f Mon Sep 17 00:00:00 2001
From: Dan Lacher <dan.lacher@sun.com>
Date: Fri, 1 Aug 2008 21:14:37 +0000
Subject: [PATCH] Putback for all changes to automate man page updates to
 strings of versions, dates and build names.

Fixes trac:1387

Big thanks to Jeff and Brian for help and oversight.

This commit was SVN r19120.

The following Trac tickets were found above:
  Ticket 1387 --> https://svn.open-mpi.org/trac/ompi/ticket/1387
---
 Makefile.man-page-rules                       | 29 ++++++++
 VERSION                                       |  7 ++
 config/ompi_get_version.m4                    |  2 +
 config/ompi_get_version.m4sh                  | 23 +++---
 config/ompi_save_version.m4                   |  6 ++
 ompi/Makefile.am                              | 39 ++++++-----
 ompi/mca/crcp/Makefile.am                     |  8 ++-
 ompi/mca/crcp/{ompi_crcp.7 => ompi_crcp.7in}  |  4 +-
 ompi/mpi/man/man3/{MPI.3 => MPI.3in}          |  6 +-
 .../man/man3/{MPI_Abort.3 => MPI_Abort.3in}   |  4 +-
 .../{MPI_Accumulate.3 => MPI_Accumulate.3in}  |  4 +-
 ..._error_class.3 => MPI_Add_error_class.3in} |  4 +-
 ...dd_error_code.3 => MPI_Add_error_code.3in} |  4 +-
 ...rror_string.3 => MPI_Add_error_string.3in} |  4 +-
 .../man3/{MPI_Address.3 => MPI_Address.3in}   |  4 +-
 .../{MPI_Allgather.3 => MPI_Allgather.3in}    |  4 +-
 .../{MPI_Allgatherv.3 => MPI_Allgatherv.3in}  |  4 +-
 .../{MPI_Alloc_mem.3 => MPI_Alloc_mem.3in}    |  4 +-
 .../{MPI_Allreduce.3 => MPI_Allreduce.3in}    |  4 +-
 .../man3/{MPI_Alltoall.3 => MPI_Alltoall.3in} |  4 +-
 .../{MPI_Alltoallv.3 => MPI_Alltoallv.3in}    |  4 +-
 .../{MPI_Alltoallw.3 => MPI_Alltoallw.3in}    |  4 +-
 ...{MPI_Attr_delete.3 => MPI_Attr_delete.3in} |  4 +-
 .../man3/{MPI_Attr_get.3 => MPI_Attr_get.3in} |  4 +-
 .../man3/{MPI_Attr_put.3 => MPI_Attr_put.3in} |  4 +-
 .../man3/{MPI_Barrier.3 => MPI_Barrier.3in}   |  4 +-
 .../man/man3/{MPI_Bcast.3 => MPI_Bcast.3in}   |  4 +-
 .../man/man3/{MPI_Bsend.3 => MPI_Bsend.3in}   |  4 +-
 .../{MPI_Bsend_init.3 => MPI_Bsend_init.3in}  |  4 +-
 ..._Buffer_attach.3 => MPI_Buffer_attach.3in} |  4 +-
 ..._Buffer_detach.3 => MPI_Buffer_detach.3in} |  4 +-
 .../man/man3/{MPI_Cancel.3 => MPI_Cancel.3in} |  4 +-
 ...{MPI_Cart_coords.3 => MPI_Cart_coords.3in} |  4 +-
 ...{MPI_Cart_create.3 => MPI_Cart_create.3in} |  4 +-
 .../man3/{MPI_Cart_get.3 => MPI_Cart_get.3in} |  4 +-
 .../man3/{MPI_Cart_map.3 => MPI_Cart_map.3in} |  4 +-
 .../{MPI_Cart_rank.3 => MPI_Cart_rank.3in}    |  4 +-
 .../{MPI_Cart_shift.3 => MPI_Cart_shift.3in}  |  4 +-
 .../man3/{MPI_Cart_sub.3 => MPI_Cart_sub.3in} |  4 +-
 ...{MPI_Cartdim_get.3 => MPI_Cartdim_get.3in} |  4 +-
 .../{MPI_Close_port.3 => MPI_Close_port.3in}  |  4 +-
 ompi/mpi/man/man3/MPI_Comm_accept.3           | 70 -------------------
 ompi/mpi/man/man3/MPI_Comm_accept.3in         |  0
 .../man3/{MPI_Comm_c2f.3 => MPI_Comm_c2f.3in} |  0
 ...handler.3 => MPI_Comm_call_errhandler.3in} |  4 +-
 ...PI_Comm_compare.3 => MPI_Comm_compare.3in} |  4 +-
 ...PI_Comm_connect.3 => MPI_Comm_connect.3in} |  4 +-
 ...{MPI_Comm_create.3 => MPI_Comm_create.3in} |  4 +-
 ...ndler.3 => MPI_Comm_create_errhandler.3in} |  4 +-
 ...te_keyval.3 => MPI_Comm_create_keyval.3in} |  4 +-
 ...delete_attr.3 => MPI_Comm_delete_attr.3in} |  4 +-
 ...m_disconnect.3 => MPI_Comm_disconnect.3in} |  4 +-
 .../man3/{MPI_Comm_dup.3 => MPI_Comm_dup.3in} |  4 +-
 .../man3/{MPI_Comm_f2c.3 => MPI_Comm_f2c.3in} |  4 +-
 .../{MPI_Comm_free.3 => MPI_Comm_free.3in}    |  4 +-
 ...free_keyval.3 => MPI_Comm_free_keyval.3in} |  4 +-
 ..._Comm_get_attr.3 => MPI_Comm_get_attr.3in} |  4 +-
 ...rhandler.3 => MPI_Comm_get_errhandler.3in} |  4 +-
 ..._Comm_get_name.3 => MPI_Comm_get_name.3in} |  4 +-
 ...m_get_parent.3 => MPI_Comm_get_parent.3in} |  4 +-
 .../{MPI_Comm_group.3 => MPI_Comm_group.3in}  |  4 +-
 .../{MPI_Comm_join.3 => MPI_Comm_join.3in}    |  4 +-
 .../{MPI_Comm_rank.3 => MPI_Comm_rank.3in}    |  4 +-
 ...mote_group.3 => MPI_Comm_remote_group.3in} |  4 +-
 ...remote_size.3 => MPI_Comm_remote_size.3in} |  4 +-
 ..._Comm_set_attr.3 => MPI_Comm_set_attr.3in} |  4 +-
 ...rhandler.3 => MPI_Comm_set_errhandler.3in} |  4 +-
 ..._Comm_set_name.3 => MPI_Comm_set_name.3in} |  4 +-
 .../{MPI_Comm_size.3 => MPI_Comm_size.3in}    |  4 +-
 .../{MPI_Comm_spawn.3 => MPI_Comm_spawn.3in}  | 13 ++--
 ...multiple.3 => MPI_Comm_spawn_multiple.3in} | 22 ++----
 .../{MPI_Comm_split.3 => MPI_Comm_split.3in}  |  4 +-
 ...m_test_inter.3 => MPI_Comm_test_inter.3in} |  4 +-
 ...{MPI_Dims_create.3 => MPI_Dims_create.3in} |  4 +-
 ...ler_create.3 => MPI_Errhandler_create.3in} |  4 +-
 ...handler_free.3 => MPI_Errhandler_free.3in} |  4 +-
 ...rrhandler_get.3 => MPI_Errhandler_get.3in} |  4 +-
 ...rrhandler_set.3 => MPI_Errhandler_set.3in} |  4 +-
 ...{MPI_Error_class.3 => MPI_Error_class.3in} |  4 +-
 ...PI_Error_string.3 => MPI_Error_string.3in} |  4 +-
 .../man/man3/{MPI_Exscan.3 => MPI_Exscan.3in} |  4 +-
 .../man3/{MPI_File_c2f.3 => MPI_File_c2f.3in} |  0
 ...handler.3 => MPI_File_call_errhandler.3in} |  4 +-
 .../{MPI_File_close.3 => MPI_File_close.3in}  |  4 +-
 ...ndler.3 => MPI_File_create_errhandler.3in} |  4 +-
 ...{MPI_File_delete.3 => MPI_File_delete.3in} |  4 +-
 .../man3/{MPI_File_f2c.3 => MPI_File_f2c.3in} |  0
 ...ile_get_amode.3 => MPI_File_get_amode.3in} |  4 +-
 ...atomicity.3 => MPI_File_get_atomicity.3in} |  4 +-
 ..._offset.3 => MPI_File_get_byte_offset.3in} |  4 +-
 ...rhandler.3 => MPI_File_get_errhandler.3in} |  4 +-
 ...ile_get_group.3 => MPI_File_get_group.3in} |  4 +-
 ..._File_get_info.3 => MPI_File_get_info.3in} |  4 +-
 ...t_position.3 => MPI_File_get_position.3in} |  4 +-
 ...red.3 => MPI_File_get_position_shared.3in} |  4 +-
 ..._File_get_size.3 => MPI_File_get_size.3in} |  4 +-
 ..._extent.3 => MPI_File_get_type_extent.3in} |  4 +-
 ..._File_get_view.3 => MPI_File_get_view.3in} |  4 +-
 .../{MPI_File_iread.3 => MPI_File_iread.3in}  |  4 +-
 ..._File_iread_at.3 => MPI_File_iread_at.3in} |  4 +-
 ...ead_shared.3 => MPI_File_iread_shared.3in} |  4 +-
 ...{MPI_File_iwrite.3 => MPI_File_iwrite.3in} |  4 +-
 ...ile_iwrite_at.3 => MPI_File_iwrite_at.3in} |  4 +-
 ...te_shared.3 => MPI_File_iwrite_shared.3in} |  4 +-
 .../{MPI_File_open.3 => MPI_File_open.3in}    |  4 +-
 ...preallocate.3 => MPI_File_preallocate.3in} |  4 +-
 .../{MPI_File_read.3 => MPI_File_read.3in}    |  4 +-
 ..._File_read_all.3 => MPI_File_read_all.3in} |  4 +-
 ...ll_begin.3 => MPI_File_read_all_begin.3in} |  4 +-
 ...ad_all_end.3 => MPI_File_read_all_end.3in} |  4 +-
 ...PI_File_read_at.3 => MPI_File_read_at.3in} |  4 +-
 ...read_at_all.3 => MPI_File_read_at_all.3in} |  4 +-
 ...begin.3 => MPI_File_read_at_all_begin.3in} |  4 +-
 ...all_end.3 => MPI_File_read_at_all_end.3in} |  4 +-
 ...ad_ordered.3 => MPI_File_read_ordered.3in} |  4 +-
 ...egin.3 => MPI_File_read_ordered_begin.3in} |  4 +-
 ...ed_end.3 => MPI_File_read_ordered_end.3in} |  4 +-
 ...read_shared.3 => MPI_File_read_shared.3in} |  4 +-
 .../{MPI_File_seek.3 => MPI_File_seek.3in}    |  4 +-
 ...seek_shared.3 => MPI_File_seek_shared.3in} |  4 +-
 ...atomicity.3 => MPI_File_set_atomicity.3in} |  4 +-
 ...rhandler.3 => MPI_File_set_errhandler.3in} |  4 +-
 ..._File_set_info.3 => MPI_File_set_info.3in} |  4 +-
 ..._File_set_size.3 => MPI_File_set_size.3in} |  4 +-
 ..._File_set_view.3 => MPI_File_set_view.3in} |  4 +-
 .../{MPI_File_sync.3 => MPI_File_sync.3in}    |  4 +-
 .../{MPI_File_write.3 => MPI_File_write.3in}  |  4 +-
 ...ile_write_all.3 => MPI_File_write_all.3in} |  4 +-
 ...l_begin.3 => MPI_File_write_all_begin.3in} |  4 +-
 ...e_all_end.3 => MPI_File_write_all_end.3in} |  4 +-
 ..._File_write_at.3 => MPI_File_write_at.3in} |  4 +-
 ...ite_at_all.3 => MPI_File_write_at_all.3in} |  4 +-
 ...egin.3 => MPI_File_write_at_all_begin.3in} |  4 +-
 ...ll_end.3 => MPI_File_write_at_all_end.3in} |  4 +-
 ...e_ordered.3 => MPI_File_write_ordered.3in} |  4 +-
 ...gin.3 => MPI_File_write_ordered_begin.3in} |  4 +-
 ...d_end.3 => MPI_File_write_ordered_end.3in} |  4 +-
 ...ite_shared.3 => MPI_File_write_shared.3in} |  4 +-
 .../man3/{MPI_Finalize.3 => MPI_Finalize.3in} |  4 +-
 .../{MPI_Finalized.3 => MPI_Finalized.3in}    |  4 +-
 .../man3/{MPI_Free_mem.3 => MPI_Free_mem.3in} |  4 +-
 .../man/man3/{MPI_Gather.3 => MPI_Gather.3in} |  4 +-
 .../man3/{MPI_Gatherv.3 => MPI_Gatherv.3in}   |  4 +-
 ompi/mpi/man/man3/{MPI_Get.3 => MPI_Get.3in}  |  4 +-
 ...{MPI_Get_address.3 => MPI_Get_address.3in} |  4 +-
 .../{MPI_Get_count.3 => MPI_Get_count.3in}    |  4 +-
 ...PI_Get_elements.3 => MPI_Get_elements.3in} |  4 +-
 ...ssor_name.3 => MPI_Get_processor_name.3in} |  4 +-
 ...{MPI_Get_version.3 => MPI_Get_version.3in} |  4 +-
 ...PI_Graph_create.3 => MPI_Graph_create.3in} |  4 +-
 .../{MPI_Graph_get.3 => MPI_Graph_get.3in}    |  4 +-
 .../{MPI_Graph_map.3 => MPI_Graph_map.3in}    |  4 +-
 ...ph_neighbors.3 => MPI_Graph_neighbors.3in} |  4 +-
 ..._count.3 => MPI_Graph_neighbors_count.3in} |  4 +-
 ..._Graphdims_get.3 => MPI_Graphdims_get.3in} |  4 +-
 ...t_complete.3 => MPI_Grequest_complete.3in} |  4 +-
 ...request_start.3 => MPI_Grequest_start.3in} |  4 +-
 .../{MPI_Group_c2f.3 => MPI_Group_c2f.3in}    |  0
 ..._Group_compare.3 => MPI_Group_compare.3in} |  4 +-
 ..._difference.3 => MPI_Group_difference.3in} |  4 +-
 .../{MPI_Group_excl.3 => MPI_Group_excl.3in}  |  4 +-
 .../{MPI_Group_f2c.3 => MPI_Group_f2c.3in}    |  0
 .../{MPI_Group_free.3 => MPI_Group_free.3in}  |  4 +-
 .../{MPI_Group_incl.3 => MPI_Group_incl.3in}  |  4 +-
 ...ersection.3 => MPI_Group_intersection.3in} |  4 +-
 ..._range_excl.3 => MPI_Group_range_excl.3in} |  4 +-
 ..._range_incl.3 => MPI_Group_range_incl.3in} |  4 +-
 .../{MPI_Group_rank.3 => MPI_Group_rank.3in}  |  4 +-
 .../{MPI_Group_size.3 => MPI_Group_size.3in}  |  4 +-
 ..._ranks.3 => MPI_Group_translate_ranks.3in} |  4 +-
 ...{MPI_Group_union.3 => MPI_Group_union.3in} |  4 +-
 .../man/man3/{MPI_Ibsend.3 => MPI_Ibsend.3in} |  4 +-
 .../man3/{MPI_Info_c2f.3 => MPI_Info_c2f.3in} |  0
 ...{MPI_Info_create.3 => MPI_Info_create.3in} |  4 +-
 ...{MPI_Info_delete.3 => MPI_Info_delete.3in} |  4 +-
 .../man3/{MPI_Info_dup.3 => MPI_Info_dup.3in} |  4 +-
 .../man3/{MPI_Info_f2c.3 => MPI_Info_f2c.3in} |  0
 .../{MPI_Info_free.3 => MPI_Info_free.3in}    |  4 +-
 .../man3/{MPI_Info_get.3 => MPI_Info_get.3in} |  4 +-
 ...nfo_get_nkeys.3 => MPI_Info_get_nkeys.3in} |  4 +-
 ...o_get_nthkey.3 => MPI_Info_get_nthkey.3in} |  4 +-
 ...t_valuelen.3 => MPI_Info_get_valuelen.3in} |  4 +-
 .../man3/{MPI_Info_set.3 => MPI_Info_set.3in} |  4 +-
 .../mpi/man/man3/{MPI_Init.3 => MPI_Init.3in} |  4 +-
 ...{MPI_Init_thread.3 => MPI_Init_thread.3in} |  4 +-
 ...{MPI_Initialized.3 => MPI_Initialized.3in} |  4 +-
 ...comm_create.3 => MPI_Intercomm_create.3in} |  4 +-
 ...ercomm_merge.3 => MPI_Intercomm_merge.3in} |  4 +-
 .../man/man3/{MPI_Iprobe.3 => MPI_Iprobe.3in} |  4 +-
 .../man/man3/{MPI_Irecv.3 => MPI_Irecv.3in}   |  4 +-
 .../man/man3/{MPI_Irsend.3 => MPI_Irsend.3in} |  4 +-
 ...s_thread_main.3 => MPI_Is_thread_main.3in} |  4 +-
 .../man/man3/{MPI_Isend.3 => MPI_Isend.3in}   |  4 +-
 .../man/man3/{MPI_Issend.3 => MPI_Issend.3in} |  4 +-
 ..._Keyval_create.3 => MPI_Keyval_create.3in} |  4 +-
 ...{MPI_Keyval_free.3 => MPI_Keyval_free.3in} |  4 +-
 ...{MPI_Lookup_name.3 => MPI_Lookup_name.3in} |  4 +-
 .../man/man3/{MPI_Op_c2f.3 => MPI_Op_c2f.3in} |  0
 .../{MPI_Op_create.3 => MPI_Op_create.3in}    |  4 +-
 .../man/man3/{MPI_Op_f2c.3 => MPI_Op_f2c.3in} |  0
 .../man3/{MPI_Op_free.3 => MPI_Op_free.3in}   |  4 +-
 .../{MPI_Open_port.3 => MPI_Open_port.3in}    |  4 +-
 .../mpi/man/man3/{MPI_Pack.3 => MPI_Pack.3in} |  4 +-
 ..._Pack_external.3 => MPI_Pack_external.3in} |  4 +-
 ...rnal_size.3 => MPI_Pack_external_size.3in} |  4 +-
 .../{MPI_Pack_size.3 => MPI_Pack_size.3in}    |  4 +-
 .../man3/{MPI_Pcontrol.3 => MPI_Pcontrol.3in} |  4 +-
 .../man/man3/{MPI_Probe.3 => MPI_Probe.3in}   |  4 +-
 ...PI_Publish_name.3 => MPI_Publish_name.3in} |  4 +-
 ompi/mpi/man/man3/{MPI_Put.3 => MPI_Put.3in}  |  4 +-
 ...PI_Query_thread.3 => MPI_Query_thread.3in} |  4 +-
 .../mpi/man/man3/{MPI_Recv.3 => MPI_Recv.3in} |  4 +-
 .../{MPI_Recv_init.3 => MPI_Recv_init.3in}    |  4 +-
 .../man/man3/{MPI_Reduce.3 => MPI_Reduce.3in} |  4 +-
 ...educe_scatter.3 => MPI_Reduce_scatter.3in} |  4 +-
 ...ter_datarep.3 => MPI_Register_datarep.3in} |  4 +-
 ...{MPI_Request_c2f.3 => MPI_Request_c2f.3in} |  0
 ...{MPI_Request_f2c.3 => MPI_Request_f2c.3in} |  0
 ...PI_Request_free.3 => MPI_Request_free.3in} |  4 +-
 ...et_status.3 => MPI_Request_get_status.3in} |  4 +-
 .../man/man3/{MPI_Rsend.3 => MPI_Rsend.3in}   |  4 +-
 .../{MPI_Rsend_init.3 => MPI_Rsend_init.3in}  |  4 +-
 .../mpi/man/man3/{MPI_Scan.3 => MPI_Scan.3in} |  4 +-
 .../man3/{MPI_Scatter.3 => MPI_Scatter.3in}   |  4 +-
 .../man3/{MPI_Scatterv.3 => MPI_Scatterv.3in} |  4 +-
 .../mpi/man/man3/{MPI_Send.3 => MPI_Send.3in} |  4 +-
 .../{MPI_Send_init.3 => MPI_Send_init.3in}    |  4 +-
 .../man3/{MPI_Sendrecv.3 => MPI_Sendrecv.3in} |  4 +-
 ...ecv_replace.3 => MPI_Sendrecv_replace.3in} |  4 +-
 .../man/man3/{MPI_Sizeof.3 => MPI_Sizeof.3in} |  4 +-
 .../man/man3/{MPI_Ssend.3 => MPI_Ssend.3in}   |  4 +-
 .../{MPI_Ssend_init.3 => MPI_Ssend_init.3in}  |  4 +-
 .../man/man3/{MPI_Start.3 => MPI_Start.3in}   |  4 +-
 .../man3/{MPI_Startall.3 => MPI_Startall.3in} |  4 +-
 .../{MPI_Status_c2f.3 => MPI_Status_c2f.3in}  |  0
 .../{MPI_Status_f2c.3 => MPI_Status_f2c.3in}  |  4 +-
 ...ncelled.3 => MPI_Status_set_cancelled.3in} |  4 +-
 ...elements.3 => MPI_Status_set_elements.3in} |  4 +-
 .../mpi/man/man3/{MPI_Test.3 => MPI_Test.3in} |  6 +-
 ...est_cancelled.3 => MPI_Test_cancelled.3in} |  4 +-
 .../man3/{MPI_Testall.3 => MPI_Testall.3in}   |  4 +-
 .../man3/{MPI_Testany.3 => MPI_Testany.3in}   |  4 +-
 .../man3/{MPI_Testsome.3 => MPI_Testsome.3in} |  4 +-
 .../{MPI_Topo_test.3 => MPI_Topo_test.3in}    |  4 +-
 .../man3/{MPI_Type_c2f.3 => MPI_Type_c2f.3in} |  0
 ...{MPI_Type_commit.3 => MPI_Type_commit.3in} |  4 +-
 ...e_contiguous.3 => MPI_Type_contiguous.3in} |  4 +-
 ...te_darray.3 => MPI_Type_create_darray.3in} |  4 +-
 ...plex.3 => MPI_Type_create_f90_complex.3in} |  4 +-
 ...eger.3 => MPI_Type_create_f90_integer.3in} |  4 +-
 ...90_real.3 => MPI_Type_create_f90_real.3in} |  4 +-
 ...indexed.3 => MPI_Type_create_hindexed.3in} |  4 +-
 ..._hvector.3 => MPI_Type_create_hvector.3in} |  4 +-
 ...ck.3 => MPI_Type_create_indexed_block.3in} |  4 +-
 ...te_keyval.3 => MPI_Type_create_keyval.3in} |  4 +-
 ..._resized.3 => MPI_Type_create_resized.3in} |  4 +-
 ...te_struct.3 => MPI_Type_create_struct.3in} |  4 +-
 ...ubarray.3 => MPI_Type_create_subarray.3in} |  4 +-
 ...delete_attr.3 => MPI_Type_delete_attr.3in} |  4 +-
 .../man3/{MPI_Type_dup.3 => MPI_Type_dup.3in} |  4 +-
 ...{MPI_Type_extent.3 => MPI_Type_extent.3in} |  4 +-
 .../man3/{MPI_Type_f2c.3 => MPI_Type_f2c.3in} |  0
 .../{MPI_Type_free.3 => MPI_Type_free.3in}    |  4 +-
 ...free_keyval.3 => MPI_Type_free_keyval.3in} |  4 +-
 ..._Type_get_attr.3 => MPI_Type_get_attr.3in} |  4 +-
 ...t_contents.3 => MPI_Type_get_contents.3in} |  4 +-
 ...t_envelope.3 => MPI_Type_get_envelope.3in} |  4 +-
 ...e_get_extent.3 => MPI_Type_get_extent.3in} |  4 +-
 ..._Type_get_name.3 => MPI_Type_get_name.3in} |  4 +-
 ..._extent.3 => MPI_Type_get_true_extent.3in} |  4 +-
 ..._Type_hindexed.3 => MPI_Type_hindexed.3in} |  4 +-
 ...PI_Type_hvector.3 => MPI_Type_hvector.3in} |  4 +-
 ...PI_Type_indexed.3 => MPI_Type_indexed.3in} |  4 +-
 .../man3/{MPI_Type_lb.3 => MPI_Type_lb.3in}   |  4 +-
 ...e_match_size.3 => MPI_Type_match_size.3in} |  4 +-
 ..._Type_set_attr.3 => MPI_Type_set_attr.3in} |  4 +-
 ..._Type_set_name.3 => MPI_Type_set_name.3in} |  4 +-
 .../{MPI_Type_size.3 => MPI_Type_size.3in}    |  4 +-
 ...{MPI_Type_struct.3 => MPI_Type_struct.3in} |  4 +-
 .../man3/{MPI_Type_ub.3 => MPI_Type_ub.3in}   |  4 +-
 ...{MPI_Type_vector.3 => MPI_Type_vector.3in} |  4 +-
 .../man/man3/{MPI_Unpack.3 => MPI_Unpack.3in} |  4 +-
 ...ack_external.3 => MPI_Unpack_external.3in} |  4 +-
 ...npublish_name.3 => MPI_Unpublish_name.3in} |  4 +-
 .../mpi/man/man3/{MPI_Wait.3 => MPI_Wait.3in} |  4 +-
 .../man3/{MPI_Waitall.3 => MPI_Waitall.3in}   |  4 +-
 .../man3/{MPI_Waitany.3 => MPI_Waitany.3in}   |  4 +-
 .../man3/{MPI_Waitsome.3 => MPI_Waitsome.3in} |  4 +-
 .../man3/{MPI_Win_c2f.3 => MPI_Win_c2f.3in}   |  0
 ...rhandler.3 => MPI_Win_call_errhandler.3in} |  4 +-
 ...PI_Win_complete.3 => MPI_Win_complete.3in} |  4 +-
 .../{MPI_Win_create.3 => MPI_Win_create.3in}  |  4 +-
 ...andler.3 => MPI_Win_create_errhandler.3in} |  4 +-
 ...ate_keyval.3 => MPI_Win_create_keyval.3in} |  4 +-
 ..._delete_attr.3 => MPI_Win_delete_attr.3in} |  4 +-
 .../man3/{MPI_Win_f2c.3 => MPI_Win_f2c.3in}   |  0
 .../{MPI_Win_fence.3 => MPI_Win_fence.3in}    |  4 +-
 .../man3/{MPI_Win_free.3 => MPI_Win_free.3in} |  4 +-
 ..._free_keyval.3 => MPI_Win_free_keyval.3in} |  4 +-
 ...PI_Win_get_attr.3 => MPI_Win_get_attr.3in} |  4 +-
 ...rrhandler.3 => MPI_Win_get_errhandler.3in} |  4 +-
 ..._Win_get_group.3 => MPI_Win_get_group.3in} |  4 +-
 ...PI_Win_get_name.3 => MPI_Win_get_name.3in} |  4 +-
 .../man3/{MPI_Win_lock.3 => MPI_Win_lock.3in} |  4 +-
 .../man3/{MPI_Win_post.3 => MPI_Win_post.3in} |  4 +-
 ...PI_Win_set_attr.3 => MPI_Win_set_attr.3in} |  4 +-
 ...rrhandler.3 => MPI_Win_set_errhandler.3in} |  4 +-
 ...PI_Win_set_name.3 => MPI_Win_set_name.3in} |  4 +-
 .../{MPI_Win_start.3 => MPI_Win_start.3in}    |  4 +-
 .../man3/{MPI_Win_test.3 => MPI_Win_test.3in} |  4 +-
 .../{MPI_Win_unlock.3 => MPI_Win_unlock.3in}  |  4 +-
 .../man3/{MPI_Win_wait.3 => MPI_Win_wait.3in} |  4 +-
 .../man/man3/{MPI_Wtick.3 => MPI_Wtick.3in}   |  4 +-
 .../man/man3/{MPI_Wtime.3 => MPI_Wtime.3in}   |  4 +-
 ompi/mpi/man/man3/Makefile.extra              |  9 ++-
 ompi/mpi/man/man3/{OpenMPI.3 => OpenMPI.3in}  |  0
 ompi/tools/ompi-server/Makefile.am            | 10 ++-
 .../{ompi-server.1 => ompi-server.1in}        |  2 +-
 ompi/tools/ompi_info/Makefile.am              | 11 ++-
 .../ompi_info/{ompi_info.1 => ompi_info.1in}  |  3 +-
 ompi/tools/ompi_info/version.cc               |  7 ++
 ompi/tools/ortetools/Makefile.am              | 22 ++++--
 ompi/tools/wrappers/Makefile.am               | 24 +++----
 opal/mca/crs/Makefile.am                      |  8 ++-
 opal/mca/crs/{opal_crs.7 => opal_crs.7in}     |  5 +-
 opal/tools/opal-checkpoint/Makefile.am        | 10 ++-
 ...{opal-checkpoint.1 => opal-checkpoint.1in} |  3 +-
 opal/tools/opal-restart/Makefile.am           | 10 ++-
 .../{opal-restart.1 => opal-restart.1in}      |  3 +-
 opal/tools/wrappers/Makefile.am               | 17 +++--
 ...{generic_wrapper.1 => generic_wrapper.1in} | 56 ++++++++-------
 .../{opal_wrapper.1 => opal_wrapper.1in}      |  3 +-
 orte/mca/filem/Makefile.am                    |  8 ++-
 .../filem/{orte_filem.7 => orte_filem.7in}    |  5 +-
 orte/mca/snapc/Makefile.am                    |  8 ++-
 .../snapc/{orte_snapc.7 => orte_snapc.7in}    |  5 +-
 orte/tools/orte-checkpoint/Makefile.am        | 18 +++--
 ...{orte-checkpoint.1 => orte-checkpoint.1in} |  3 +-
 orte/tools/orte-clean/Makefile.am             | 11 ++-
 .../{orte-clean.1 => orte-clean.1in}          | 15 ++--
 orte/tools/orte-ps/Makefile.am                | 11 ++-
 orte/tools/orte-ps/{orte-ps.1 => orte-ps.1in} |  3 +-
 orte/tools/orte-restart/Makefile.am           | 18 +++--
 .../{orte-restart.1 => orte-restart.1in}      |  3 +-
 orte/tools/orted/Makefile.am                  | 11 ++-
 orte/tools/orted/{orted.1 => orted.1in}       |  3 +-
 orte/tools/orterun/Makefile.am                | 11 ++-
 orte/tools/orterun/{orterun.1 => orterun.1in} |  3 +-
 orte/tools/wrappers/Makefile.am               | 13 ++--
 349 files changed, 910 insertions(+), 813 deletions(-)
 create mode 100644 Makefile.man-page-rules
 rename ompi/mca/crcp/{ompi_crcp.7 => ompi_crcp.7in} (95%)
 rename ompi/mpi/man/man3/{MPI.3 => MPI.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Abort.3 => MPI_Abort.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Accumulate.3 => MPI_Accumulate.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Add_error_class.3 => MPI_Add_error_class.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Add_error_code.3 => MPI_Add_error_code.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Add_error_string.3 => MPI_Add_error_string.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Address.3 => MPI_Address.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Allgather.3 => MPI_Allgather.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Allgatherv.3 => MPI_Allgatherv.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Alloc_mem.3 => MPI_Alloc_mem.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Allreduce.3 => MPI_Allreduce.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Alltoall.3 => MPI_Alltoall.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Alltoallv.3 => MPI_Alltoallv.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Alltoallw.3 => MPI_Alltoallw.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Attr_delete.3 => MPI_Attr_delete.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Attr_get.3 => MPI_Attr_get.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Attr_put.3 => MPI_Attr_put.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Barrier.3 => MPI_Barrier.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Bcast.3 => MPI_Bcast.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Bsend.3 => MPI_Bsend.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Bsend_init.3 => MPI_Bsend_init.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Buffer_attach.3 => MPI_Buffer_attach.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Buffer_detach.3 => MPI_Buffer_detach.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Cancel.3 => MPI_Cancel.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Cart_coords.3 => MPI_Cart_coords.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Cart_create.3 => MPI_Cart_create.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Cart_get.3 => MPI_Cart_get.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Cart_map.3 => MPI_Cart_map.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Cart_rank.3 => MPI_Cart_rank.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Cart_shift.3 => MPI_Cart_shift.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Cart_sub.3 => MPI_Cart_sub.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Cartdim_get.3 => MPI_Cartdim_get.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Close_port.3 => MPI_Close_port.3in} (92%)
 delete mode 100644 ompi/mpi/man/man3/MPI_Comm_accept.3
 create mode 100644 ompi/mpi/man/man3/MPI_Comm_accept.3in
 rename ompi/mpi/man/man3/{MPI_Comm_c2f.3 => MPI_Comm_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Comm_call_errhandler.3 => MPI_Comm_call_errhandler.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Comm_compare.3 => MPI_Comm_compare.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Comm_connect.3 => MPI_Comm_connect.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_create.3 => MPI_Comm_create.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_create_errhandler.3 => MPI_Comm_create_errhandler.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_create_keyval.3 => MPI_Comm_create_keyval.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Comm_delete_attr.3 => MPI_Comm_delete_attr.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Comm_disconnect.3 => MPI_Comm_disconnect.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_dup.3 => MPI_Comm_dup.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_f2c.3 => MPI_Comm_f2c.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_free.3 => MPI_Comm_free.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Comm_free_keyval.3 => MPI_Comm_free_keyval.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Comm_get_attr.3 => MPI_Comm_get_attr.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_get_errhandler.3 => MPI_Comm_get_errhandler.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Comm_get_name.3 => MPI_Comm_get_name.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Comm_get_parent.3 => MPI_Comm_get_parent.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Comm_group.3 => MPI_Comm_group.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Comm_join.3 => MPI_Comm_join.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_rank.3 => MPI_Comm_rank.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Comm_remote_group.3 => MPI_Comm_remote_group.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Comm_remote_size.3 => MPI_Comm_remote_size.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Comm_set_attr.3 => MPI_Comm_set_attr.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Comm_set_errhandler.3 => MPI_Comm_set_errhandler.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Comm_set_name.3 => MPI_Comm_set_name.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Comm_size.3 => MPI_Comm_size.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_spawn.3 => MPI_Comm_spawn.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Comm_spawn_multiple.3 => MPI_Comm_spawn_multiple.3in} (85%)
 rename ompi/mpi/man/man3/{MPI_Comm_split.3 => MPI_Comm_split.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Comm_test_inter.3 => MPI_Comm_test_inter.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Dims_create.3 => MPI_Dims_create.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Errhandler_create.3 => MPI_Errhandler_create.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Errhandler_free.3 => MPI_Errhandler_free.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Errhandler_get.3 => MPI_Errhandler_get.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Errhandler_set.3 => MPI_Errhandler_set.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Error_class.3 => MPI_Error_class.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Error_string.3 => MPI_Error_string.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Exscan.3 => MPI_Exscan.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_File_c2f.3 => MPI_File_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_File_call_errhandler.3 => MPI_File_call_errhandler.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_File_close.3 => MPI_File_close.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_File_create_errhandler.3 => MPI_File_create_errhandler.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_delete.3 => MPI_File_delete.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_File_f2c.3 => MPI_File_f2c.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_File_get_amode.3 => MPI_File_get_amode.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_File_get_atomicity.3 => MPI_File_get_atomicity.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_File_get_byte_offset.3 => MPI_File_get_byte_offset.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_get_errhandler.3 => MPI_File_get_errhandler.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_File_get_group.3 => MPI_File_get_group.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_File_get_info.3 => MPI_File_get_info.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_File_get_position.3 => MPI_File_get_position.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_get_position_shared.3 => MPI_File_get_position_shared.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_get_size.3 => MPI_File_get_size.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_get_type_extent.3 => MPI_File_get_type_extent.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_get_view.3 => MPI_File_get_view.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_iread.3 => MPI_File_iread.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_iread_at.3 => MPI_File_iread_at.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_iread_shared.3 => MPI_File_iread_shared.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_iwrite.3 => MPI_File_iwrite.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_iwrite_at.3 => MPI_File_iwrite_at.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_iwrite_shared.3 => MPI_File_iwrite_shared.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_open.3 => MPI_File_open.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_File_preallocate.3 => MPI_File_preallocate.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_read.3 => MPI_File_read.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_all.3 => MPI_File_read_all.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_all_begin.3 => MPI_File_read_all_begin.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_all_end.3 => MPI_File_read_all_end.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_at.3 => MPI_File_read_at.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_read_at_all.3 => MPI_File_read_at_all.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_read_at_all_begin.3 => MPI_File_read_at_all_begin.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_at_all_end.3 => MPI_File_read_at_all_end.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_read_ordered.3 => MPI_File_read_ordered.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_ordered_begin.3 => MPI_File_read_ordered_begin.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_ordered_end.3 => MPI_File_read_ordered_end.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_read_shared.3 => MPI_File_read_shared.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_seek.3 => MPI_File_seek.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_seek_shared.3 => MPI_File_seek_shared.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_set_atomicity.3 => MPI_File_set_atomicity.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_set_errhandler.3 => MPI_File_set_errhandler.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_File_set_info.3 => MPI_File_set_info.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_File_set_size.3 => MPI_File_set_size.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_set_view.3 => MPI_File_set_view.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_File_sync.3 => MPI_File_sync.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_File_write.3 => MPI_File_write.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_write_all.3 => MPI_File_write_all.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_write_all_begin.3 => MPI_File_write_all_begin.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_write_all_end.3 => MPI_File_write_all_end.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_write_at.3 => MPI_File_write_at.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_write_at_all.3 => MPI_File_write_at_all.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_File_write_at_all_begin.3 => MPI_File_write_at_all_begin.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_write_at_all_end.3 => MPI_File_write_at_all_end.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_write_ordered.3 => MPI_File_write_ordered.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_write_ordered_begin.3 => MPI_File_write_ordered_begin.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_File_write_ordered_end.3 => MPI_File_write_ordered_end.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_File_write_shared.3 => MPI_File_write_shared.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Finalize.3 => MPI_Finalize.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Finalized.3 => MPI_Finalized.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Free_mem.3 => MPI_Free_mem.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Gather.3 => MPI_Gather.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Gatherv.3 => MPI_Gatherv.3in} (99%)
 rename ompi/mpi/man/man3/{MPI_Get.3 => MPI_Get.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Get_address.3 => MPI_Get_address.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Get_count.3 => MPI_Get_count.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Get_elements.3 => MPI_Get_elements.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Get_processor_name.3 => MPI_Get_processor_name.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Get_version.3 => MPI_Get_version.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Graph_create.3 => MPI_Graph_create.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Graph_get.3 => MPI_Graph_get.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Graph_map.3 => MPI_Graph_map.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Graph_neighbors.3 => MPI_Graph_neighbors.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Graph_neighbors_count.3 => MPI_Graph_neighbors_count.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Graphdims_get.3 => MPI_Graphdims_get.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Grequest_complete.3 => MPI_Grequest_complete.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Grequest_start.3 => MPI_Grequest_start.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Group_c2f.3 => MPI_Group_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Group_compare.3 => MPI_Group_compare.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Group_difference.3 => MPI_Group_difference.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Group_excl.3 => MPI_Group_excl.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Group_f2c.3 => MPI_Group_f2c.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Group_free.3 => MPI_Group_free.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Group_incl.3 => MPI_Group_incl.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Group_intersection.3 => MPI_Group_intersection.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Group_range_excl.3 => MPI_Group_range_excl.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Group_range_incl.3 => MPI_Group_range_incl.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Group_rank.3 => MPI_Group_rank.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Group_size.3 => MPI_Group_size.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Group_translate_ranks.3 => MPI_Group_translate_ranks.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Group_union.3 => MPI_Group_union.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Ibsend.3 => MPI_Ibsend.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Info_c2f.3 => MPI_Info_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Info_create.3 => MPI_Info_create.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Info_delete.3 => MPI_Info_delete.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Info_dup.3 => MPI_Info_dup.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Info_f2c.3 => MPI_Info_f2c.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Info_free.3 => MPI_Info_free.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Info_get.3 => MPI_Info_get.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Info_get_nkeys.3 => MPI_Info_get_nkeys.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Info_get_nthkey.3 => MPI_Info_get_nthkey.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Info_get_valuelen.3 => MPI_Info_get_valuelen.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Info_set.3 => MPI_Info_set.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Init.3 => MPI_Init.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Init_thread.3 => MPI_Init_thread.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Initialized.3 => MPI_Initialized.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Intercomm_create.3 => MPI_Intercomm_create.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Intercomm_merge.3 => MPI_Intercomm_merge.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Iprobe.3 => MPI_Iprobe.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Irecv.3 => MPI_Irecv.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Irsend.3 => MPI_Irsend.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Is_thread_main.3 => MPI_Is_thread_main.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Isend.3 => MPI_Isend.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Issend.3 => MPI_Issend.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Keyval_create.3 => MPI_Keyval_create.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Keyval_free.3 => MPI_Keyval_free.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Lookup_name.3 => MPI_Lookup_name.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Op_c2f.3 => MPI_Op_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Op_create.3 => MPI_Op_create.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Op_f2c.3 => MPI_Op_f2c.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Op_free.3 => MPI_Op_free.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Open_port.3 => MPI_Open_port.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Pack.3 => MPI_Pack.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Pack_external.3 => MPI_Pack_external.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Pack_external_size.3 => MPI_Pack_external_size.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Pack_size.3 => MPI_Pack_size.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Pcontrol.3 => MPI_Pcontrol.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Probe.3 => MPI_Probe.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Publish_name.3 => MPI_Publish_name.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Put.3 => MPI_Put.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Query_thread.3 => MPI_Query_thread.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Recv.3 => MPI_Recv.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Recv_init.3 => MPI_Recv_init.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Reduce.3 => MPI_Reduce.3in} (99%)
 rename ompi/mpi/man/man3/{MPI_Reduce_scatter.3 => MPI_Reduce_scatter.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Register_datarep.3 => MPI_Register_datarep.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Request_c2f.3 => MPI_Request_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Request_f2c.3 => MPI_Request_f2c.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Request_free.3 => MPI_Request_free.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Request_get_status.3 => MPI_Request_get_status.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Rsend.3 => MPI_Rsend.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Rsend_init.3 => MPI_Rsend_init.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Scan.3 => MPI_Scan.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Scatter.3 => MPI_Scatter.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Scatterv.3 => MPI_Scatterv.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Send.3 => MPI_Send.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Send_init.3 => MPI_Send_init.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Sendrecv.3 => MPI_Sendrecv.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Sendrecv_replace.3 => MPI_Sendrecv_replace.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Sizeof.3 => MPI_Sizeof.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Ssend.3 => MPI_Ssend.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Ssend_init.3 => MPI_Ssend_init.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Start.3 => MPI_Start.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Startall.3 => MPI_Startall.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Status_c2f.3 => MPI_Status_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Status_f2c.3 => MPI_Status_f2c.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Status_set_cancelled.3 => MPI_Status_set_cancelled.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Status_set_elements.3 => MPI_Status_set_elements.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Test.3 => MPI_Test.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Test_cancelled.3 => MPI_Test_cancelled.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Testall.3 => MPI_Testall.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Testany.3 => MPI_Testany.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Testsome.3 => MPI_Testsome.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Topo_test.3 => MPI_Topo_test.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Type_c2f.3 => MPI_Type_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Type_commit.3 => MPI_Type_commit.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Type_contiguous.3 => MPI_Type_contiguous.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_create_darray.3 => MPI_Type_create_darray.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_create_f90_complex.3 => MPI_Type_create_f90_complex.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_create_f90_integer.3 => MPI_Type_create_f90_integer.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Type_create_f90_real.3 => MPI_Type_create_f90_real.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_create_hindexed.3 => MPI_Type_create_hindexed.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Type_create_hvector.3 => MPI_Type_create_hvector.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_create_indexed_block.3 => MPI_Type_create_indexed_block.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Type_create_keyval.3 => MPI_Type_create_keyval.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_create_resized.3 => MPI_Type_create_resized.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_create_struct.3 => MPI_Type_create_struct.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_create_subarray.3 => MPI_Type_create_subarray.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_delete_attr.3 => MPI_Type_delete_attr.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Type_dup.3 => MPI_Type_dup.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Type_extent.3 => MPI_Type_extent.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_f2c.3 => MPI_Type_f2c.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Type_free.3 => MPI_Type_free.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Type_free_keyval.3 => MPI_Type_free_keyval.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Type_get_attr.3 => MPI_Type_get_attr.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_get_contents.3 => MPI_Type_get_contents.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_get_envelope.3 => MPI_Type_get_envelope.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_get_extent.3 => MPI_Type_get_extent.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Type_get_name.3 => MPI_Type_get_name.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Type_get_true_extent.3 => MPI_Type_get_true_extent.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_hindexed.3 => MPI_Type_hindexed.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Type_hvector.3 => MPI_Type_hvector.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Type_indexed.3 => MPI_Type_indexed.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_lb.3 => MPI_Type_lb.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Type_match_size.3 => MPI_Type_match_size.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Type_set_attr.3 => MPI_Type_set_attr.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Type_set_name.3 => MPI_Type_set_name.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Type_size.3 => MPI_Type_size.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Type_struct.3 => MPI_Type_struct.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Type_ub.3 => MPI_Type_ub.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Type_vector.3 => MPI_Type_vector.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Unpack.3 => MPI_Unpack.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Unpack_external.3 => MPI_Unpack_external.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Unpublish_name.3 => MPI_Unpublish_name.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Wait.3 => MPI_Wait.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Waitall.3 => MPI_Waitall.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Waitany.3 => MPI_Waitany.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Waitsome.3 => MPI_Waitsome.3in} (98%)
 rename ompi/mpi/man/man3/{MPI_Win_c2f.3 => MPI_Win_c2f.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Win_call_errhandler.3 => MPI_Win_call_errhandler.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Win_complete.3 => MPI_Win_complete.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Win_create.3 => MPI_Win_create.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Win_create_errhandler.3 => MPI_Win_create_errhandler.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Win_create_keyval.3 => MPI_Win_create_keyval.3in} (97%)
 rename ompi/mpi/man/man3/{MPI_Win_delete_attr.3 => MPI_Win_delete_attr.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Win_f2c.3 => MPI_Win_f2c.3in} (100%)
 rename ompi/mpi/man/man3/{MPI_Win_fence.3 => MPI_Win_fence.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Win_free.3 => MPI_Win_free.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Win_free_keyval.3 => MPI_Win_free_keyval.3in} (91%)
 rename ompi/mpi/man/man3/{MPI_Win_get_attr.3 => MPI_Win_get_attr.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Win_get_errhandler.3 => MPI_Win_get_errhandler.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Win_get_group.3 => MPI_Win_get_group.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Win_get_name.3 => MPI_Win_get_name.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Win_lock.3 => MPI_Win_lock.3in} (96%)
 rename ompi/mpi/man/man3/{MPI_Win_post.3 => MPI_Win_post.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Win_set_attr.3 => MPI_Win_set_attr.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Win_set_errhandler.3 => MPI_Win_set_errhandler.3in} (93%)
 rename ompi/mpi/man/man3/{MPI_Win_set_name.3 => MPI_Win_set_name.3in} (92%)
 rename ompi/mpi/man/man3/{MPI_Win_start.3 => MPI_Win_start.3in} (95%)
 rename ompi/mpi/man/man3/{MPI_Win_test.3 => MPI_Win_test.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Win_unlock.3 => MPI_Win_unlock.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Win_wait.3 => MPI_Win_wait.3in} (94%)
 rename ompi/mpi/man/man3/{MPI_Wtick.3 => MPI_Wtick.3in} (90%)
 rename ompi/mpi/man/man3/{MPI_Wtime.3 => MPI_Wtime.3in} (95%)
 rename ompi/mpi/man/man3/{OpenMPI.3 => OpenMPI.3in} (100%)
 rename ompi/tools/ompi-server/{ompi-server.1 => ompi-server.1in} (96%)
 rename ompi/tools/ompi_info/{ompi_info.1 => ompi_info.1in} (96%)
 rename opal/mca/crs/{opal_crs.7 => opal_crs.7in} (97%)
 rename opal/tools/opal-checkpoint/{opal-checkpoint.1 => opal-checkpoint.1in} (94%)
 rename opal/tools/opal-restart/{opal-restart.1 => opal-restart.1in} (96%)
 rename opal/tools/wrappers/{generic_wrapper.1 => generic_wrapper.1in} (74%)
 rename opal/tools/wrappers/{opal_wrapper.1 => opal_wrapper.1in} (92%)
 rename orte/mca/filem/{orte_filem.7 => orte_filem.7in} (92%)
 rename orte/mca/snapc/{orte_snapc.7 => orte_snapc.7in} (94%)
 rename orte/tools/orte-checkpoint/{orte-checkpoint.1 => orte-checkpoint.1in} (94%)
 rename orte/tools/orte-clean/{orte-clean.1 => orte-clean.1in} (88%)
 rename orte/tools/orte-ps/{orte-ps.1 => orte-ps.1in} (93%)
 rename orte/tools/orte-restart/{orte-restart.1 => orte-restart.1in} (95%)
 rename orte/tools/orted/{orted.1 => orted.1in} (90%)
 rename orte/tools/orterun/{orterun.1 => orterun.1in} (99%)

diff --git a/Makefile.man-page-rules b/Makefile.man-page-rules
new file mode 100644
index 0000000000..05a5de06a2
--- /dev/null
+++ b/Makefile.man-page-rules
@@ -0,0 +1,29 @@
+# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+.1in.1:
+	@ echo Creating $@ man page...
+	@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
+	-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
+	-e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
+	> $@ < $<
+
+.3in.3:
+	@ echo Creating $@ man page...
+	@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
+	-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
+	-e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
+	> $@ < $<
+
+.7in.7:
+	@ echo Creating $@ man page...
+	@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
+	-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
+	-e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
+	> $@ < $<
diff --git a/VERSION b/VERSION
index a9870c55c6..9cce50b754 100644
--- a/VERSION
+++ b/VERSION
@@ -1,3 +1,6 @@
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+
 # This is the VERSION file for Open MPI, describing the precise
 # version of Open MPI in this distribution.  The various components of
 # the version number below are combined to form a single version
@@ -35,3 +38,7 @@ want_svn=1
 # of svn_r in this file is replaced with the output of "svnversion".
 
 svn_r=-1
+
+# The date when this release was created
+
+date="Unreleased developer copy"
diff --git a/config/ompi_get_version.m4 b/config/ompi_get_version.m4
index 7c13dbc70c..3fcd45a390 100644
--- a/config/ompi_get_version.m4
+++ b/config/ompi_get_version.m4
@@ -35,6 +35,7 @@ dnl
 #  prefix_GREEK_VERSION
 #  prefix_WANT_SVN
 #  prefix_SVN_R
+#  prefix_RELEASE_DATE
 m4_define([OMPI_GET_VERSION],[
     : ${ompi_ver_need_svn=1}
     : ${srcdir=.}
@@ -51,6 +52,7 @@ m4_define([OMPI_GET_VERSION],[
 	s/^greek/$2_GREEK_VERSION/
 	s/^want_svn/$2_WANT_SVN/
 	s/^svn_r/$2_SVN_R/
+	s/^date/$2_RELEASE_DATE/
 	t print
 	b
 	: print
diff --git a/config/ompi_get_version.m4sh b/config/ompi_get_version.m4sh
index f3c6df2b99..97601a5d3e 100644
--- a/config/ompi_get_version.m4sh
+++ b/config/ompi_get_version.m4sh
@@ -14,6 +14,7 @@ m4_divert_push([SCRIPT])dnl
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -68,6 +69,9 @@ case "$option" in
     --base)
         echo $OMPI_BASE_VERSION
         ;;
+    --release-date)
+        echo $OMPI_RELEASE_DATE
+        ;;
     --all)
         echo ${OMPI_VERSION} ${OMPI_MAJOR_VERSION} ${OMPI_MINOR_VERSION} ${OMPI_RELEASE_VERSION} ${OMPI_GREEK_VERSION} ${OMPI_SVN_R}
         ;;
@@ -77,15 +81,16 @@ $0 <srcfile> [<option>]
 
 <srcfile> - Text version file
 <option>  - One of:
-    --full    - Full version number
-    --major   - Major version number
-    --minor   - Minor version number
-    --release - Release version number
-    --greek   - Greek (alpha, beta, etc) version number
-    --svn     - Subversion repository number
-    --all     - Show all version numbers, separated by :
-    --base    - Show base version number (no svn number)
-    --help    - This message
+    --full         - Full version number
+    --major        - Major version number
+    --minor        - Minor version number
+    --release      - Release version number
+    --greek        - Greek (alpha, beta, etc) version number
+    --svn          - Subversion repository number
+    --all          - Show all version numbers, separated by :
+    --base         - Show base version number (no svn number)
+    --release-date - Show the release date
+    --help         - This message
 EOF
         ;;
     *)
diff --git a/config/ompi_save_version.m4 b/config/ompi_save_version.m4
index ae97175c45..6ca6b26fca 100644
--- a/config/ompi_save_version.m4
+++ b/config/ompi_save_version.m4
@@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
+dnl Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -33,9 +34,12 @@ AC_DEFUN([OMPI_SAVE_VERSION], [
     AC_SUBST($1[_WANT_SVN])
     AC_SUBST($1[_SVN_R])
     AC_SUBST($1[_VERSION])
+    AC_SUBST($1[_RELEASE_DATE])
 
     AC_MSG_CHECKING([$2 version])
     AC_MSG_RESULT([$]$1[_VERSION])
+    AC_MSG_CHECKING([$2 release date])
+    AC_MSG_RESULT([$]$1[_RELEASE_DATE])
     AC_MSG_CHECKING([$2 Subversion repository version])
     AC_MSG_RESULT([$]$1[_SVN_R])
 
@@ -49,6 +53,8 @@ AC_DEFUN([OMPI_SAVE_VERSION], [
         [Greek - alpha, beta, etc - release number of ]$2)
     AC_DEFINE_UNQUOTED($1[_VERSION], ["$]$1[_RELEASE_VERSION"],
         [Complete release number of ]$2)
+    AC_DEFINE_UNQUOTED($1[_RELEASE_DATE], ["$]$1[_RELEASE_DATE"],
+        [Release date of ]$2)
 
     AC_CONFIG_FILES([$4])
 ])dnl
diff --git a/ompi/Makefile.am b/ompi/Makefile.am
index c9f7c212cc..64b9ce370e 100644
--- a/ompi/Makefile.am
+++ b/ompi/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -68,15 +69,15 @@ endif
 SUBDIRS = \
 	include \
 	datatype \
-        debuggers \
+	debuggers \
 	etc \
-        mpi/c \
+	mpi/c \
 	$(MCA_ompi_FRAMEWORKS_SUBDIRS) \
 	$(MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
-        . \
-        mpi/cxx \
-        mpi/f77 \
-        mpi/f90 \
+	. \
+	mpi/cxx \
+	mpi/f77 \
+	mpi/f90 \
 	$(MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS) \
 	$(OMPI_CONTRIB_SUBDIRS)
 
@@ -85,10 +86,10 @@ DIST_SUBDIRS = \
 	datatype \
 	debuggers \
 	etc \
-        mpi/c \
-        mpi/cxx \
-        mpi/f77 \
-        mpi/f90 \
+	mpi/c \
+	mpi/cxx \
+	mpi/f77 \
+	mpi/f90 \
 	$(MCA_ompi_FRAMEWORKS_SUBDIRS) \
 	$(MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS) \
 	$(OMPI_CONTRIB_DIST_SUBDIRS)
@@ -99,21 +100,21 @@ lib_LTLIBRARIES = libmpi.la
 libmpi_la_SOURCES =
 libmpi_la_LIBADD = \
 	datatype/libdatatype.la \
-        debuggers/libdebuggers.la \
-        mpi/c/libmpi_c.la \
+	debuggers/libdebuggers.la \
+	mpi/c/libmpi_c.la \
 	$(c_mpi_lib) \
 	$(c_pmpi_lib) \
-        $(f77_base_lib) \
+	$(f77_base_lib) \
 	$(MCA_ompi_FRAMEWORK_LIBS) \
 	$(OMPI_LIBMPI_EXTRA_LIBS) \
 	$(top_ompi_builddir)/orte/libopen-rte.la
 libmpi_la_DEPENDENCIES = \
 	datatype/libdatatype.la \
-        debuggers/libdebuggers.la \
-        mpi/c/libmpi_c.la \
+	debuggers/libdebuggers.la \
+	mpi/c/libmpi_c.la \
 	$(c_mpi_lib) \
 	$(c_pmpi_lib) \
-        $(f77_base_lib) \
+	$(f77_base_lib) \
 	$(MCA_ompi_FRAMEWORK_LIBS) \
 	$(top_ompi_builddir)/orte/libopen-rte.la
 libmpi_la_LDFLAGS = \
@@ -126,7 +127,7 @@ include_HEADERS =
 nobase_ompi_HEADERS = 
 dist_pkgdata_DATA =
 libmpi_la_SOURCES += $(headers)
-man_MANS =
+dist_man_MANS =
 
 # Conditionally install the header files
 
@@ -138,7 +139,6 @@ ompidir = $(includedir)
 endif
 
 include class/Makefile.am
-
 include attribute/Makefile.am
 include communicator/Makefile.am
 include errhandler/Makefile.am
@@ -155,3 +155,6 @@ include tools/Makefile.am
 include mpi/Makefile.am
 include mpi/f77/base/Makefile.include
 include mpi/man/man3/Makefile.extra
+
+maintainer-clean-local:
+	rm -f $(dist_man_MANS)
diff --git a/ompi/mca/crcp/Makefile.am b/ompi/mca/crcp/Makefile.am
index c1a16c624f..2e3f6ab906 100644
--- a/ompi/mca/crcp/Makefile.am
+++ b/ompi/mca/crcp/Makefile.am
@@ -9,6 +9,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -16,6 +18,8 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
 # main library setup
 noinst_LTLIBRARIES = libmca_crcp.la
 libmca_crcp_la_SOURCES =
@@ -28,8 +32,8 @@ headers = crcp.h
 libmca_crcp_la_SOURCES += $(headers)
 
 # Manual pages
-man_MANS = ompi_crcp.7
-EXTRA_DIST = ompi_crcp.7
+dist_man_MANS = ompi_crcp.7
+EXTRA_DIST = $(dist_man_MANS:.7=.7in)
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
diff --git a/ompi/mca/crcp/ompi_crcp.7 b/ompi/mca/crcp/ompi_crcp.7in
similarity index 95%
rename from ompi/mca/crcp/ompi_crcp.7
rename to ompi/mca/crcp/ompi_crcp.7in
index ed8fce03fc..eb36fb021e 100644
--- a/ompi/mca/crcp/ompi_crcp.7
+++ b/ompi/mca/crcp/ompi_crcp.7in
@@ -2,14 +2,14 @@
 .\" Man page for OMPI's CRCP Functionality
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OMPI_CRCP  7       "March 2007" "Open MPI"   "OPEN MPI CRCP OVERVIEW"
+.TH     OMPI_CRCP  7 "#OMPI_DATE#" "#PACKAGE_NAME#" "#PACKAGE_VERSION#"
 .\" **************************
 .\"    Name Section
 .\" **************************
 .SH NAME
 .
 Open MPI MCA Checkpoint/Restart Coordination Protocol (CRCP) Framework \- Overview of Open MPI's CRCP 
-framework, and selected modules.
+framework, and selected modules.  #PACKAGE_NAME# #PACKAGE_VERSION#
 .
 .\" **************************
 .\"    Description Section
diff --git a/ompi/mpi/man/man3/MPI.3 b/ompi/mpi/man/man3/MPI.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI.3
rename to ompi/mpi/man/man3/MPI.3in
index c9bbb73b62..309b873710 100644
--- a/ompi/mpi/man/man3/MPI.3
+++ b/ompi/mpi/man/man3/MPI.3in
@@ -1,8 +1,8 @@
-.\"Copyright 2007, Sun Microsystems, Inc. 
+.\"Copyright 2008 Sun Microsystems, Inc. 
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
-MPI \- General information about Open MPI 1.2. 
+MPI \- General information #PACKAGE_NAME# #PACKAGE_VERSION#. 
 
 .SH MPI
 .ft R
diff --git a/ompi/mpi/man/man3/MPI_Abort.3 b/ompi/mpi/man/man3/MPI_Abort.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Abort.3
rename to ompi/mpi/man/man3/MPI_Abort.3in
index d8e3dd594f..2b5b8622d3 100644
--- a/ompi/mpi/man/man3/MPI_Abort.3
+++ b/ompi/mpi/man/man3/MPI_Abort.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Abort 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Abort 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Abort\fP \- Terminates MPI execution environment.
 
diff --git a/ompi/mpi/man/man3/MPI_Accumulate.3 b/ompi/mpi/man/man3/MPI_Accumulate.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Accumulate.3
rename to ompi/mpi/man/man3/MPI_Accumulate.3in
index ed0d9a7d30..af70eea4b5 100644
--- a/ompi/mpi/man/man3/MPI_Accumulate.3
+++ b/ompi/mpi/man/man3/MPI_Accumulate.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Accumulate 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Accumulate 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Accumulate \fP \- Combines the contents of the origin buffer with that of a target buffer. 
 
diff --git a/ompi/mpi/man/man3/MPI_Add_error_class.3 b/ompi/mpi/man/man3/MPI_Add_error_class.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Add_error_class.3
rename to ompi/mpi/man/man3/MPI_Add_error_class.3in
index bde9ed4706..80326a052e 100644
--- a/ompi/mpi/man/man3/MPI_Add_error_class.3
+++ b/ompi/mpi/man/man3/MPI_Add_error_class.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Add_error_class 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Add_error_class 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Add_error_code.3 b/ompi/mpi/man/man3/MPI_Add_error_code.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Add_error_code.3
rename to ompi/mpi/man/man3/MPI_Add_error_code.3in
index 2afeacce7b..8027ce2755 100644
--- a/ompi/mpi/man/man3/MPI_Add_error_code.3
+++ b/ompi/mpi/man/man3/MPI_Add_error_code.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Add_error_code 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Add_error_code 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Add_error_code\fP \- Creates a new error code associated
diff --git a/ompi/mpi/man/man3/MPI_Add_error_string.3 b/ompi/mpi/man/man3/MPI_Add_error_string.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Add_error_string.3
rename to ompi/mpi/man/man3/MPI_Add_error_string.3in
index 45194225b3..74e1c1daed 100644
--- a/ompi/mpi/man/man3/MPI_Add_error_string.3
+++ b/ompi/mpi/man/man3/MPI_Add_error_string.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Add_error_string 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Add_error_string 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Address.3 b/ompi/mpi/man/man3/MPI_Address.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Address.3
rename to ompi/mpi/man/man3/MPI_Address.3in
index 6506a4a91b..7927883cfd 100644
--- a/ompi/mpi/man/man3/MPI_Address.3
+++ b/ompi/mpi/man/man3/MPI_Address.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Address 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Address 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Address\fP \- Gets the address of a location in memory -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Allgather.3 b/ompi/mpi/man/man3/MPI_Allgather.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Allgather.3
rename to ompi/mpi/man/man3/MPI_Allgather.3in
index b31abdb7c7..cc7c8e96b6 100644
--- a/ompi/mpi/man/man3/MPI_Allgather.3
+++ b/ompi/mpi/man/man3/MPI_Allgather.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Allgather 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Allgather 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Allgather\fP \- Gathers data from all processes and distributes it to all processes
 
diff --git a/ompi/mpi/man/man3/MPI_Allgatherv.3 b/ompi/mpi/man/man3/MPI_Allgatherv.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Allgatherv.3
rename to ompi/mpi/man/man3/MPI_Allgatherv.3in
index 168a8be6f0..050a6f4621 100644
--- a/ompi/mpi/man/man3/MPI_Allgatherv.3
+++ b/ompi/mpi/man/man3/MPI_Allgatherv.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc. 
+.\"Copyright 2007-2008 Sun Microsystems, Inc. 
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Allgatherv 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Allgatherv 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Allgatherv\fP \- Gathers data from all processes and delivers it to all. Each process may contribute a different amount of data.
 
diff --git a/ompi/mpi/man/man3/MPI_Alloc_mem.3 b/ompi/mpi/man/man3/MPI_Alloc_mem.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Alloc_mem.3
rename to ompi/mpi/man/man3/MPI_Alloc_mem.3in
index 55a8175f01..4e19c0fe72 100644
--- a/ompi/mpi/man/man3/MPI_Alloc_mem.3
+++ b/ompi/mpi/man/man3/MPI_Alloc_mem.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Alloc_mem 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Alloc_mem 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Alloc_mem \fP \- Allocates a specified memory segment. 
 
diff --git a/ompi/mpi/man/man3/MPI_Allreduce.3 b/ompi/mpi/man/man3/MPI_Allreduce.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Allreduce.3
rename to ompi/mpi/man/man3/MPI_Allreduce.3in
index b941bf018c..9021b07625 100644
--- a/ompi/mpi/man/man3/MPI_Allreduce.3
+++ b/ompi/mpi/man/man3/MPI_Allreduce.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Allreduce 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Allreduce 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Allreduce\fP \- Combines values from all processes and distributes the result back to all processes.
 
diff --git a/ompi/mpi/man/man3/MPI_Alltoall.3 b/ompi/mpi/man/man3/MPI_Alltoall.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Alltoall.3
rename to ompi/mpi/man/man3/MPI_Alltoall.3in
index 3eeb42fa5e..656641daa6 100644
--- a/ompi/mpi/man/man3/MPI_Alltoall.3
+++ b/ompi/mpi/man/man3/MPI_Alltoall.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Alltoall 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Alltoall 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Alltoall\fP \- All processes send data to all processes 
diff --git a/ompi/mpi/man/man3/MPI_Alltoallv.3 b/ompi/mpi/man/man3/MPI_Alltoallv.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Alltoallv.3
rename to ompi/mpi/man/man3/MPI_Alltoallv.3in
index 3cadcccdcf..bc3eb4de7e 100644
--- a/ompi/mpi/man/man3/MPI_Alltoallv.3
+++ b/ompi/mpi/man/man3/MPI_Alltoallv.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Alltoallv 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Alltoallv 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Alltoallv\fP \- All processes send different amount of data to, and receive different amount of data from, all processes
diff --git a/ompi/mpi/man/man3/MPI_Alltoallw.3 b/ompi/mpi/man/man3/MPI_Alltoallw.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Alltoallw.3
rename to ompi/mpi/man/man3/MPI_Alltoallw.3in
index 460088feb4..5ab17a7a8d 100644
--- a/ompi/mpi/man/man3/MPI_Alltoallw.3
+++ b/ompi/mpi/man/man3/MPI_Alltoallw.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Alltoallw 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Alltoallw 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Alltoallw\fP \- All processes send data of different types to, and receive data of different types from, all processes
diff --git a/ompi/mpi/man/man3/MPI_Attr_delete.3 b/ompi/mpi/man/man3/MPI_Attr_delete.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Attr_delete.3
rename to ompi/mpi/man/man3/MPI_Attr_delete.3in
index 92a88456b0..aa8f909024 100644
--- a/ompi/mpi/man/man3/MPI_Attr_delete.3
+++ b/ompi/mpi/man/man3/MPI_Attr_delete.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Attr_delete 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Attr_delete 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Attr_delete\fP \- Deletes attribute value associated with a key -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Attr_get.3 b/ompi/mpi/man/man3/MPI_Attr_get.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Attr_get.3
rename to ompi/mpi/man/man3/MPI_Attr_get.3in
index 3e669b4ea3..78649b243d 100644
--- a/ompi/mpi/man/man3/MPI_Attr_get.3
+++ b/ompi/mpi/man/man3/MPI_Attr_get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Attr_get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Attr_get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Attr_get\fP \- Retrieves attribute value by key -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Attr_put.3 b/ompi/mpi/man/man3/MPI_Attr_put.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Attr_put.3
rename to ompi/mpi/man/man3/MPI_Attr_put.3in
index 69f386602c..dc47fdb2f6 100644
--- a/ompi/mpi/man/man3/MPI_Attr_put.3
+++ b/ompi/mpi/man/man3/MPI_Attr_put.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Attr_put 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Attr_put 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Attr_put\fP \- Stores attribute value associated with a key -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Barrier.3 b/ompi/mpi/man/man3/MPI_Barrier.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Barrier.3
rename to ompi/mpi/man/man3/MPI_Barrier.3in
index 9df2a343be..e58abf1dab 100644
--- a/ompi/mpi/man/man3/MPI_Barrier.3
+++ b/ompi/mpi/man/man3/MPI_Barrier.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Barrier 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Barrier 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Barrier\fP \- Blocks until all processes have reached this routine.
 
diff --git a/ompi/mpi/man/man3/MPI_Bcast.3 b/ompi/mpi/man/man3/MPI_Bcast.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Bcast.3
rename to ompi/mpi/man/man3/MPI_Bcast.3in
index 9ef4388f56..ac39ca5316 100644
--- a/ompi/mpi/man/man3/MPI_Bcast.3
+++ b/ompi/mpi/man/man3/MPI_Bcast.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Bcast 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Bcast 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Bcast\fP \- Broadcasts a message from the process with rank \fIroot\fP to all other processes of the group.
 
diff --git a/ompi/mpi/man/man3/MPI_Bsend.3 b/ompi/mpi/man/man3/MPI_Bsend.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Bsend.3
rename to ompi/mpi/man/man3/MPI_Bsend.3in
index 5025c12389..6a3ea7a376 100644
--- a/ompi/mpi/man/man3/MPI_Bsend.3
+++ b/ompi/mpi/man/man3/MPI_Bsend.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Bsend 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Bsend 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Bsend\fP \- Basic send with user-specified buffering.
 
diff --git a/ompi/mpi/man/man3/MPI_Bsend_init.3 b/ompi/mpi/man/man3/MPI_Bsend_init.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Bsend_init.3
rename to ompi/mpi/man/man3/MPI_Bsend_init.3in
index 12fd1c8f32..569e3a85c8 100644
--- a/ompi/mpi/man/man3/MPI_Bsend_init.3
+++ b/ompi/mpi/man/man3/MPI_Bsend_init.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Bsend_init 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Bsend_init 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Bsend_init\fP \- Builds a handle for a buffered send.
 
diff --git a/ompi/mpi/man/man3/MPI_Buffer_attach.3 b/ompi/mpi/man/man3/MPI_Buffer_attach.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Buffer_attach.3
rename to ompi/mpi/man/man3/MPI_Buffer_attach.3in
index be09ef9ef7..33f52ebb1e 100644
--- a/ompi/mpi/man/man3/MPI_Buffer_attach.3
+++ b/ompi/mpi/man/man3/MPI_Buffer_attach.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Buffer_attach 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Buffer_attach 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Buffer_attach\fP \- Attaches a user-defined buffer for sending.
 
diff --git a/ompi/mpi/man/man3/MPI_Buffer_detach.3 b/ompi/mpi/man/man3/MPI_Buffer_detach.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Buffer_detach.3
rename to ompi/mpi/man/man3/MPI_Buffer_detach.3in
index dab4c26450..8b1528eb6e 100644
--- a/ompi/mpi/man/man3/MPI_Buffer_detach.3
+++ b/ompi/mpi/man/man3/MPI_Buffer_detach.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Buffer_detach 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Buffer_detach 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Buffer_detach\fP \- Removes an existing buffer (for use in MPI_Bsend, etc.)
 
diff --git a/ompi/mpi/man/man3/MPI_Cancel.3 b/ompi/mpi/man/man3/MPI_Cancel.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Cancel.3
rename to ompi/mpi/man/man3/MPI_Cancel.3in
index 1a29ad7e4c..14aaa57034 100644
--- a/ompi/mpi/man/man3/MPI_Cancel.3
+++ b/ompi/mpi/man/man3/MPI_Cancel.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cancel 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cancel 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cancel\fP \- Cancels a communication request.
 
diff --git a/ompi/mpi/man/man3/MPI_Cart_coords.3 b/ompi/mpi/man/man3/MPI_Cart_coords.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Cart_coords.3
rename to ompi/mpi/man/man3/MPI_Cart_coords.3in
index 38671020b0..bc8038bb66 100644
--- a/ompi/mpi/man/man3/MPI_Cart_coords.3
+++ b/ompi/mpi/man/man3/MPI_Cart_coords.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cart_coords 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cart_coords 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cart_coords\fP \- Determines process coords in Cartesian topology given rank in group.
 
diff --git a/ompi/mpi/man/man3/MPI_Cart_create.3 b/ompi/mpi/man/man3/MPI_Cart_create.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Cart_create.3
rename to ompi/mpi/man/man3/MPI_Cart_create.3in
index f5008f1322..d43e541cc5 100644
--- a/ompi/mpi/man/man3/MPI_Cart_create.3
+++ b/ompi/mpi/man/man3/MPI_Cart_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cart_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cart_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cart_create\fP \- Makes a new communicator to which Cartesian topology information has been attached.
 
diff --git a/ompi/mpi/man/man3/MPI_Cart_get.3 b/ompi/mpi/man/man3/MPI_Cart_get.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Cart_get.3
rename to ompi/mpi/man/man3/MPI_Cart_get.3in
index cfa08c40a3..1c33c47670 100644
--- a/ompi/mpi/man/man3/MPI_Cart_get.3
+++ b/ompi/mpi/man/man3/MPI_Cart_get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cart_get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cart_get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cart_get\fP \-  Retrieves Cartesian topology information associated with a communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Cart_map.3 b/ompi/mpi/man/man3/MPI_Cart_map.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Cart_map.3
rename to ompi/mpi/man/man3/MPI_Cart_map.3in
index 7cc959100b..83aee33537 100644
--- a/ompi/mpi/man/man3/MPI_Cart_map.3
+++ b/ompi/mpi/man/man3/MPI_Cart_map.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cart_map 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cart_map 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cart_map \fP \-  Maps process to Cartesian topology information.
 
diff --git a/ompi/mpi/man/man3/MPI_Cart_rank.3 b/ompi/mpi/man/man3/MPI_Cart_rank.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Cart_rank.3
rename to ompi/mpi/man/man3/MPI_Cart_rank.3in
index fe86c87c79..93fb68ddd5 100644
--- a/ompi/mpi/man/man3/MPI_Cart_rank.3
+++ b/ompi/mpi/man/man3/MPI_Cart_rank.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cart_rank 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cart_rank 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cart_rank \fP \-  Determines process rank in communicator given Cartesian location.
 
diff --git a/ompi/mpi/man/man3/MPI_Cart_shift.3 b/ompi/mpi/man/man3/MPI_Cart_shift.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Cart_shift.3
rename to ompi/mpi/man/man3/MPI_Cart_shift.3in
index 413532c5c0..372903b845 100644
--- a/ompi/mpi/man/man3/MPI_Cart_shift.3
+++ b/ompi/mpi/man/man3/MPI_Cart_shift.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Cart_shift 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cart_shift 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cart_shift \fP \-  Returns the shifted source and destination ranks, given a shift direction and amount.
 
diff --git a/ompi/mpi/man/man3/MPI_Cart_sub.3 b/ompi/mpi/man/man3/MPI_Cart_sub.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Cart_sub.3
rename to ompi/mpi/man/man3/MPI_Cart_sub.3in
index 02f1936617..e0aff6821a 100644
--- a/ompi/mpi/man/man3/MPI_Cart_sub.3
+++ b/ompi/mpi/man/man3/MPI_Cart_sub.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cart_sub 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cart_sub 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cart_sub \fP \- Partitions a communicator into subgroups, which form lower-dimensional Cartesian subgrids.
 
diff --git a/ompi/mpi/man/man3/MPI_Cartdim_get.3 b/ompi/mpi/man/man3/MPI_Cartdim_get.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Cartdim_get.3
rename to ompi/mpi/man/man3/MPI_Cartdim_get.3in
index db72f76e10..65bc400a49 100644
--- a/ompi/mpi/man/man3/MPI_Cartdim_get.3
+++ b/ompi/mpi/man/man3/MPI_Cartdim_get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Cartdim_get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Cartdim_get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Cartdim_get \fP \-  Retrieves Cartesian topology information associated with a communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Close_port.3 b/ompi/mpi/man/man3/MPI_Close_port.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Close_port.3
rename to ompi/mpi/man/man3/MPI_Close_port.3in
index 24cd6f75a9..b3e0528f6a 100644
--- a/ompi/mpi/man/man3/MPI_Close_port.3
+++ b/ompi/mpi/man/man3/MPI_Close_port.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Close_port 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Close_port 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Close_port \fP \- Releases the specified network address. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_accept.3 b/ompi/mpi/man/man3/MPI_Comm_accept.3
deleted file mode 100644
index c18bd2993d..0000000000
--- a/ompi/mpi/man/man3/MPI_Comm_accept.3
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
-.\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_accept 3OpenMPI "March 2007" "Open MPI 1.2" " "
-.SH NAME
-\fBMPI_Comm_accept \fP \- Establishes communication with a client. 
-
-.SH SYNTAX
-.ft R
-.SH C Syntax
-.nf
-#include <mpi.h>
-int MPI_Comm_accept(char *\fIport_name\fP, MPI_Info \fIinfo\fP, int \fIroot\fP, MPI_Comm \fIcomm\fP, MPI_Comm *\fInewcomm\fP)
-
-.SH Fortran Syntax
-.nf
-INCLUDE 'mpif.h'
-MPI_COMM_ACCEPT(\fIPORT_NAME, INFO, ROOT, COMM, NEWCOMM, IERROR\fP)
-	CHARACTER*(*)	\fIPORT_NAME\fP
-	INTEGER		\fIINFO, ROOT, COMM, NEWCOMM, IERROR\fP 
-
-.SH C++ Syntax
-.nf
-#include <mpi.h>
-MPI::Intercomm MPI::Intracomm::Accept(const char* \fIport_name\fP,
-	const MPI::Info& \fIinfo\fP, int \fIroot\fP) const
-
-.SH INPUT PARAMETERS
-.ft R
-.TP 1i
-port_name
-Port name (string, used only on \fIroot\fP).
-.TP 1i
-info
-Options given by root for the accept (handle, used only on root). No options currently supported. 
-.TP 1i
-root
-Rank in \fIcomm\fP of root node (integer).
-.TP 1i
-comm
-Intracommunicator over which call is collective (handle).
-
-.SH OUTPUT PARAMETERS
-.ft R
-.TP 1i
-newcomm
-Intercommunicator with client as remote group (handle)
-.TP 1i
-IERROR
-Fortran only: Error status (integer). 
-
-.SH DESCRIPTION
-.ft R
-MPI_Comm_accept establishes communication with a client. It is collective over the calling communicator. It returns an intercommunicator that allows communication with the client, after the client has connected with the MPI_Comm_accept function using the MPI_Comm_connect function.
-.sp
-The \fIport_name\fP must have been established through a call to MPI_Open_port on the root.
-
-
-.SH ERRORS
-Almost all MPI routines return an error value; C routines as the value of the function and Fortran routines in the last argument. C++ functions do not return errors. If the default error handler is set to MPI::ERRORS_THROW_EXCEPTIONS, then on error the C++ exception mechanism will be used to throw an MPI:Exception object.
-.sp
-Before the error value is returned, the current MPI error handler is
-called. By default, this error handler aborts the MPI job, except for I/O function errors. The error handler may be changed with MPI_Comm_set_errhandler; the predefined error handler MPI_ERRORS_RETURN may be used to cause error values to be returned.  
-.sp
-See the MPI man page for a full list of MPI error codes. 
-
-.SH SEE ALSO
-MPI_Comm_connect
-MPI_Open_port
-.br
-
diff --git a/ompi/mpi/man/man3/MPI_Comm_accept.3in b/ompi/mpi/man/man3/MPI_Comm_accept.3in
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ompi/mpi/man/man3/MPI_Comm_c2f.3 b/ompi/mpi/man/man3/MPI_Comm_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Comm_c2f.3
rename to ompi/mpi/man/man3/MPI_Comm_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Comm_call_errhandler.3 b/ompi/mpi/man/man3/MPI_Comm_call_errhandler.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Comm_call_errhandler.3
rename to ompi/mpi/man/man3/MPI_Comm_call_errhandler.3in
index d6be72d5e3..5ec7735f7e 100644
--- a/ompi/mpi/man/man3/MPI_Comm_call_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Comm_call_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_call_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_call_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 
 \fBMPI_Comm_call_errhandler\fP \- Passes the supplied error code to the
diff --git a/ompi/mpi/man/man3/MPI_Comm_compare.3 b/ompi/mpi/man/man3/MPI_Comm_compare.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Comm_compare.3
rename to ompi/mpi/man/man3/MPI_Comm_compare.3in
index 8a9e75d94b..ef66efabb1 100644
--- a/ompi/mpi/man/man3/MPI_Comm_compare.3
+++ b/ompi/mpi/man/man3/MPI_Comm_compare.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_compare 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_compare 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_compare \fP \-  Compares two communicators.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_connect.3 b/ompi/mpi/man/man3/MPI_Comm_connect.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_connect.3
rename to ompi/mpi/man/man3/MPI_Comm_connect.3in
index 703a152535..592b3defc2 100644
--- a/ompi/mpi/man/man3/MPI_Comm_connect.3
+++ b/ompi/mpi/man/man3/MPI_Comm_connect.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_connect 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Comm_connect 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_connect \fP \- Establishes communication with a server. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_create.3 b/ompi/mpi/man/man3/MPI_Comm_create.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_create.3
rename to ompi/mpi/man/man3/MPI_Comm_create.3in
index 1b6de142c4..a3b3b4d75a 100644
--- a/ompi/mpi/man/man3/MPI_Comm_create.3
+++ b/ompi/mpi/man/man3/MPI_Comm_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_create\fP \- Creates a new communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_create_errhandler.3 b/ompi/mpi/man/man3/MPI_Comm_create_errhandler.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_create_errhandler.3
rename to ompi/mpi/man/man3/MPI_Comm_create_errhandler.3in
index 78872c15d7..112aceb707 100644
--- a/ompi/mpi/man/man3/MPI_Comm_create_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Comm_create_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_create_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_create_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_create_errhandler \fP \- Creates an error handler that can be attached to communicators. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_create_keyval.3 b/ompi/mpi/man/man3/MPI_Comm_create_keyval.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Comm_create_keyval.3
rename to ompi/mpi/man/man3/MPI_Comm_create_keyval.3in
index 84647ac01c..fe17405853 100644
--- a/ompi/mpi/man/man3/MPI_Comm_create_keyval.3
+++ b/ompi/mpi/man/man3/MPI_Comm_create_keyval.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_create_keyval 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_create_keyval 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_create_keyval\fP \- Generates a new attribute key. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_delete_attr.3 b/ompi/mpi/man/man3/MPI_Comm_delete_attr.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Comm_delete_attr.3
rename to ompi/mpi/man/man3/MPI_Comm_delete_attr.3in
index 387748afc9..8552469f6a 100644
--- a/ompi/mpi/man/man3/MPI_Comm_delete_attr.3
+++ b/ompi/mpi/man/man3/MPI_Comm_delete_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_delete_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_delete_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_delete_attr\fP \- Deletes attribute value associated with a key. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_disconnect.3 b/ompi/mpi/man/man3/MPI_Comm_disconnect.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_disconnect.3
rename to ompi/mpi/man/man3/MPI_Comm_disconnect.3in
index 22a3f532ca..37efa88bf3 100644
--- a/ompi/mpi/man/man3/MPI_Comm_disconnect.3
+++ b/ompi/mpi/man/man3/MPI_Comm_disconnect.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_disconnect 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_disconnect 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_disconnect\fP \- Deallocates communicator object and sets handle to MPI_COMM_NULL. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_dup.3 b/ompi/mpi/man/man3/MPI_Comm_dup.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_dup.3
rename to ompi/mpi/man/man3/MPI_Comm_dup.3in
index f66412dfb8..acf7c3174e 100644
--- a/ompi/mpi/man/man3/MPI_Comm_dup.3
+++ b/ompi/mpi/man/man3/MPI_Comm_dup.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_dup 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_dup 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_dup \fP \-  Duplicates an existing communicator with all its cached information.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_f2c.3 b/ompi/mpi/man/man3/MPI_Comm_f2c.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_f2c.3
rename to ompi/mpi/man/man3/MPI_Comm_f2c.3in
index 6f3f90eef6..2d93df74c3 100644
--- a/ompi/mpi/man/man3/MPI_Comm_f2c.3
+++ b/ompi/mpi/man/man3/MPI_Comm_f2c.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_f2c 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_f2c 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_f2c, MPI_Comm_c2f, MPI_File_f2c, MPI_File_c2f, MPI_Info_f2c, MPI_Info_c2f, MPI_Op_f2c, MPI_Op_c2f, MPI_Request_f2c, MPI_Request_c2f, MPI_Type_f2c, MPI_Type_c2f, MPI_Win_f2c, MPI_Win_c2f \fP \- Translates a C handle into a Fortran handle, or vice versa.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_free.3 b/ompi/mpi/man/man3/MPI_Comm_free.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Comm_free.3
rename to ompi/mpi/man/man3/MPI_Comm_free.3in
index c33ccfe244..8ca9c7f52e 100644
--- a/ompi/mpi/man/man3/MPI_Comm_free.3
+++ b/ompi/mpi/man/man3/MPI_Comm_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_free \fP \- Mark a communicator object for deallocation.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_free_keyval.3 b/ompi/mpi/man/man3/MPI_Comm_free_keyval.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Comm_free_keyval.3
rename to ompi/mpi/man/man3/MPI_Comm_free_keyval.3in
index 4322d801d2..392d5dd64c 100644
--- a/ompi/mpi/man/man3/MPI_Comm_free_keyval.3
+++ b/ompi/mpi/man/man3/MPI_Comm_free_keyval.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_free_keyval 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_free_keyval 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_free_keyval\fP \- Frees attribute key for communicator cache attribute.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_get_attr.3 b/ompi/mpi/man/man3/MPI_Comm_get_attr.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_get_attr.3
rename to ompi/mpi/man/man3/MPI_Comm_get_attr.3in
index c820967406..c0ad303620 100644
--- a/ompi/mpi/man/man3/MPI_Comm_get_attr.3
+++ b/ompi/mpi/man/man3/MPI_Comm_get_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_get_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_get_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_get_attr\fP \- Retrieves attribute value by key.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_get_errhandler.3 b/ompi/mpi/man/man3/MPI_Comm_get_errhandler.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Comm_get_errhandler.3
rename to ompi/mpi/man/man3/MPI_Comm_get_errhandler.3in
index d679740173..bc06674e9c 100644
--- a/ompi/mpi/man/man3/MPI_Comm_get_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Comm_get_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_get_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_get_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_get_errhandler \fP \- Retrieves error handler associated with a communicator. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_get_name.3 b/ompi/mpi/man/man3/MPI_Comm_get_name.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Comm_get_name.3
rename to ompi/mpi/man/man3/MPI_Comm_get_name.3in
index b46eb73753..40f14593bf 100644
--- a/ompi/mpi/man/man3/MPI_Comm_get_name.3
+++ b/ompi/mpi/man/man3/MPI_Comm_get_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_get_name 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_get_name 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_get_name\fP \- Returns the name that was most recently associated with a communicator. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_get_parent.3 b/ompi/mpi/man/man3/MPI_Comm_get_parent.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Comm_get_parent.3
rename to ompi/mpi/man/man3/MPI_Comm_get_parent.3in
index c019ab3c1d..45b24f2003 100644
--- a/ompi/mpi/man/man3/MPI_Comm_get_parent.3
+++ b/ompi/mpi/man/man3/MPI_Comm_get_parent.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_get_parent 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_get_parent 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_get_parent\fP \- Returns the parent intercommunicator of current spawned process. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_group.3 b/ompi/mpi/man/man3/MPI_Comm_group.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Comm_group.3
rename to ompi/mpi/man/man3/MPI_Comm_group.3in
index cc9d748da8..a10ab7a8ac 100644
--- a/ompi/mpi/man/man3/MPI_Comm_group.3
+++ b/ompi/mpi/man/man3/MPI_Comm_group.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_group 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_group 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_group \fP \- Returns the group associated with a communicator.  
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_join.3 b/ompi/mpi/man/man3/MPI_Comm_join.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_join.3
rename to ompi/mpi/man/man3/MPI_Comm_join.3in
index dd5c509f33..c8451e83a3 100644
--- a/ompi/mpi/man/man3/MPI_Comm_join.3
+++ b/ompi/mpi/man/man3/MPI_Comm_join.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_join 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_join 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Comm_join\fP \- Establishes communication between MPI jobs
diff --git a/ompi/mpi/man/man3/MPI_Comm_rank.3 b/ompi/mpi/man/man3/MPI_Comm_rank.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Comm_rank.3
rename to ompi/mpi/man/man3/MPI_Comm_rank.3in
index 4e6a56fbd8..26c10b1450 100644
--- a/ompi/mpi/man/man3/MPI_Comm_rank.3
+++ b/ompi/mpi/man/man3/MPI_Comm_rank.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_rank 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_rank 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_rank\fP \- Determines the rank of the calling process in the communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_remote_group.3 b/ompi/mpi/man/man3/MPI_Comm_remote_group.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Comm_remote_group.3
rename to ompi/mpi/man/man3/MPI_Comm_remote_group.3in
index 4fb847bd8e..23b52da49a 100644
--- a/ompi/mpi/man/man3/MPI_Comm_remote_group.3
+++ b/ompi/mpi/man/man3/MPI_Comm_remote_group.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_remote_group 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_remote_group 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_remote_group \fP \- Accesses the remote group associated with an intercommunicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_remote_size.3 b/ompi/mpi/man/man3/MPI_Comm_remote_size.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Comm_remote_size.3
rename to ompi/mpi/man/man3/MPI_Comm_remote_size.3in
index 99ef66cfe6..756102b830 100644
--- a/ompi/mpi/man/man3/MPI_Comm_remote_size.3
+++ b/ompi/mpi/man/man3/MPI_Comm_remote_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_remote_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_remote_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_remote_size \fP \- Determines the size of the remote group associated with an intercommunicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_set_attr.3 b/ompi/mpi/man/man3/MPI_Comm_set_attr.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Comm_set_attr.3
rename to ompi/mpi/man/man3/MPI_Comm_set_attr.3in
index 63f2aecd8c..9b5e20b75e 100644
--- a/ompi/mpi/man/man3/MPI_Comm_set_attr.3
+++ b/ompi/mpi/man/man3/MPI_Comm_set_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_set_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_set_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_set_attr\fP \- Stores attribute value associated with a key.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_set_errhandler.3 b/ompi/mpi/man/man3/MPI_Comm_set_errhandler.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Comm_set_errhandler.3
rename to ompi/mpi/man/man3/MPI_Comm_set_errhandler.3in
index 3c2d0fc987..7cf5e0ca59 100644
--- a/ompi/mpi/man/man3/MPI_Comm_set_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Comm_set_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_set_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_set_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_set_errhandler \fP \- Attaches a new error handler to a communicator. 
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_set_name.3 b/ompi/mpi/man/man3/MPI_Comm_set_name.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Comm_set_name.3
rename to ompi/mpi/man/man3/MPI_Comm_set_name.3in
index b4912f507c..dc08a05471 100644
--- a/ompi/mpi/man/man3/MPI_Comm_set_name.3
+++ b/ompi/mpi/man/man3/MPI_Comm_set_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Comm_set_name 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_set_name 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_set_name\fP \- Associates a name with a communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_size.3 b/ompi/mpi/man/man3/MPI_Comm_size.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_size.3
rename to ompi/mpi/man/man3/MPI_Comm_size.3in
index 3846763c57..0f5cf75997 100644
--- a/ompi/mpi/man/man3/MPI_Comm_size.3
+++ b/ompi/mpi/man/man3/MPI_Comm_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_size \fP \- Returns the size of the group associated with a communicator.  
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_spawn.3 b/ompi/mpi/man/man3/MPI_Comm_spawn.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Comm_spawn.3
rename to ompi/mpi/man/man3/MPI_Comm_spawn.3in
index e2243ba8c1..5fddde65c3 100644
--- a/ompi/mpi/man/man3/MPI_Comm_spawn.3
+++ b/ompi/mpi/man/man3/MPI_Comm_spawn.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_spawn 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_spawn 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_spawn\fP \- Spawns a number of identical binaries. 
 
@@ -101,13 +101,12 @@ The following keys for \fIinfo\fP are recognized in Open MPI. (The reserved valu
 Key                   Type      Description
 ---                   ----      -----------
 
-host                  char *    Comma-deliminated list of hosts upon which
-                                the process(es) should be spawned.
-                                See the \fIorte_hosts\fP man page for an
+host                  char *    Host on which the process should be spawned.
+                                See the \fIorte_host\fP man page for an
                                 explanation of how this will be used.
 hostfile              char *    Hostfile containing the hosts on which
-                                the process(es) are to be spawned. See
-                                the \ fIorte_hosts\fP man page for an
+                                the processes are to be spawned. See
+                                the \fIorte_hostfile\fP man page for an
                                 explanation of how this will be used.
 wdir                  char *    Directory where the executable is located.
 ompi_prefix           char *    Same as the --prefix command line argument
diff --git a/ompi/mpi/man/man3/MPI_Comm_spawn_multiple.3 b/ompi/mpi/man/man3/MPI_Comm_spawn_multiple.3in
similarity index 85%
rename from ompi/mpi/man/man3/MPI_Comm_spawn_multiple.3
rename to ompi/mpi/man/man3/MPI_Comm_spawn_multiple.3in
index 88f05fd436..8a293277d9 100644
--- a/ompi/mpi/man/man3/MPI_Comm_spawn_multiple.3
+++ b/ompi/mpi/man/man3/MPI_Comm_spawn_multiple.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_spawn_multiple 3OpenMPI "July 2008" "Open MPI 1.3" " "
+.TH MPI_Comm_spawn_multiple 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_spawn_multiple\fP \- Spawns multiple binaries, or the same binary with multiple sets of arguments. 
 
@@ -105,30 +105,20 @@ Error codes are treated as for MPI_Comm_spawn.
 
  
 .SH INFO ARGUMENTS
-The following keys for \fIinfo\fP are recognized in Open MPI 1.3. (The reserved values mentioned in Section 5.3.4 of the MPI-2 standard are not implemented.)
+The following keys for \fIinfo\fP are recognized in "#PACKAGE_NAME#". (The reserved values mentioned in Section 5.3.4 of the MPI-2 standard are not implemented.)
 .sp
 .sp
 .nf
 Key                   Type      Description
 ---                   ----      -----------
 
-host                  char *    Comma-deliminated list of hosts upon which
-                                the process(es) should be spawned.
-                                See the \fIorte_hosts\fP man page for an
-                                explanation of how this will be used.
-hostfile              char *    Hostfile containing the hosts on which
-                                the process(es) are to be spawned. See
-                                the \ fIorte_hosts\fP man page for an
-                                explanation of how this will be used.
+host                  char *    Host on which the process should be spawned.
 wdir                  char *    Directory where the executable is located.
 ompi_prefix           char *    Same as the --prefix command line argument
                                 to mpirun.
 ompi_non_mpi          bool      If set to true, launching a non-MPI
                                 application; the returned communicator
-                                will be MPI_COMM_NULL. Failure to set
-                                this flag when launching a non-MPI
-                                application will cause both the child
-                                and parent jobs to "hang".
+                                will be MPI_COMM_NULL.
 .fi
 
 .sp 
@@ -147,7 +137,7 @@ to true, but others are set to false (or are unset), MPI_ERR_INFO will
 be returned.
   
 .sp
-Note that in Open MPI 1.e, the first array location in \fIarray_of_info\fP is applied to all the commands in \fIarray_of_commands\fP. 
+Note that in "#PACKAGE_NAME#", the first array location in \fIarray_of_info\fP is applied to all the commands in \fIarray_of_commands\fP. 
 
 .SH NOTES
 The argument \fIcount\fP is interpreted by MPI only at the root, as is \fIarray_of_argv\fP. Since the leading dimension of \fIarray_of_argv\fP is \fIcount\fP, a nonpositive value of \fIcount\fP at a nonroot node could theoretically cause a runtime bounds check error, even though \fIarray_of_argv\fP should be ignored by the subroutine. If this happens, you should explicitly supply a reasonable value of \fIcount\fP on the nonroot nodes. 
diff --git a/ompi/mpi/man/man3/MPI_Comm_split.3 b/ompi/mpi/man/man3/MPI_Comm_split.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Comm_split.3
rename to ompi/mpi/man/man3/MPI_Comm_split.3in
index 8c4143c8c7..ae629eaaa5 100644
--- a/ompi/mpi/man/man3/MPI_Comm_split.3
+++ b/ompi/mpi/man/man3/MPI_Comm_split.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_split 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_split 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_split \fP \- Creates new communicators based on colors and keys.
 
diff --git a/ompi/mpi/man/man3/MPI_Comm_test_inter.3 b/ompi/mpi/man/man3/MPI_Comm_test_inter.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Comm_test_inter.3
rename to ompi/mpi/man/man3/MPI_Comm_test_inter.3in
index a61d81ebd7..745bf1db99 100644
--- a/ompi/mpi/man/man3/MPI_Comm_test_inter.3
+++ b/ompi/mpi/man/man3/MPI_Comm_test_inter.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Comm_test_inter 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Comm_test_inter 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Comm_test_inter \fP \- Tests to see if a comm is an intercommunicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Dims_create.3 b/ompi/mpi/man/man3/MPI_Dims_create.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Dims_create.3
rename to ompi/mpi/man/man3/MPI_Dims_create.3in
index d5c80dfa1a..015bbd10f9 100644
--- a/ompi/mpi/man/man3/MPI_Dims_create.3
+++ b/ompi/mpi/man/man3/MPI_Dims_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Dims_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Dims_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Dims_create \fP \- Creates a division of processors in a Cartesian grid.
 
diff --git a/ompi/mpi/man/man3/MPI_Errhandler_create.3 b/ompi/mpi/man/man3/MPI_Errhandler_create.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Errhandler_create.3
rename to ompi/mpi/man/man3/MPI_Errhandler_create.3in
index 1c871d4476..8d02486706 100644
--- a/ompi/mpi/man/man3/MPI_Errhandler_create.3
+++ b/ompi/mpi/man/man3/MPI_Errhandler_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Errhandler_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Errhandler_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Errhandler_create \fP \- Creates an MPI-style error handler -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Errhandler_free.3 b/ompi/mpi/man/man3/MPI_Errhandler_free.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Errhandler_free.3
rename to ompi/mpi/man/man3/MPI_Errhandler_free.3in
index 2c0452bac1..bef6fe27b1 100644
--- a/ompi/mpi/man/man3/MPI_Errhandler_free.3
+++ b/ompi/mpi/man/man3/MPI_Errhandler_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Errhandler_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Errhandler_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Errhandler_free \fP \- Frees an MPI-style error handler.
 
diff --git a/ompi/mpi/man/man3/MPI_Errhandler_get.3 b/ompi/mpi/man/man3/MPI_Errhandler_get.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Errhandler_get.3
rename to ompi/mpi/man/man3/MPI_Errhandler_get.3in
index f3b8cf43cb..d1442ca816 100644
--- a/ompi/mpi/man/man3/MPI_Errhandler_get.3
+++ b/ompi/mpi/man/man3/MPI_Errhandler_get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Errhandler_get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Errhandler_get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Errhandler_get \fP \- Gets the error handler for a communicator -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Errhandler_set.3 b/ompi/mpi/man/man3/MPI_Errhandler_set.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Errhandler_set.3
rename to ompi/mpi/man/man3/MPI_Errhandler_set.3in
index e22c07afdf..b0fee87ab8 100644
--- a/ompi/mpi/man/man3/MPI_Errhandler_set.3
+++ b/ompi/mpi/man/man3/MPI_Errhandler_set.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Errhandler_set 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Errhandler_set 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Errhandler_set \fP \- Sets the error handler for a communicator -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Error_class.3 b/ompi/mpi/man/man3/MPI_Error_class.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Error_class.3
rename to ompi/mpi/man/man3/MPI_Error_class.3in
index ce9d07a635..c976263e63 100644
--- a/ompi/mpi/man/man3/MPI_Error_class.3
+++ b/ompi/mpi/man/man3/MPI_Error_class.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Error_class 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Error_class 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Error_class \fP \- Converts an error code into an error class.
 
diff --git a/ompi/mpi/man/man3/MPI_Error_string.3 b/ompi/mpi/man/man3/MPI_Error_string.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Error_string.3
rename to ompi/mpi/man/man3/MPI_Error_string.3in
index 24efdbb005..5b5784d361 100644
--- a/ompi/mpi/man/man3/MPI_Error_string.3
+++ b/ompi/mpi/man/man3/MPI_Error_string.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Error_string 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Error_string 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Error_string \fP \- Returns a string for a given error code.
 
diff --git a/ompi/mpi/man/man3/MPI_Exscan.3 b/ompi/mpi/man/man3/MPI_Exscan.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Exscan.3
rename to ompi/mpi/man/man3/MPI_Exscan.3in
index c4615bfb42..ef3b6884b9 100644
--- a/ompi/mpi/man/man3/MPI_Exscan.3
+++ b/ompi/mpi/man/man3/MPI_Exscan.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Exscan 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Exscan 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Exscan\fP \- Computes an exclusive scan (partial reduction)
diff --git a/ompi/mpi/man/man3/MPI_File_c2f.3 b/ompi/mpi/man/man3/MPI_File_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_File_c2f.3
rename to ompi/mpi/man/man3/MPI_File_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_File_call_errhandler.3 b/ompi/mpi/man/man3/MPI_File_call_errhandler.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_File_call_errhandler.3
rename to ompi/mpi/man/man3/MPI_File_call_errhandler.3in
index 67a4eb3a38..ed9d5ec143 100644
--- a/ompi/mpi/man/man3/MPI_File_call_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_File_call_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_call_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_call_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_File_call_errhandler\fP \- Passes the supplied error code to the
diff --git a/ompi/mpi/man/man3/MPI_File_close.3 b/ompi/mpi/man/man3/MPI_File_close.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_File_close.3
rename to ompi/mpi/man/man3/MPI_File_close.3in
index 7797e20952..c80cd03a3d 100644
--- a/ompi/mpi/man/man3/MPI_File_close.3
+++ b/ompi/mpi/man/man3/MPI_File_close.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_close 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_close 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_close\fP \- Closes a file (collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_create_errhandler.3 b/ompi/mpi/man/man3/MPI_File_create_errhandler.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_create_errhandler.3
rename to ompi/mpi/man/man3/MPI_File_create_errhandler.3in
index 75b18e753f..a291d8b388 100644
--- a/ompi/mpi/man/man3/MPI_File_create_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_File_create_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_create_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_create_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_create_errhandler \fP \- Creates an MPI-style error handler that can be attached to a file. 
 
diff --git a/ompi/mpi/man/man3/MPI_File_delete.3 b/ompi/mpi/man/man3/MPI_File_delete.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_File_delete.3
rename to ompi/mpi/man/man3/MPI_File_delete.3in
index a8a30b41ee..32b7f97d8a 100644
--- a/ompi/mpi/man/man3/MPI_File_delete.3
+++ b/ompi/mpi/man/man3/MPI_File_delete.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_delete 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_delete 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_delete\fP \- Deletes a file.
 
diff --git a/ompi/mpi/man/man3/MPI_File_f2c.3 b/ompi/mpi/man/man3/MPI_File_f2c.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_File_f2c.3
rename to ompi/mpi/man/man3/MPI_File_f2c.3in
diff --git a/ompi/mpi/man/man3/MPI_File_get_amode.3 b/ompi/mpi/man/man3/MPI_File_get_amode.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_File_get_amode.3
rename to ompi/mpi/man/man3/MPI_File_get_amode.3in
index 6e10204048..6b5f27a367 100644
--- a/ompi/mpi/man/man3/MPI_File_get_amode.3
+++ b/ompi/mpi/man/man3/MPI_File_get_amode.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_amode 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_amode 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_amode\fP \- Returns access mode associated with an open file.
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_atomicity.3 b/ompi/mpi/man/man3/MPI_File_get_atomicity.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_File_get_atomicity.3
rename to ompi/mpi/man/man3/MPI_File_get_atomicity.3in
index 14d8279e8a..01a3666fd5 100644
--- a/ompi/mpi/man/man3/MPI_File_get_atomicity.3
+++ b/ompi/mpi/man/man3/MPI_File_get_atomicity.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_atomicity 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_atomicity 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_atomicity\fP \- Returns current consistency semantics for data-access operations.
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_byte_offset.3 b/ompi/mpi/man/man3/MPI_File_get_byte_offset.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_get_byte_offset.3
rename to ompi/mpi/man/man3/MPI_File_get_byte_offset.3in
index f8e959aa14..4584de3b02 100644
--- a/ompi/mpi/man/man3/MPI_File_get_byte_offset.3
+++ b/ompi/mpi/man/man3/MPI_File_get_byte_offset.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_byte_offset 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_byte_offset 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_byte_offset\fP \- Converts a view-relative offset into an absolute byte position.
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_errhandler.3 b/ompi/mpi/man/man3/MPI_File_get_errhandler.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_File_get_errhandler.3
rename to ompi/mpi/man/man3/MPI_File_get_errhandler.3in
index a28e63f960..bc9dfc5876 100644
--- a/ompi/mpi/man/man3/MPI_File_get_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_File_get_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_errhandler \fP \- Gets the error handler for a file. 
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_group.3 b/ompi/mpi/man/man3/MPI_File_get_group.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_File_get_group.3
rename to ompi/mpi/man/man3/MPI_File_get_group.3in
index d92140c836..d63c9b7a11 100644
--- a/ompi/mpi/man/man3/MPI_File_get_group.3
+++ b/ompi/mpi/man/man3/MPI_File_get_group.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_group 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_group 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_group\fP \- Returns a duplicate of the process group of a file.
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_info.3 b/ompi/mpi/man/man3/MPI_File_get_info.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_File_get_info.3
rename to ompi/mpi/man/man3/MPI_File_get_info.3in
index 9199a31f23..47069c49ed 100644
--- a/ompi/mpi/man/man3/MPI_File_get_info.3
+++ b/ompi/mpi/man/man3/MPI_File_get_info.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_info 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_info 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_info\fP \- Returns a new info object containing values for current hints associated with a file. 
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_position.3 b/ompi/mpi/man/man3/MPI_File_get_position.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_get_position.3
rename to ompi/mpi/man/man3/MPI_File_get_position.3in
index 5a319fd9e3..d6ae3d7cbf 100644
--- a/ompi/mpi/man/man3/MPI_File_get_position.3
+++ b/ompi/mpi/man/man3/MPI_File_get_position.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_position 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_position 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_position\fP \- Returns the current position of the individual file pointer.
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_position_shared.3 b/ompi/mpi/man/man3/MPI_File_get_position_shared.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_get_position_shared.3
rename to ompi/mpi/man/man3/MPI_File_get_position_shared.3in
index cb073128d1..e8f7ec5f70 100644
--- a/ompi/mpi/man/man3/MPI_File_get_position_shared.3
+++ b/ompi/mpi/man/man3/MPI_File_get_position_shared.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_position_shared 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_position_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_position_shared\fP \- Returns the current position of the shared file pointer.
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_size.3 b/ompi/mpi/man/man3/MPI_File_get_size.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_get_size.3
rename to ompi/mpi/man/man3/MPI_File_get_size.3in
index 8cf4f3d070..9dc156a4e1 100644
--- a/ompi/mpi/man/man3/MPI_File_get_size.3
+++ b/ompi/mpi/man/man3/MPI_File_get_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_size\fP \- Returns the current size of the file.
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_type_extent.3 b/ompi/mpi/man/man3/MPI_File_get_type_extent.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_get_type_extent.3
rename to ompi/mpi/man/man3/MPI_File_get_type_extent.3in
index 216c12a772..95b00ded26 100644
--- a/ompi/mpi/man/man3/MPI_File_get_type_extent.3
+++ b/ompi/mpi/man/man3/MPI_File_get_type_extent.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_type_extent 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_type_extent 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_type_extent\fP \- Returns the extent of the data type in a file. 
 
diff --git a/ompi/mpi/man/man3/MPI_File_get_view.3 b/ompi/mpi/man/man3/MPI_File_get_view.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_get_view.3
rename to ompi/mpi/man/man3/MPI_File_get_view.3in
index 6675cb4f6d..3dba5dcd14 100644
--- a/ompi/mpi/man/man3/MPI_File_get_view.3
+++ b/ompi/mpi/man/man3/MPI_File_get_view.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_get_view 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_get_view 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_get_view\fP \- Returns the process's view of data in the file.
 
diff --git a/ompi/mpi/man/man3/MPI_File_iread.3 b/ompi/mpi/man/man3/MPI_File_iread.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_iread.3
rename to ompi/mpi/man/man3/MPI_File_iread.3in
index a8593b34a4..1ce98c593a 100644
--- a/ompi/mpi/man/man3/MPI_File_iread.3
+++ b/ompi/mpi/man/man3/MPI_File_iread.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_iread 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_iread 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_iread\fP \- Reads a file starting at the location specified by the individual file pointer (nonblocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_iread_at.3 b/ompi/mpi/man/man3/MPI_File_iread_at.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_iread_at.3
rename to ompi/mpi/man/man3/MPI_File_iread_at.3in
index d589f0ce70..1a94e44081 100644
--- a/ompi/mpi/man/man3/MPI_File_iread_at.3
+++ b/ompi/mpi/man/man3/MPI_File_iread_at.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_iread_at 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_iread_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_iread_at\fP \- Reads a file at an explicitly specified offset (nonblocking, noncollective). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_iread_shared.3 b/ompi/mpi/man/man3/MPI_File_iread_shared.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_iread_shared.3
rename to ompi/mpi/man/man3/MPI_File_iread_shared.3in
index 98346f4227..c0b17641fe 100644
--- a/ompi/mpi/man/man3/MPI_File_iread_shared.3
+++ b/ompi/mpi/man/man3/MPI_File_iread_shared.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_iread_shared 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_iread_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_iread_shared\fP \- Reads a file using the shared file pointer (nonblocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite.3 b/ompi/mpi/man/man3/MPI_File_iwrite.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_iwrite.3
rename to ompi/mpi/man/man3/MPI_File_iwrite.3in
index 09be841878..dee36018f9 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite.3
+++ b/ompi/mpi/man/man3/MPI_File_iwrite.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_iwrite 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_iwrite 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_iwrite\fP \- Writes a file starting at the location specified by the individual file pointer (nonblocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite_at.3 b/ompi/mpi/man/man3/MPI_File_iwrite_at.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_iwrite_at.3
rename to ompi/mpi/man/man3/MPI_File_iwrite_at.3in
index f6aaa9fa13..c1f6fc1041 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite_at.3
+++ b/ompi/mpi/man/man3/MPI_File_iwrite_at.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_iwrite_at 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_iwrite_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_iwrite_at\fP \- Writes a file at an explicitly specified offset (nonblocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_iwrite_shared.3 b/ompi/mpi/man/man3/MPI_File_iwrite_shared.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_iwrite_shared.3
rename to ompi/mpi/man/man3/MPI_File_iwrite_shared.3in
index 967c178453..d4b6c6c0b8 100644
--- a/ompi/mpi/man/man3/MPI_File_iwrite_shared.3
+++ b/ompi/mpi/man/man3/MPI_File_iwrite_shared.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_iwrite_shared 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_iwrite_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_iwrite_shared\fP \- Writes a file using the shared file pointer (nonblocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_open.3 b/ompi/mpi/man/man3/MPI_File_open.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_File_open.3
rename to ompi/mpi/man/man3/MPI_File_open.3in
index 29068a472c..c682c4b977 100644
--- a/ompi/mpi/man/man3/MPI_File_open.3
+++ b/ompi/mpi/man/man3/MPI_File_open.3in
@@ -1,7 +1,7 @@
 
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_open 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_open 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_open\fP \- Opens a file (collective).
 .SH SYNTAX
diff --git a/ompi/mpi/man/man3/MPI_File_preallocate.3 b/ompi/mpi/man/man3/MPI_File_preallocate.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_preallocate.3
rename to ompi/mpi/man/man3/MPI_File_preallocate.3in
index bc2f1046f0..9e987b0ff1 100644
--- a/ompi/mpi/man/man3/MPI_File_preallocate.3
+++ b/ompi/mpi/man/man3/MPI_File_preallocate.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_preallocate 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_preallocate 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_preallocate\fP \- Preallocates a specified amount of storage space  at the beginning of a file (collective). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_read.3 b/ompi/mpi/man/man3/MPI_File_read.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read.3
rename to ompi/mpi/man/man3/MPI_File_read.3in
index 37de4ccfb5..422090b197 100644
--- a/ompi/mpi/man/man3/MPI_File_read.3
+++ b/ompi/mpi/man/man3/MPI_File_read.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read\fP \- Reads a file starting at the location specified by the individual file pointer (blocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_all.3 b/ompi/mpi/man/man3/MPI_File_read_all.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read_all.3
rename to ompi/mpi/man/man3/MPI_File_read_all.3in
index 24d0498147..60e11c07ce 100644
--- a/ompi/mpi/man/man3/MPI_File_read_all.3
+++ b/ompi/mpi/man/man3/MPI_File_read_all.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_all 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_all\fP \- Reads a file starting at the locations specified by individual file pointers (blocking, collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_all_begin.3 b/ompi/mpi/man/man3/MPI_File_read_all_begin.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read_all_begin.3
rename to ompi/mpi/man/man3/MPI_File_read_all_begin.3in
index 5ea0b5dd34..71d62e72d7 100644
--- a/ompi/mpi/man/man3/MPI_File_read_all_begin.3
+++ b/ompi/mpi/man/man3/MPI_File_read_all_begin.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_all_begin 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_all_begin\fP \- Reads a file starting at the locations specified by individual file pointers; beginning part of a split collective routine (nonblocking). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_all_end.3 b/ompi/mpi/man/man3/MPI_File_read_all_end.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read_all_end.3
rename to ompi/mpi/man/man3/MPI_File_read_all_end.3in
index a4fff99fbd..5839116c9b 100644
--- a/ompi/mpi/man/man3/MPI_File_read_all_end.3
+++ b/ompi/mpi/man/man3/MPI_File_read_all_end.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_all_end 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_all_end\fP \- Reads a file starting at the locations specified by individual file pointers; ending part of a split collective routine (blocking). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_at.3 b/ompi/mpi/man/man3/MPI_File_read_at.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_read_at.3
rename to ompi/mpi/man/man3/MPI_File_read_at.3in
index 27c133e4bf..097519c93d 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at.3
+++ b/ompi/mpi/man/man3/MPI_File_read_at.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_at 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_at\fP \- Reads a file at an explicitly specified offset (blocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_at_all.3 b/ompi/mpi/man/man3/MPI_File_read_at_all.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_read_at_all.3
rename to ompi/mpi/man/man3/MPI_File_read_at_all.3in
index f2dd563e0a..1daf9aa4d7 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at_all.3
+++ b/ompi/mpi/man/man3/MPI_File_read_at_all.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_at_all 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_at_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_at_all\fP \- Reads a file at explicitly specified offsets (blocking, collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3 b/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read_at_all_begin.3
rename to ompi/mpi/man/man3/MPI_File_read_at_all_begin.3in
index 72af5b5de8..5e21cd5fb9 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3
+++ b/ompi/mpi/man/man3/MPI_File_read_at_all_begin.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_at_all_begin 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_at_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_at_all_begin\fP \- Reads a file at explicitly specified offsets; beginning part of a split collective routine (nonblocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_at_all_end.3 b/ompi/mpi/man/man3/MPI_File_read_at_all_end.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_read_at_all_end.3
rename to ompi/mpi/man/man3/MPI_File_read_at_all_end.3in
index 535cc3740d..544c9588f4 100644
--- a/ompi/mpi/man/man3/MPI_File_read_at_all_end.3
+++ b/ompi/mpi/man/man3/MPI_File_read_at_all_end.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_at_all_end 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_at_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_at_all_end\fP \- Reads a file at explicitly specified offsets; ending part of a split collective routine (blocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_ordered.3 b/ompi/mpi/man/man3/MPI_File_read_ordered.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read_ordered.3
rename to ompi/mpi/man/man3/MPI_File_read_ordered.3in
index 4d293a0819..297820f9d8 100644
--- a/ompi/mpi/man/man3/MPI_File_read_ordered.3
+++ b/ompi/mpi/man/man3/MPI_File_read_ordered.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_ordered 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_ordered 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_ordered\fP \- Reads a file at a location specified by a shared file pointer (blocking, collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3 b/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read_ordered_begin.3
rename to ompi/mpi/man/man3/MPI_File_read_ordered_begin.3in
index 65b0d40aa2..a9e4faa3c4 100644
--- a/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3
+++ b/ompi/mpi/man/man3/MPI_File_read_ordered_begin.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_ordered_begin 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_ordered_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_ordered_begin\fP \- Reads a file at a location specified by a shared file pointer; beginning part of a split collective routine (nonblocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_ordered_end.3 b/ompi/mpi/man/man3/MPI_File_read_ordered_end.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_read_ordered_end.3
rename to ompi/mpi/man/man3/MPI_File_read_ordered_end.3in
index 1617a0c529..e50ba7d601 100644
--- a/ompi/mpi/man/man3/MPI_File_read_ordered_end.3
+++ b/ompi/mpi/man/man3/MPI_File_read_ordered_end.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_ordered_end 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_ordered_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_ordered_end\fP \- Reads a file at a location specified by a shared file pointer; ending part of a split collective routine (blocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_read_shared.3 b/ompi/mpi/man/man3/MPI_File_read_shared.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_read_shared.3
rename to ompi/mpi/man/man3/MPI_File_read_shared.3in
index 5a443dd571..cf887cfc0e 100644
--- a/ompi/mpi/man/man3/MPI_File_read_shared.3
+++ b/ompi/mpi/man/man3/MPI_File_read_shared.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_read_shared 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_read_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_read_shared\fP \- Reads a file using the shared file pointer (blocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_seek.3 b/ompi/mpi/man/man3/MPI_File_seek.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_seek.3
rename to ompi/mpi/man/man3/MPI_File_seek.3in
index 5ed5707562..6a3cec3cb9 100644
--- a/ompi/mpi/man/man3/MPI_File_seek.3
+++ b/ompi/mpi/man/man3/MPI_File_seek.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_seek 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_seek 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_seek\fP \- Updates individual file pointers (noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_seek_shared.3 b/ompi/mpi/man/man3/MPI_File_seek_shared.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_seek_shared.3
rename to ompi/mpi/man/man3/MPI_File_seek_shared.3in
index 43e6508d6e..350be92279 100644
--- a/ompi/mpi/man/man3/MPI_File_seek_shared.3
+++ b/ompi/mpi/man/man3/MPI_File_seek_shared.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_seek_shared 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_seek_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_seek_shared\fP \- Updates the global shared file pointer (collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_atomicity.3 b/ompi/mpi/man/man3/MPI_File_set_atomicity.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_set_atomicity.3
rename to ompi/mpi/man/man3/MPI_File_set_atomicity.3in
index 591abcf93e..883c04add2 100644
--- a/ompi/mpi/man/man3/MPI_File_set_atomicity.3
+++ b/ompi/mpi/man/man3/MPI_File_set_atomicity.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_set_atomicity 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_set_atomicity 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_set_atomicity\fP \- Sets consistency semantics for data-access operations (collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_errhandler.3 b/ompi/mpi/man/man3/MPI_File_set_errhandler.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_File_set_errhandler.3
rename to ompi/mpi/man/man3/MPI_File_set_errhandler.3in
index 70ce152e10..78de03ca40 100644
--- a/ompi/mpi/man/man3/MPI_File_set_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_File_set_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_set_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_set_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_set_errhandler \fP \- Sets the error handler for a file. 
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_info.3 b/ompi/mpi/man/man3/MPI_File_set_info.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_File_set_info.3
rename to ompi/mpi/man/man3/MPI_File_set_info.3in
index 43fe5b3d1c..22f7a0275c 100644
--- a/ompi/mpi/man/man3/MPI_File_set_info.3
+++ b/ompi/mpi/man/man3/MPI_File_set_info.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_set_info 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_set_info 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_set_info\fP \- Sets new values for hints (collective). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_size.3 b/ompi/mpi/man/man3/MPI_File_set_size.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_set_size.3
rename to ompi/mpi/man/man3/MPI_File_set_size.3in
index 70b288620e..94ed09d9b6 100644
--- a/ompi/mpi/man/man3/MPI_File_set_size.3
+++ b/ompi/mpi/man/man3/MPI_File_set_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_set_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_set_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_set_size\fP \- Resizes a file (collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_set_view.3 b/ompi/mpi/man/man3/MPI_File_set_view.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_File_set_view.3
rename to ompi/mpi/man/man3/MPI_File_set_view.3in
index 7a8fbf37b8..0df4823fa3 100644
--- a/ompi/mpi/man/man3/MPI_File_set_view.3
+++ b/ompi/mpi/man/man3/MPI_File_set_view.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_set_view 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_set_view 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_set_view\fP \- Changes process's view of data in file (collective).
 .SH SYNTAX
diff --git a/ompi/mpi/man/man3/MPI_File_sync.3 b/ompi/mpi/man/man3/MPI_File_sync.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_File_sync.3
rename to ompi/mpi/man/man3/MPI_File_sync.3in
index 7f222ae2df..f8f8dfea72 100644
--- a/ompi/mpi/man/man3/MPI_File_sync.3
+++ b/ompi/mpi/man/man3/MPI_File_sync.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_sync 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_sync 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_sync\fP \- Makes semantics consistent for data-access operations (collective). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_write.3 b/ompi/mpi/man/man3/MPI_File_write.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_write.3
rename to ompi/mpi/man/man3/MPI_File_write.3in
index aa182c67ed..dd4c140c09 100644
--- a/ompi/mpi/man/man3/MPI_File_write.3
+++ b/ompi/mpi/man/man3/MPI_File_write.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write\fP \- Writes a file starting at the location specified by the individual file pointer (blocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_all.3 b/ompi/mpi/man/man3/MPI_File_write_all.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_write_all.3
rename to ompi/mpi/man/man3/MPI_File_write_all.3in
index 06c7325d3c..0fd6bf3dc7 100644
--- a/ompi/mpi/man/man3/MPI_File_write_all.3
+++ b/ompi/mpi/man/man3/MPI_File_write_all.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_all 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_all\fP \- Writes a file starting at the locations specified by individual file pointers (blocking, collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_all_begin.3 b/ompi/mpi/man/man3/MPI_File_write_all_begin.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_write_all_begin.3
rename to ompi/mpi/man/man3/MPI_File_write_all_begin.3in
index e220933317..e31862f71e 100644
--- a/ompi/mpi/man/man3/MPI_File_write_all_begin.3
+++ b/ompi/mpi/man/man3/MPI_File_write_all_begin.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_all_begin 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_all_begin\fP \- Writes a file starting at the locations specified by individual file pointers; beginning part of a split collective routine (nonblocking). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_all_end.3 b/ompi/mpi/man/man3/MPI_File_write_all_end.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_write_all_end.3
rename to ompi/mpi/man/man3/MPI_File_write_all_end.3in
index 44a2ea7390..45a6a1084e 100644
--- a/ompi/mpi/man/man3/MPI_File_write_all_end.3
+++ b/ompi/mpi/man/man3/MPI_File_write_all_end.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_all_end 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_all_end\fP \- Writes a file starting at the locations specified by individual file pointers; ending part of a split collective routine (blocking). 
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_at.3 b/ompi/mpi/man/man3/MPI_File_write_at.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_write_at.3
rename to ompi/mpi/man/man3/MPI_File_write_at.3in
index cf01fb28f1..143fc1ac76 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at.3
+++ b/ompi/mpi/man/man3/MPI_File_write_at.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_at 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_at 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_at\fP \- Writes a file at an explicitly specified offset (blocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_at_all.3 b/ompi/mpi/man/man3/MPI_File_write_at_all.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_File_write_at_all.3
rename to ompi/mpi/man/man3/MPI_File_write_at_all.3in
index b6680daf24..e80f0edb22 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at_all.3
+++ b/ompi/mpi/man/man3/MPI_File_write_at_all.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_at_all 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_at_all 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_at_all\fP \- Writes a file at explicitly specified offsets (blocking, collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3 b/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_write_at_all_begin.3
rename to ompi/mpi/man/man3/MPI_File_write_at_all_begin.3in
index e9487e4fd9..49a55713d0 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3
+++ b/ompi/mpi/man/man3/MPI_File_write_at_all_begin.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_at_all_begin 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_at_all_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_at_all_begin\fP \- Writes a file at explicitly specified offsets; beginning part of a split collective routine (nonblocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_at_all_end.3 b/ompi/mpi/man/man3/MPI_File_write_at_all_end.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_write_at_all_end.3
rename to ompi/mpi/man/man3/MPI_File_write_at_all_end.3in
index 1afb96b62c..72bfbaa83d 100644
--- a/ompi/mpi/man/man3/MPI_File_write_at_all_end.3
+++ b/ompi/mpi/man/man3/MPI_File_write_at_all_end.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_at_all_end 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_at_all_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_at_all_end\fP \- Writes a file at explicitly specified offsets; ending part of a split collective routine (blocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_ordered.3 b/ompi/mpi/man/man3/MPI_File_write_ordered.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_write_ordered.3
rename to ompi/mpi/man/man3/MPI_File_write_ordered.3in
index 947a57575f..0b80b851b2 100644
--- a/ompi/mpi/man/man3/MPI_File_write_ordered.3
+++ b/ompi/mpi/man/man3/MPI_File_write_ordered.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_ordered 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_ordered 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_ordered\fP \- Writes a file at a location specified by a shared file pointer (blocking, collective).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3 b/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_File_write_ordered_begin.3
rename to ompi/mpi/man/man3/MPI_File_write_ordered_begin.3in
index f09c74aada..9dc250b4af 100644
--- a/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3
+++ b/ompi/mpi/man/man3/MPI_File_write_ordered_begin.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_ordered_begin 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_ordered_begin 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_ordered_begin\fP \- Writes a file at a location specified by a shared file pointer; beginning part of a split collective routine (nonblocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_ordered_end.3 b/ompi/mpi/man/man3/MPI_File_write_ordered_end.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_write_ordered_end.3
rename to ompi/mpi/man/man3/MPI_File_write_ordered_end.3in
index 4454a40fd5..86b910de84 100644
--- a/ompi/mpi/man/man3/MPI_File_write_ordered_end.3
+++ b/ompi/mpi/man/man3/MPI_File_write_ordered_end.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_ordered_end 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_ordered_end 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_ordered_end\fP \- Writes a file at a location specified by a shared file pointer; ending part of a split collective routine (blocking).
 
diff --git a/ompi/mpi/man/man3/MPI_File_write_shared.3 b/ompi/mpi/man/man3/MPI_File_write_shared.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_File_write_shared.3
rename to ompi/mpi/man/man3/MPI_File_write_shared.3in
index 8e26769ace..bbca91326e 100644
--- a/ompi/mpi/man/man3/MPI_File_write_shared.3
+++ b/ompi/mpi/man/man3/MPI_File_write_shared.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_File_write_shared 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_File_write_shared 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_File_write_shared\fP \- Writes a file using the shared file pointer (blocking, noncollective).
 
diff --git a/ompi/mpi/man/man3/MPI_Finalize.3 b/ompi/mpi/man/man3/MPI_Finalize.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Finalize.3
rename to ompi/mpi/man/man3/MPI_Finalize.3in
index e15cc8ea4d..d96df17646 100644
--- a/ompi/mpi/man/man3/MPI_Finalize.3
+++ b/ompi/mpi/man/man3/MPI_Finalize.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Finalize 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Finalize 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Finalize \fP \- Terminates MPI execution environment.
 
diff --git a/ompi/mpi/man/man3/MPI_Finalized.3 b/ompi/mpi/man/man3/MPI_Finalized.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Finalized.3
rename to ompi/mpi/man/man3/MPI_Finalized.3in
index 3bf82b32a7..0bc1f939c4 100644
--- a/ompi/mpi/man/man3/MPI_Finalized.3
+++ b/ompi/mpi/man/man3/MPI_Finalized.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Finalized 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Finalized 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Finalized \fP \- Checks whether MPI_Finalize has completed. 
 
diff --git a/ompi/mpi/man/man3/MPI_Free_mem.3 b/ompi/mpi/man/man3/MPI_Free_mem.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Free_mem.3
rename to ompi/mpi/man/man3/MPI_Free_mem.3in
index 7141df8f5b..ba429e2fa7 100644
--- a/ompi/mpi/man/man3/MPI_Free_mem.3
+++ b/ompi/mpi/man/man3/MPI_Free_mem.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Free_mem 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Free_mem 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Free_mem \fP \- Frees memory that has been allocated using MPI_Alloc_mem.
 
diff --git a/ompi/mpi/man/man3/MPI_Gather.3 b/ompi/mpi/man/man3/MPI_Gather.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Gather.3
rename to ompi/mpi/man/man3/MPI_Gather.3in
index 04746d4266..ca879f3dac 100644
--- a/ompi/mpi/man/man3/MPI_Gather.3
+++ b/ompi/mpi/man/man3/MPI_Gather.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Gather 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Gather 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Gather\fP \- Gathers values from a group of processes.
 
diff --git a/ompi/mpi/man/man3/MPI_Gatherv.3 b/ompi/mpi/man/man3/MPI_Gatherv.3in
similarity index 99%
rename from ompi/mpi/man/man3/MPI_Gatherv.3
rename to ompi/mpi/man/man3/MPI_Gatherv.3in
index 7b1ca118c9..681b483816 100644
--- a/ompi/mpi/man/man3/MPI_Gatherv.3
+++ b/ompi/mpi/man/man3/MPI_Gatherv.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Gatherv 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Gatherv 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Gatherv\fP \- Gathers varying amounts of data from all processes to the root process
 
diff --git a/ompi/mpi/man/man3/MPI_Get.3 b/ompi/mpi/man/man3/MPI_Get.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Get.3
rename to ompi/mpi/man/man3/MPI_Get.3in
index 18229696e7..8b91b75d2e 100644
--- a/ompi/mpi/man/man3/MPI_Get.3
+++ b/ompi/mpi/man/man3/MPI_Get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Get\fP \- Copies data from the target memory to the origin. 
 
diff --git a/ompi/mpi/man/man3/MPI_Get_address.3 b/ompi/mpi/man/man3/MPI_Get_address.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Get_address.3
rename to ompi/mpi/man/man3/MPI_Get_address.3in
index 7774f28fdb..92b93d7845 100644
--- a/ompi/mpi/man/man3/MPI_Get_address.3
+++ b/ompi/mpi/man/man3/MPI_Get_address.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Get_address 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Get_address 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Get_address\fP \- Gets the address of a location in memory. 
 
diff --git a/ompi/mpi/man/man3/MPI_Get_count.3 b/ompi/mpi/man/man3/MPI_Get_count.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Get_count.3
rename to ompi/mpi/man/man3/MPI_Get_count.3in
index c9f7a4ef95..5794a667a9 100644
--- a/ompi/mpi/man/man3/MPI_Get_count.3
+++ b/ompi/mpi/man/man3/MPI_Get_count.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Get_count 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Get_count 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Get_count \fP \- Gets the number of top-level elements received.
 
diff --git a/ompi/mpi/man/man3/MPI_Get_elements.3 b/ompi/mpi/man/man3/MPI_Get_elements.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Get_elements.3
rename to ompi/mpi/man/man3/MPI_Get_elements.3in
index 1084a4d189..da9832d466 100644
--- a/ompi/mpi/man/man3/MPI_Get_elements.3
+++ b/ompi/mpi/man/man3/MPI_Get_elements.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Get_elements 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Get_elements 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Get_elements \fP \- Returns the number of basic elements in a data type.
 
diff --git a/ompi/mpi/man/man3/MPI_Get_processor_name.3 b/ompi/mpi/man/man3/MPI_Get_processor_name.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Get_processor_name.3
rename to ompi/mpi/man/man3/MPI_Get_processor_name.3in
index df3e690fa4..3711e5127b 100644
--- a/ompi/mpi/man/man3/MPI_Get_processor_name.3
+++ b/ompi/mpi/man/man3/MPI_Get_processor_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc. All rights reserved. Use is subject to license terms.
+.\"Copyright 2006-2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Get_processor_name 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Get_processor_name 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Get_processor_name \fP \- Gets the name of the processor.
 
diff --git a/ompi/mpi/man/man3/MPI_Get_version.3 b/ompi/mpi/man/man3/MPI_Get_version.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Get_version.3
rename to ompi/mpi/man/man3/MPI_Get_version.3in
index 516fd0c87f..6ad3e6ba1d 100644
--- a/ompi/mpi/man/man3/MPI_Get_version.3
+++ b/ompi/mpi/man/man3/MPI_Get_version.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Get_version 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Get_version 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Get_version\fP \- Returns the version of the standard corresponding to the current implementation. 
 
diff --git a/ompi/mpi/man/man3/MPI_Graph_create.3 b/ompi/mpi/man/man3/MPI_Graph_create.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Graph_create.3
rename to ompi/mpi/man/man3/MPI_Graph_create.3in
index 14f699aa55..bd167c4ccb 100644
--- a/ompi/mpi/man/man3/MPI_Graph_create.3
+++ b/ompi/mpi/man/man3/MPI_Graph_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Graph_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Graph_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Graph_create \fP \- Makes a new communicator to which topology information has been attached.
 
diff --git a/ompi/mpi/man/man3/MPI_Graph_get.3 b/ompi/mpi/man/man3/MPI_Graph_get.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Graph_get.3
rename to ompi/mpi/man/man3/MPI_Graph_get.3in
index a0f273e5cc..4e14d9ec4d 100644
--- a/ompi/mpi/man/man3/MPI_Graph_get.3
+++ b/ompi/mpi/man/man3/MPI_Graph_get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Graph_get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Graph_get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Graph_get \fP \- Retrieves graph topology information associated with a communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Graph_map.3 b/ompi/mpi/man/man3/MPI_Graph_map.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Graph_map.3
rename to ompi/mpi/man/man3/MPI_Graph_map.3in
index 5e7b6c8163..8ea6bef390 100644
--- a/ompi/mpi/man/man3/MPI_Graph_map.3
+++ b/ompi/mpi/man/man3/MPI_Graph_map.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Graph_map 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Graph_map 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Graph_map \fP \- Maps process to graph topology information.
 
diff --git a/ompi/mpi/man/man3/MPI_Graph_neighbors.3 b/ompi/mpi/man/man3/MPI_Graph_neighbors.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Graph_neighbors.3
rename to ompi/mpi/man/man3/MPI_Graph_neighbors.3in
index 51b83f6125..e3c831c640 100644
--- a/ompi/mpi/man/man3/MPI_Graph_neighbors.3
+++ b/ompi/mpi/man/man3/MPI_Graph_neighbors.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Graph_neighbors 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Graph_neighbors 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Graph_neighbors \fP \- Returns the neighbors of a node associated with a graph topology.
 
diff --git a/ompi/mpi/man/man3/MPI_Graph_neighbors_count.3 b/ompi/mpi/man/man3/MPI_Graph_neighbors_count.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Graph_neighbors_count.3
rename to ompi/mpi/man/man3/MPI_Graph_neighbors_count.3in
index 1808a318d6..ca40b589c0 100644
--- a/ompi/mpi/man/man3/MPI_Graph_neighbors_count.3
+++ b/ompi/mpi/man/man3/MPI_Graph_neighbors_count.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Graph_neighbors_count 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Graph_neighbors_count 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Graph_neighbors_count \fP \- Returns the number of neighbors of a node associated with a graph topology.
 
diff --git a/ompi/mpi/man/man3/MPI_Graphdims_get.3 b/ompi/mpi/man/man3/MPI_Graphdims_get.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Graphdims_get.3
rename to ompi/mpi/man/man3/MPI_Graphdims_get.3in
index f21366adbf..7aaab8ffe4 100644
--- a/ompi/mpi/man/man3/MPI_Graphdims_get.3
+++ b/ompi/mpi/man/man3/MPI_Graphdims_get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Graphdims_get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Graphdims_get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Graphdims_get \fP \- Retrieves graph topology information associated with a communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Grequest_complete.3 b/ompi/mpi/man/man3/MPI_Grequest_complete.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Grequest_complete.3
rename to ompi/mpi/man/man3/MPI_Grequest_complete.3in
index dedfc25c69..5f1fcc4736 100644
--- a/ompi/mpi/man/man3/MPI_Grequest_complete.3
+++ b/ompi/mpi/man/man3/MPI_Grequest_complete.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Grequest_complete 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Grequest_complete 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Grequest_complete \fP \- Reports that a generalized request is complete. 
 
diff --git a/ompi/mpi/man/man3/MPI_Grequest_start.3 b/ompi/mpi/man/man3/MPI_Grequest_start.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Grequest_start.3
rename to ompi/mpi/man/man3/MPI_Grequest_start.3in
index acbde7de06..e3fcfa78bf 100644
--- a/ompi/mpi/man/man3/MPI_Grequest_start.3
+++ b/ompi/mpi/man/man3/MPI_Grequest_start.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Grequest_start 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Grequest_start 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Grequest_start \fP \- Starts a generalized request and returns a handle to it in \fIrequest\fP. 
 
diff --git a/ompi/mpi/man/man3/MPI_Group_c2f.3 b/ompi/mpi/man/man3/MPI_Group_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Group_c2f.3
rename to ompi/mpi/man/man3/MPI_Group_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Group_compare.3 b/ompi/mpi/man/man3/MPI_Group_compare.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Group_compare.3
rename to ompi/mpi/man/man3/MPI_Group_compare.3in
index 053bbbe372..49c92576af 100644
--- a/ompi/mpi/man/man3/MPI_Group_compare.3
+++ b/ompi/mpi/man/man3/MPI_Group_compare.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_compare 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_compare 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_compare \fP \- Compares two groups.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_difference.3 b/ompi/mpi/man/man3/MPI_Group_difference.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Group_difference.3
rename to ompi/mpi/man/man3/MPI_Group_difference.3in
index d1890a6a97..06840ae930 100644
--- a/ompi/mpi/man/man3/MPI_Group_difference.3
+++ b/ompi/mpi/man/man3/MPI_Group_difference.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_difference 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_difference 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_difference \fP \- Makes a group from the difference of two groups.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_excl.3 b/ompi/mpi/man/man3/MPI_Group_excl.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Group_excl.3
rename to ompi/mpi/man/man3/MPI_Group_excl.3in
index 199fac95dc..5968a23353 100644
--- a/ompi/mpi/man/man3/MPI_Group_excl.3
+++ b/ompi/mpi/man/man3/MPI_Group_excl.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_excl 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_excl 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_excl\fP \- Produces a group by reordering an existing group and taking only unlisted members.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_f2c.3 b/ompi/mpi/man/man3/MPI_Group_f2c.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Group_f2c.3
rename to ompi/mpi/man/man3/MPI_Group_f2c.3in
diff --git a/ompi/mpi/man/man3/MPI_Group_free.3 b/ompi/mpi/man/man3/MPI_Group_free.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Group_free.3
rename to ompi/mpi/man/man3/MPI_Group_free.3in
index 2046d10fc0..5a1d3184b0 100644
--- a/ompi/mpi/man/man3/MPI_Group_free.3
+++ b/ompi/mpi/man/man3/MPI_Group_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_free \fP \- Frees a group.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_incl.3 b/ompi/mpi/man/man3/MPI_Group_incl.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Group_incl.3
rename to ompi/mpi/man/man3/MPI_Group_incl.3in
index 54fe42e052..2a467370a1 100644
--- a/ompi/mpi/man/man3/MPI_Group_incl.3
+++ b/ompi/mpi/man/man3/MPI_Group_incl.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_incl 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_incl 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_incl \fP \- Produces a group by reordering an existing group and taking only listed members.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_intersection.3 b/ompi/mpi/man/man3/MPI_Group_intersection.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Group_intersection.3
rename to ompi/mpi/man/man3/MPI_Group_intersection.3in
index 420b017233..49efa17570 100644
--- a/ompi/mpi/man/man3/MPI_Group_intersection.3
+++ b/ompi/mpi/man/man3/MPI_Group_intersection.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_intersection 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_intersection 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_intersection \fP \- Produces a group at the intersection of two existing groups.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_range_excl.3 b/ompi/mpi/man/man3/MPI_Group_range_excl.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Group_range_excl.3
rename to ompi/mpi/man/man3/MPI_Group_range_excl.3in
index 7c12a89383..9e5e40d2b6 100644
--- a/ompi/mpi/man/man3/MPI_Group_range_excl.3
+++ b/ompi/mpi/man/man3/MPI_Group_range_excl.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_range_excl 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_range_excl 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_range_excl\fP \- Produces a group by excluding ranges of processes from an existing group.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_range_incl.3 b/ompi/mpi/man/man3/MPI_Group_range_incl.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Group_range_incl.3
rename to ompi/mpi/man/man3/MPI_Group_range_incl.3in
index df81d94434..2ca0956e65 100644
--- a/ompi/mpi/man/man3/MPI_Group_range_incl.3
+++ b/ompi/mpi/man/man3/MPI_Group_range_incl.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_range_incl 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_range_incl 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_range_incl\fP \- Creates a new group from ranges of ranks in an existing group.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_rank.3 b/ompi/mpi/man/man3/MPI_Group_rank.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Group_rank.3
rename to ompi/mpi/man/man3/MPI_Group_rank.3in
index 915ab6cac0..c45f6ee31f 100644
--- a/ompi/mpi/man/man3/MPI_Group_rank.3
+++ b/ompi/mpi/man/man3/MPI_Group_rank.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_rank 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_rank 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_rank\fP \- Returns the rank of the calling process in the given group.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_size.3 b/ompi/mpi/man/man3/MPI_Group_size.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Group_size.3
rename to ompi/mpi/man/man3/MPI_Group_size.3in
index 1e69fbc0c0..c1cab78176 100644
--- a/ompi/mpi/man/man3/MPI_Group_size.3
+++ b/ompi/mpi/man/man3/MPI_Group_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_size\fP \- Returns the size of a group.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_translate_ranks.3 b/ompi/mpi/man/man3/MPI_Group_translate_ranks.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Group_translate_ranks.3
rename to ompi/mpi/man/man3/MPI_Group_translate_ranks.3in
index 83a8e4abac..b6942375b3 100644
--- a/ompi/mpi/man/man3/MPI_Group_translate_ranks.3
+++ b/ompi/mpi/man/man3/MPI_Group_translate_ranks.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_translate_ranks 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_translate_ranks 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_translate_ranks\fP \- Translates the ranks of processes in one group to those in another group.
 
diff --git a/ompi/mpi/man/man3/MPI_Group_union.3 b/ompi/mpi/man/man3/MPI_Group_union.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Group_union.3
rename to ompi/mpi/man/man3/MPI_Group_union.3in
index 482a1f4104..f1a2ad5abb 100644
--- a/ompi/mpi/man/man3/MPI_Group_union.3
+++ b/ompi/mpi/man/man3/MPI_Group_union.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Group_union 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Group_union 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Group_union \fP \- Produces a group by combining two groups.
 
diff --git a/ompi/mpi/man/man3/MPI_Ibsend.3 b/ompi/mpi/man/man3/MPI_Ibsend.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Ibsend.3
rename to ompi/mpi/man/man3/MPI_Ibsend.3in
index 3b8741f031..9605745acd 100644
--- a/ompi/mpi/man/man3/MPI_Ibsend.3
+++ b/ompi/mpi/man/man3/MPI_Ibsend.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Ibsend 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Ibsend 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Ibsend\fP \- Starts a nonblocking buffered send.
 
diff --git a/ompi/mpi/man/man3/MPI_Info_c2f.3 b/ompi/mpi/man/man3/MPI_Info_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Info_c2f.3
rename to ompi/mpi/man/man3/MPI_Info_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Info_create.3 b/ompi/mpi/man/man3/MPI_Info_create.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Info_create.3
rename to ompi/mpi/man/man3/MPI_Info_create.3in
index 2e4a75adb2..17f91570df 100644
--- a/ompi/mpi/man/man3/MPI_Info_create.3
+++ b/ompi/mpi/man/man3/MPI_Info_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_create\fP \- Creates a new info object.
 
diff --git a/ompi/mpi/man/man3/MPI_Info_delete.3 b/ompi/mpi/man/man3/MPI_Info_delete.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Info_delete.3
rename to ompi/mpi/man/man3/MPI_Info_delete.3in
index 109e01e791..d62788c521 100644
--- a/ompi/mpi/man/man3/MPI_Info_delete.3
+++ b/ompi/mpi/man/man3/MPI_Info_delete.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_delete 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_delete 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_delete\fP \- Deletes a key/value pair from \fIinfo\fP. 
 
diff --git a/ompi/mpi/man/man3/MPI_Info_dup.3 b/ompi/mpi/man/man3/MPI_Info_dup.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Info_dup.3
rename to ompi/mpi/man/man3/MPI_Info_dup.3in
index 4975ee3009..0e6ec37e3f 100644
--- a/ompi/mpi/man/man3/MPI_Info_dup.3
+++ b/ompi/mpi/man/man3/MPI_Info_dup.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_dup 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_dup 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_dup\fP \- Duplicates an info object. 
 
diff --git a/ompi/mpi/man/man3/MPI_Info_f2c.3 b/ompi/mpi/man/man3/MPI_Info_f2c.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Info_f2c.3
rename to ompi/mpi/man/man3/MPI_Info_f2c.3in
diff --git a/ompi/mpi/man/man3/MPI_Info_free.3 b/ompi/mpi/man/man3/MPI_Info_free.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Info_free.3
rename to ompi/mpi/man/man3/MPI_Info_free.3in
index 963cbcd327..56ea3ee4d8 100644
--- a/ompi/mpi/man/man3/MPI_Info_free.3
+++ b/ompi/mpi/man/man3/MPI_Info_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_free\fP \- Frees an info object. 
 
diff --git a/ompi/mpi/man/man3/MPI_Info_get.3 b/ompi/mpi/man/man3/MPI_Info_get.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Info_get.3
rename to ompi/mpi/man/man3/MPI_Info_get.3in
index 6f401597c9..d96eb4cb6a 100644
--- a/ompi/mpi/man/man3/MPI_Info_get.3
+++ b/ompi/mpi/man/man3/MPI_Info_get.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_get 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_get 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_get\fP \- Retrieves the value associated with a key in an info object. 
 
diff --git a/ompi/mpi/man/man3/MPI_Info_get_nkeys.3 b/ompi/mpi/man/man3/MPI_Info_get_nkeys.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Info_get_nkeys.3
rename to ompi/mpi/man/man3/MPI_Info_get_nkeys.3in
index 8c5adde92a..96dd18ef0e 100644
--- a/ompi/mpi/man/man3/MPI_Info_get_nkeys.3
+++ b/ompi/mpi/man/man3/MPI_Info_get_nkeys.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_get_nkeys 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_get_nkeys 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_get_nkeys\fP \- Gets the number of keys currently defined in an info object. 
 
diff --git a/ompi/mpi/man/man3/MPI_Info_get_nthkey.3 b/ompi/mpi/man/man3/MPI_Info_get_nthkey.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Info_get_nthkey.3
rename to ompi/mpi/man/man3/MPI_Info_get_nthkey.3in
index 7f47c08de4..5159ae02cf 100644
--- a/ompi/mpi/man/man3/MPI_Info_get_nthkey.3
+++ b/ompi/mpi/man/man3/MPI_Info_get_nthkey.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_get_nthkey 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_get_nthkey 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_get_nthkey\fP \- Returns the \fIn\fPth defined key in \fIinfo\fP.
 
diff --git a/ompi/mpi/man/man3/MPI_Info_get_valuelen.3 b/ompi/mpi/man/man3/MPI_Info_get_valuelen.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Info_get_valuelen.3
rename to ompi/mpi/man/man3/MPI_Info_get_valuelen.3in
index c54909bb58..2f0b8fbf17 100644
--- a/ompi/mpi/man/man3/MPI_Info_get_valuelen.3
+++ b/ompi/mpi/man/man3/MPI_Info_get_valuelen.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_get_valuelen 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_get_valuelen 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_get_valuelen\fP \- Retrieves the length of the key value associated with an info object. 
 
diff --git a/ompi/mpi/man/man3/MPI_Info_set.3 b/ompi/mpi/man/man3/MPI_Info_set.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Info_set.3
rename to ompi/mpi/man/man3/MPI_Info_set.3in
index 03b06fc796..446135905e 100644
--- a/ompi/mpi/man/man3/MPI_Info_set.3
+++ b/ompi/mpi/man/man3/MPI_Info_set.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Info_set 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Info_set 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Info_set\fP \- Adds a key/value pair to \fIinfo\fP.
 
diff --git a/ompi/mpi/man/man3/MPI_Init.3 b/ompi/mpi/man/man3/MPI_Init.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Init.3
rename to ompi/mpi/man/man3/MPI_Init.3in
index 6a674722c4..4a1c250b4a 100644
--- a/ompi/mpi/man/man3/MPI_Init.3
+++ b/ompi/mpi/man/man3/MPI_Init.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Init 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Init 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Init\fP \- Initializes the MPI execution environment
diff --git a/ompi/mpi/man/man3/MPI_Init_thread.3 b/ompi/mpi/man/man3/MPI_Init_thread.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Init_thread.3
rename to ompi/mpi/man/man3/MPI_Init_thread.3in
index ced7948475..ead079b875 100644
--- a/ompi/mpi/man/man3/MPI_Init_thread.3
+++ b/ompi/mpi/man/man3/MPI_Init_thread.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Init_thread 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Init_thread 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Init_thread\fP \- Initializes the MPI execution environment
diff --git a/ompi/mpi/man/man3/MPI_Initialized.3 b/ompi/mpi/man/man3/MPI_Initialized.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Initialized.3
rename to ompi/mpi/man/man3/MPI_Initialized.3in
index 23004d1165..c3ba9aec41 100644
--- a/ompi/mpi/man/man3/MPI_Initialized.3
+++ b/ompi/mpi/man/man3/MPI_Initialized.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Initialized 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Initialized 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Initialized\fP \- Indicates whether MPI_Init has been called.
 
diff --git a/ompi/mpi/man/man3/MPI_Intercomm_create.3 b/ompi/mpi/man/man3/MPI_Intercomm_create.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Intercomm_create.3
rename to ompi/mpi/man/man3/MPI_Intercomm_create.3in
index f9cf65efd9..8c5d19b115 100644
--- a/ompi/mpi/man/man3/MPI_Intercomm_create.3
+++ b/ompi/mpi/man/man3/MPI_Intercomm_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Intercomm_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Intercomm_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Intercomm_create\fP \- Creates an intercommuncator from two intracommunicators.
 
diff --git a/ompi/mpi/man/man3/MPI_Intercomm_merge.3 b/ompi/mpi/man/man3/MPI_Intercomm_merge.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Intercomm_merge.3
rename to ompi/mpi/man/man3/MPI_Intercomm_merge.3in
index f97a547739..72020d02fd 100644
--- a/ompi/mpi/man/man3/MPI_Intercomm_merge.3
+++ b/ompi/mpi/man/man3/MPI_Intercomm_merge.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Intercomm_merge 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Intercomm_merge 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Intercomm_merge\fP \- Creates an intracommunicator from an intercommunicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Iprobe.3 b/ompi/mpi/man/man3/MPI_Iprobe.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Iprobe.3
rename to ompi/mpi/man/man3/MPI_Iprobe.3in
index a54ed5345e..1afca9482b 100644
--- a/ompi/mpi/man/man3/MPI_Iprobe.3
+++ b/ompi/mpi/man/man3/MPI_Iprobe.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Iprobe 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Iprobe 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Iprobe\fP \- Nonblocking test for a message.
 
diff --git a/ompi/mpi/man/man3/MPI_Irecv.3 b/ompi/mpi/man/man3/MPI_Irecv.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Irecv.3
rename to ompi/mpi/man/man3/MPI_Irecv.3in
index 82c4755cb8..cf5c2a098f 100644
--- a/ompi/mpi/man/man3/MPI_Irecv.3
+++ b/ompi/mpi/man/man3/MPI_Irecv.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Irecv 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Irecv 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Irecv\fP \- Starts a standard-mode, nonblocking receive.
 
diff --git a/ompi/mpi/man/man3/MPI_Irsend.3 b/ompi/mpi/man/man3/MPI_Irsend.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Irsend.3
rename to ompi/mpi/man/man3/MPI_Irsend.3in
index a8a00bceb1..9aa23cb6b1 100644
--- a/ompi/mpi/man/man3/MPI_Irsend.3
+++ b/ompi/mpi/man/man3/MPI_Irsend.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Irsend 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Irsend 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Irsend\fP \- Starts a ready-mode nonblocking send.
 
diff --git a/ompi/mpi/man/man3/MPI_Is_thread_main.3 b/ompi/mpi/man/man3/MPI_Is_thread_main.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Is_thread_main.3
rename to ompi/mpi/man/man3/MPI_Is_thread_main.3in
index 27848f0052..c264f297f1 100644
--- a/ompi/mpi/man/man3/MPI_Is_thread_main.3
+++ b/ompi/mpi/man/man3/MPI_Is_thread_main.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Is_thread_main 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Is_thread_main 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Is_thread_main\fP \- Determines if thread called MPI_Init
diff --git a/ompi/mpi/man/man3/MPI_Isend.3 b/ompi/mpi/man/man3/MPI_Isend.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Isend.3
rename to ompi/mpi/man/man3/MPI_Isend.3in
index 154d88c2b7..8a16b4a19a 100644
--- a/ompi/mpi/man/man3/MPI_Isend.3
+++ b/ompi/mpi/man/man3/MPI_Isend.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Isend 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Isend 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Isend\fP \- Starts a standard-mode, nonblocking send.
 
diff --git a/ompi/mpi/man/man3/MPI_Issend.3 b/ompi/mpi/man/man3/MPI_Issend.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Issend.3
rename to ompi/mpi/man/man3/MPI_Issend.3in
index 964390191b..39d5f21f1f 100644
--- a/ompi/mpi/man/man3/MPI_Issend.3
+++ b/ompi/mpi/man/man3/MPI_Issend.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Issend 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Issend 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Issend\fP \- Starts a nonblocking synchronous send.
 
diff --git a/ompi/mpi/man/man3/MPI_Keyval_create.3 b/ompi/mpi/man/man3/MPI_Keyval_create.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Keyval_create.3
rename to ompi/mpi/man/man3/MPI_Keyval_create.3in
index 0a0e2f4a9b..52136083a8 100644
--- a/ompi/mpi/man/man3/MPI_Keyval_create.3
+++ b/ompi/mpi/man/man3/MPI_Keyval_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Keyval_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Keyval_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Keyval_create\fP \- Generates a new attribute key -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Keyval_free.3 b/ompi/mpi/man/man3/MPI_Keyval_free.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Keyval_free.3
rename to ompi/mpi/man/man3/MPI_Keyval_free.3in
index 9824a06cc4..14a85ae428 100644
--- a/ompi/mpi/man/man3/MPI_Keyval_free.3
+++ b/ompi/mpi/man/man3/MPI_Keyval_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Keyval_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Keyval_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Keyval_free\fP \- Frees attribute key for communicator cache attribute -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Lookup_name.3 b/ompi/mpi/man/man3/MPI_Lookup_name.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Lookup_name.3
rename to ompi/mpi/man/man3/MPI_Lookup_name.3in
index 00f3fe80f6..fcce8be7fc 100644
--- a/ompi/mpi/man/man3/MPI_Lookup_name.3
+++ b/ompi/mpi/man/man3/MPI_Lookup_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Lookup_name 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Lookup_name 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Op_c2f.3 b/ompi/mpi/man/man3/MPI_Op_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Op_c2f.3
rename to ompi/mpi/man/man3/MPI_Op_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Op_create.3 b/ompi/mpi/man/man3/MPI_Op_create.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Op_create.3
rename to ompi/mpi/man/man3/MPI_Op_create.3in
index 0da8ad829c..8897661f99 100644
--- a/ompi/mpi/man/man3/MPI_Op_create.3
+++ b/ompi/mpi/man/man3/MPI_Op_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Op_create 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Op_create 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Op_create\fP \- Creates a user-defined combination function handle.
 
diff --git a/ompi/mpi/man/man3/MPI_Op_f2c.3 b/ompi/mpi/man/man3/MPI_Op_f2c.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Op_f2c.3
rename to ompi/mpi/man/man3/MPI_Op_f2c.3in
diff --git a/ompi/mpi/man/man3/MPI_Op_free.3 b/ompi/mpi/man/man3/MPI_Op_free.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Op_free.3
rename to ompi/mpi/man/man3/MPI_Op_free.3in
index 7f8b003240..9b140cfe9d 100644
--- a/ompi/mpi/man/man3/MPI_Op_free.3
+++ b/ompi/mpi/man/man3/MPI_Op_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Op_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Op_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Op_free\fP \- Frees a user-defined combination function handle.
 
diff --git a/ompi/mpi/man/man3/MPI_Open_port.3 b/ompi/mpi/man/man3/MPI_Open_port.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Open_port.3
rename to ompi/mpi/man/man3/MPI_Open_port.3in
index 26defeeebd..0bab4c1562 100644
--- a/ompi/mpi/man/man3/MPI_Open_port.3
+++ b/ompi/mpi/man/man3/MPI_Open_port.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Open_port 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Open_port 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Open_port\fP \- Establishes a network address for a server to accept connections from clients.
 
diff --git a/ompi/mpi/man/man3/MPI_Pack.3 b/ompi/mpi/man/man3/MPI_Pack.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Pack.3
rename to ompi/mpi/man/man3/MPI_Pack.3in
index 5f46340916..d195b6d8ff 100644
--- a/ompi/mpi/man/man3/MPI_Pack.3
+++ b/ompi/mpi/man/man3/MPI_Pack.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Pack 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Pack 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Pack\fP \- Packs data of a given datatype into contiguous memory.
 
diff --git a/ompi/mpi/man/man3/MPI_Pack_external.3 b/ompi/mpi/man/man3/MPI_Pack_external.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Pack_external.3
rename to ompi/mpi/man/man3/MPI_Pack_external.3in
index 7a946445b7..5509f7587c 100644
--- a/ompi/mpi/man/man3/MPI_Pack_external.3
+++ b/ompi/mpi/man/man3/MPI_Pack_external.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Pack_external 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Pack_external 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Pack_external\fP \- Writes data to a portable format
diff --git a/ompi/mpi/man/man3/MPI_Pack_external_size.3 b/ompi/mpi/man/man3/MPI_Pack_external_size.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Pack_external_size.3
rename to ompi/mpi/man/man3/MPI_Pack_external_size.3in
index 2c14fc6b6e..e3bcbf5278 100644
--- a/ompi/mpi/man/man3/MPI_Pack_external_size.3
+++ b/ompi/mpi/man/man3/MPI_Pack_external_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Pack_external_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Pack_external_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Pack_external_size\fP \- Calculates upper bound on space needed
diff --git a/ompi/mpi/man/man3/MPI_Pack_size.3 b/ompi/mpi/man/man3/MPI_Pack_size.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Pack_size.3
rename to ompi/mpi/man/man3/MPI_Pack_size.3in
index 650e6d52ea..34901ee9ff 100644
--- a/ompi/mpi/man/man3/MPI_Pack_size.3
+++ b/ompi/mpi/man/man3/MPI_Pack_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Pack_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Pack_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Pack_size\fP \- Returns the upper bound on the amount of space needed to pack a message.
 
diff --git a/ompi/mpi/man/man3/MPI_Pcontrol.3 b/ompi/mpi/man/man3/MPI_Pcontrol.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Pcontrol.3
rename to ompi/mpi/man/man3/MPI_Pcontrol.3in
index 843ec02d48..dae9736519 100644
--- a/ompi/mpi/man/man3/MPI_Pcontrol.3
+++ b/ompi/mpi/man/man3/MPI_Pcontrol.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Pcontrol 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Pcontrol 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Pcontrol\fP \- Controls profiling.
 
diff --git a/ompi/mpi/man/man3/MPI_Probe.3 b/ompi/mpi/man/man3/MPI_Probe.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Probe.3
rename to ompi/mpi/man/man3/MPI_Probe.3in
index 52b79aea2c..cddd092973 100644
--- a/ompi/mpi/man/man3/MPI_Probe.3
+++ b/ompi/mpi/man/man3/MPI_Probe.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Probe 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Probe 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Probe\fP \- Blocking test for a message.
 
diff --git a/ompi/mpi/man/man3/MPI_Publish_name.3 b/ompi/mpi/man/man3/MPI_Publish_name.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Publish_name.3
rename to ompi/mpi/man/man3/MPI_Publish_name.3in
index 1d95f829e8..edc73c7081 100644
--- a/ompi/mpi/man/man3/MPI_Publish_name.3
+++ b/ompi/mpi/man/man3/MPI_Publish_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Publish_name 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Publish_name 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Put.3 b/ompi/mpi/man/man3/MPI_Put.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Put.3
rename to ompi/mpi/man/man3/MPI_Put.3in
index a695bc9923..97049bf8bd 100644
--- a/ompi/mpi/man/man3/MPI_Put.3
+++ b/ompi/mpi/man/man3/MPI_Put.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Put 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Put 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Put\fP \- Copies data from the origin memory to the target. 
 
diff --git a/ompi/mpi/man/man3/MPI_Query_thread.3 b/ompi/mpi/man/man3/MPI_Query_thread.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Query_thread.3
rename to ompi/mpi/man/man3/MPI_Query_thread.3in
index 45fd8f6b17..6f4d0f024f 100644
--- a/ompi/mpi/man/man3/MPI_Query_thread.3
+++ b/ompi/mpi/man/man3/MPI_Query_thread.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Query_thread 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Query_thread 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Query_thread\fP \- Returns the current level of thread support
diff --git a/ompi/mpi/man/man3/MPI_Recv.3 b/ompi/mpi/man/man3/MPI_Recv.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Recv.3
rename to ompi/mpi/man/man3/MPI_Recv.3in
index 93f240ddb6..b1874b5dd8 100644
--- a/ompi/mpi/man/man3/MPI_Recv.3
+++ b/ompi/mpi/man/man3/MPI_Recv.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Recv 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Recv 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Recv\fP \- Performs a standard-mode blocking receive.
 
diff --git a/ompi/mpi/man/man3/MPI_Recv_init.3 b/ompi/mpi/man/man3/MPI_Recv_init.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Recv_init.3
rename to ompi/mpi/man/man3/MPI_Recv_init.3in
index 40c3e208ea..17d0c4f8b9 100644
--- a/ompi/mpi/man/man3/MPI_Recv_init.3
+++ b/ompi/mpi/man/man3/MPI_Recv_init.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Recv_init 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Recv_init 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Recv_init\fP \- Builds a handle for a receive.
 
diff --git a/ompi/mpi/man/man3/MPI_Reduce.3 b/ompi/mpi/man/man3/MPI_Reduce.3in
similarity index 99%
rename from ompi/mpi/man/man3/MPI_Reduce.3
rename to ompi/mpi/man/man3/MPI_Reduce.3in
index 10a0f8b966..bf48847aed 100644
--- a/ompi/mpi/man/man3/MPI_Reduce.3
+++ b/ompi/mpi/man/man3/MPI_Reduce.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Reduce 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Reduce 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Reduce\fP \- Reduces values on all processes within a group. 
 
diff --git a/ompi/mpi/man/man3/MPI_Reduce_scatter.3 b/ompi/mpi/man/man3/MPI_Reduce_scatter.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Reduce_scatter.3
rename to ompi/mpi/man/man3/MPI_Reduce_scatter.3in
index 35a3e88a28..f00c96ee0e 100644
--- a/ompi/mpi/man/man3/MPI_Reduce_scatter.3
+++ b/ompi/mpi/man/man3/MPI_Reduce_scatter.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Reduce_scatter 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Reduce_scatter 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Reduce_scatter\fP \- Combines values and scatters the results.
 
diff --git a/ompi/mpi/man/man3/MPI_Register_datarep.3 b/ompi/mpi/man/man3/MPI_Register_datarep.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Register_datarep.3
rename to ompi/mpi/man/man3/MPI_Register_datarep.3in
index 0e5ff50eed..742ea58f44 100644
--- a/ompi/mpi/man/man3/MPI_Register_datarep.3
+++ b/ompi/mpi/man/man3/MPI_Register_datarep.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Register_datarep 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Register_datarep 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Register_datarep\fP \- Defines data representation. 
 
diff --git a/ompi/mpi/man/man3/MPI_Request_c2f.3 b/ompi/mpi/man/man3/MPI_Request_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Request_c2f.3
rename to ompi/mpi/man/man3/MPI_Request_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Request_f2c.3 b/ompi/mpi/man/man3/MPI_Request_f2c.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Request_f2c.3
rename to ompi/mpi/man/man3/MPI_Request_f2c.3in
diff --git a/ompi/mpi/man/man3/MPI_Request_free.3 b/ompi/mpi/man/man3/MPI_Request_free.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Request_free.3
rename to ompi/mpi/man/man3/MPI_Request_free.3in
index eab475b3db..f9a6fbfed5 100644
--- a/ompi/mpi/man/man3/MPI_Request_free.3
+++ b/ompi/mpi/man/man3/MPI_Request_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Request_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Request_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Request_free\fP \- Frees a communication request object.
 
diff --git a/ompi/mpi/man/man3/MPI_Request_get_status.3 b/ompi/mpi/man/man3/MPI_Request_get_status.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Request_get_status.3
rename to ompi/mpi/man/man3/MPI_Request_get_status.3in
index 0750ae3663..dc07fd0cd4 100644
--- a/ompi/mpi/man/man3/MPI_Request_get_status.3
+++ b/ompi/mpi/man/man3/MPI_Request_get_status.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Request_get_status 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Request_get_status 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Request_get_status\fP \- Access information associated with a request without freeing the request. 
 
diff --git a/ompi/mpi/man/man3/MPI_Rsend.3 b/ompi/mpi/man/man3/MPI_Rsend.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Rsend.3
rename to ompi/mpi/man/man3/MPI_Rsend.3in
index c2721d7732..cae966fb47 100644
--- a/ompi/mpi/man/man3/MPI_Rsend.3
+++ b/ompi/mpi/man/man3/MPI_Rsend.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Rsend 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Rsend 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Rsend\fP \- Ready send.
 
diff --git a/ompi/mpi/man/man3/MPI_Rsend_init.3 b/ompi/mpi/man/man3/MPI_Rsend_init.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Rsend_init.3
rename to ompi/mpi/man/man3/MPI_Rsend_init.3in
index e9ce092b38..302d9d75fd 100644
--- a/ompi/mpi/man/man3/MPI_Rsend_init.3
+++ b/ompi/mpi/man/man3/MPI_Rsend_init.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Rsend_init 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Rsend_init 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Rsend_init\fP \- Builds a handle for a ready send.
 
diff --git a/ompi/mpi/man/man3/MPI_Scan.3 b/ompi/mpi/man/man3/MPI_Scan.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Scan.3
rename to ompi/mpi/man/man3/MPI_Scan.3in
index d0c6c4f6ba..166c0de63a 100644
--- a/ompi/mpi/man/man3/MPI_Scan.3
+++ b/ompi/mpi/man/man3/MPI_Scan.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Scan 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Scan 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Scan\fP \- Computes an inclusive scan (partial reduction)
diff --git a/ompi/mpi/man/man3/MPI_Scatter.3 b/ompi/mpi/man/man3/MPI_Scatter.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Scatter.3
rename to ompi/mpi/man/man3/MPI_Scatter.3in
index ab9100f7b6..3d27ce96e2 100644
--- a/ompi/mpi/man/man3/MPI_Scatter.3
+++ b/ompi/mpi/man/man3/MPI_Scatter.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Scatter 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Scatter 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Scatter\fP \- Sends data from one task to all tasks in a group.
 
diff --git a/ompi/mpi/man/man3/MPI_Scatterv.3 b/ompi/mpi/man/man3/MPI_Scatterv.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Scatterv.3
rename to ompi/mpi/man/man3/MPI_Scatterv.3in
index 55b6e491a9..f0eda766e0 100644
--- a/ompi/mpi/man/man3/MPI_Scatterv.3
+++ b/ompi/mpi/man/man3/MPI_Scatterv.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Scatterv 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Scatterv 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Scatterv\fP \- Scatters a buffer in parts to all tasks in a group.
 
diff --git a/ompi/mpi/man/man3/MPI_Send.3 b/ompi/mpi/man/man3/MPI_Send.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Send.3
rename to ompi/mpi/man/man3/MPI_Send.3in
index c2249c92ef..fe71e1cb9a 100644
--- a/ompi/mpi/man/man3/MPI_Send.3
+++ b/ompi/mpi/man/man3/MPI_Send.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Send 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Send 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Send\fP \- Performs a standard-mode blocking send.
 
diff --git a/ompi/mpi/man/man3/MPI_Send_init.3 b/ompi/mpi/man/man3/MPI_Send_init.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Send_init.3
rename to ompi/mpi/man/man3/MPI_Send_init.3in
index 99cbb310cd..0691b97b3b 100644
--- a/ompi/mpi/man/man3/MPI_Send_init.3
+++ b/ompi/mpi/man/man3/MPI_Send_init.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Send_init 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Send_init 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Send_init\fP \- Builds a handle for a standard send.
 
diff --git a/ompi/mpi/man/man3/MPI_Sendrecv.3 b/ompi/mpi/man/man3/MPI_Sendrecv.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Sendrecv.3
rename to ompi/mpi/man/man3/MPI_Sendrecv.3in
index 4b346b22dc..c2ed3eea05 100644
--- a/ompi/mpi/man/man3/MPI_Sendrecv.3
+++ b/ompi/mpi/man/man3/MPI_Sendrecv.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Sendrecv 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Sendrecv 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Sendrecv\fP \- Sends and receives a message.
 
diff --git a/ompi/mpi/man/man3/MPI_Sendrecv_replace.3 b/ompi/mpi/man/man3/MPI_Sendrecv_replace.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Sendrecv_replace.3
rename to ompi/mpi/man/man3/MPI_Sendrecv_replace.3in
index 9f50c4b5a9..df46daad96 100644
--- a/ompi/mpi/man/man3/MPI_Sendrecv_replace.3
+++ b/ompi/mpi/man/man3/MPI_Sendrecv_replace.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Sendrecv_replace 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Sendrecv_replace 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Sendrecv_replace\fP \- Sends and receives a message using a single buffer.
 
diff --git a/ompi/mpi/man/man3/MPI_Sizeof.3 b/ompi/mpi/man/man3/MPI_Sizeof.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Sizeof.3
rename to ompi/mpi/man/man3/MPI_Sizeof.3in
index fe9307ab6b..7b0c259f7c 100644
--- a/ompi/mpi/man/man3/MPI_Sizeof.3
+++ b/ompi/mpi/man/man3/MPI_Sizeof.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Sizeof 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Sizeof 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Sizeof\fP \- Returns the size, in bytes, of the given type
diff --git a/ompi/mpi/man/man3/MPI_Ssend.3 b/ompi/mpi/man/man3/MPI_Ssend.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Ssend.3
rename to ompi/mpi/man/man3/MPI_Ssend.3in
index 1b3d122d5c..12c7b18a3a 100644
--- a/ompi/mpi/man/man3/MPI_Ssend.3
+++ b/ompi/mpi/man/man3/MPI_Ssend.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Ssend 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Ssend 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Ssend\fP \- Standard synchronous send.
 
diff --git a/ompi/mpi/man/man3/MPI_Ssend_init.3 b/ompi/mpi/man/man3/MPI_Ssend_init.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Ssend_init.3
rename to ompi/mpi/man/man3/MPI_Ssend_init.3in
index 26a42ef8a3..e988e9111d 100644
--- a/ompi/mpi/man/man3/MPI_Ssend_init.3
+++ b/ompi/mpi/man/man3/MPI_Ssend_init.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Ssend_init 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Ssend_init 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Ssend_init\fP \- Builds a handle for a synchronous send.
 
diff --git a/ompi/mpi/man/man3/MPI_Start.3 b/ompi/mpi/man/man3/MPI_Start.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Start.3
rename to ompi/mpi/man/man3/MPI_Start.3in
index ee89e85254..b493cda827 100644
--- a/ompi/mpi/man/man3/MPI_Start.3
+++ b/ompi/mpi/man/man3/MPI_Start.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Start 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Start 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Start\fP \- Initiates a communication using a persistent request handle.
 
diff --git a/ompi/mpi/man/man3/MPI_Startall.3 b/ompi/mpi/man/man3/MPI_Startall.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Startall.3
rename to ompi/mpi/man/man3/MPI_Startall.3in
index ba8bc0f7e8..c731f6decb 100644
--- a/ompi/mpi/man/man3/MPI_Startall.3
+++ b/ompi/mpi/man/man3/MPI_Startall.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Startall 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Startall 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Startall\fP \- Starts a collection of requests.
 
diff --git a/ompi/mpi/man/man3/MPI_Status_c2f.3 b/ompi/mpi/man/man3/MPI_Status_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Status_c2f.3
rename to ompi/mpi/man/man3/MPI_Status_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Status_f2c.3 b/ompi/mpi/man/man3/MPI_Status_f2c.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Status_f2c.3
rename to ompi/mpi/man/man3/MPI_Status_f2c.3in
index a5d362fecd..ea7b3b91eb 100644
--- a/ompi/mpi/man/man3/MPI_Status_f2c.3
+++ b/ompi/mpi/man/man3/MPI_Status_f2c.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Status_f2c 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Status_f2c 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Status_f2c, MPI_Status_c2f \fP \- Translates a C status into a Fortran status, or vice versa.
 
diff --git a/ompi/mpi/man/man3/MPI_Status_set_cancelled.3 b/ompi/mpi/man/man3/MPI_Status_set_cancelled.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Status_set_cancelled.3
rename to ompi/mpi/man/man3/MPI_Status_set_cancelled.3in
index ca23fe7d1a..0279273013 100644
--- a/ompi/mpi/man/man3/MPI_Status_set_cancelled.3
+++ b/ompi/mpi/man/man3/MPI_Status_set_cancelled.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Status_set_cancelled 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Status_set_cancelled 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Status_set_cancelled\fP \- Sets \fIstatus\fP to indicate a request has been canceled. 
 
diff --git a/ompi/mpi/man/man3/MPI_Status_set_elements.3 b/ompi/mpi/man/man3/MPI_Status_set_elements.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Status_set_elements.3
rename to ompi/mpi/man/man3/MPI_Status_set_elements.3in
index d9eb6ff0a6..ce4bc23db9 100644
--- a/ompi/mpi/man/man3/MPI_Status_set_elements.3
+++ b/ompi/mpi/man/man3/MPI_Status_set_elements.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Status_set_elements 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Status_set_elements 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Status_set_elements\fP \- Modifies opaque part of \fIstatus\fP to allow MPI_Get_elements to return \fIcount\fP.
 
diff --git a/ompi/mpi/man/man3/MPI_Test.3 b/ompi/mpi/man/man3/MPI_Test.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Test.3
rename to ompi/mpi/man/man3/MPI_Test.3in
index ed6cf0f059..f3b0ca01db 100644
--- a/ompi/mpi/man/man3/MPI_Test.3
+++ b/ompi/mpi/man/man3/MPI_Test.3in
@@ -1,7 +1,7 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.\"Copyright 2007, Cisco Systems, Inc.  All rights reserved.
-.TH MPI_Test 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.\"Copyright 2007-2008 Cisco Systems, Inc.  All rights reserved.
+.TH MPI_Test 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Test\fP \- Tests for the completion of a specific send or receive.
 
diff --git a/ompi/mpi/man/man3/MPI_Test_cancelled.3 b/ompi/mpi/man/man3/MPI_Test_cancelled.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Test_cancelled.3
rename to ompi/mpi/man/man3/MPI_Test_cancelled.3in
index 9e052d8802..f8d17c8857 100644
--- a/ompi/mpi/man/man3/MPI_Test_cancelled.3
+++ b/ompi/mpi/man/man3/MPI_Test_cancelled.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Test_cancelled 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Test_cancelled 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Test_cancelled\fP \- Tests whether a request was canceled.
 
diff --git a/ompi/mpi/man/man3/MPI_Testall.3 b/ompi/mpi/man/man3/MPI_Testall.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Testall.3
rename to ompi/mpi/man/man3/MPI_Testall.3in
index 83569ad980..2bb84bf16f 100644
--- a/ompi/mpi/man/man3/MPI_Testall.3
+++ b/ompi/mpi/man/man3/MPI_Testall.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Testall 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Testall 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Testall\fP \- Tests for the completion of all previously initiated communications in a list.
 
diff --git a/ompi/mpi/man/man3/MPI_Testany.3 b/ompi/mpi/man/man3/MPI_Testany.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Testany.3
rename to ompi/mpi/man/man3/MPI_Testany.3in
index 79f639d681..df350d351c 100644
--- a/ompi/mpi/man/man3/MPI_Testany.3
+++ b/ompi/mpi/man/man3/MPI_Testany.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Testany 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Testany 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Testany\fP \- Tests for completion of any one previously initiated communication in a list. 
 
diff --git a/ompi/mpi/man/man3/MPI_Testsome.3 b/ompi/mpi/man/man3/MPI_Testsome.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Testsome.3
rename to ompi/mpi/man/man3/MPI_Testsome.3in
index 30c2ca88a6..a14b802664 100644
--- a/ompi/mpi/man/man3/MPI_Testsome.3
+++ b/ompi/mpi/man/man3/MPI_Testsome.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Testsome 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Testsome 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Testsome\fP \- Tests for completion of one or more previously initiated communications in a list. 
 
diff --git a/ompi/mpi/man/man3/MPI_Topo_test.3 b/ompi/mpi/man/man3/MPI_Topo_test.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Topo_test.3
rename to ompi/mpi/man/man3/MPI_Topo_test.3in
index cb4d4cbfa8..ef8632a2b4 100644
--- a/ompi/mpi/man/man3/MPI_Topo_test.3
+++ b/ompi/mpi/man/man3/MPI_Topo_test.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Topo_test 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Topo_test 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Topo_test\fP \- Determines the type of topology (if any) associated with a communicator.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_c2f.3 b/ompi/mpi/man/man3/MPI_Type_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Type_c2f.3
rename to ompi/mpi/man/man3/MPI_Type_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Type_commit.3 b/ompi/mpi/man/man3/MPI_Type_commit.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Type_commit.3
rename to ompi/mpi/man/man3/MPI_Type_commit.3in
index a8dae29f2a..3aae3b3efb 100644
--- a/ompi/mpi/man/man3/MPI_Type_commit.3
+++ b/ompi/mpi/man/man3/MPI_Type_commit.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_commit 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_commit 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_commit\fP \- Commits a data type.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_contiguous.3 b/ompi/mpi/man/man3/MPI_Type_contiguous.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_contiguous.3
rename to ompi/mpi/man/man3/MPI_Type_contiguous.3in
index 9e888c4148..1e6798c13c 100644
--- a/ompi/mpi/man/man3/MPI_Type_contiguous.3
+++ b/ompi/mpi/man/man3/MPI_Type_contiguous.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_contiguous 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_contiguous 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_contiguous\fP \- Creates a contiguous datatype.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_darray.3 b/ompi/mpi/man/man3/MPI_Type_create_darray.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_create_darray.3
rename to ompi/mpi/man/man3/MPI_Type_create_darray.3in
index 7f79bc296b..8d620e1af7 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_darray.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_darray.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_darray 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_darray 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_darray\fP \- Creates a distributed array datatype;
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_f90_complex.3 b/ompi/mpi/man/man3/MPI_Type_create_f90_complex.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_create_f90_complex.3
rename to ompi/mpi/man/man3/MPI_Type_create_f90_complex.3in
index 315b7df1a3..87c3644eaa 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_f90_complex.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_f90_complex.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_f90_complex 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_f90_complex 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Type_create_f90_integer.3 b/ompi/mpi/man/man3/MPI_Type_create_f90_integer.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Type_create_f90_integer.3
rename to ompi/mpi/man/man3/MPI_Type_create_f90_integer.3in
index 1a18bc6445..196581a236 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_f90_integer.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_f90_integer.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_f90_integer 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_f90_integer 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Type_create_f90_real.3 b/ompi/mpi/man/man3/MPI_Type_create_f90_real.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_create_f90_real.3
rename to ompi/mpi/man/man3/MPI_Type_create_f90_real.3in
index 61e4ae8369..2c06c87eab 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_f90_real.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_f90_real.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_f90_real 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_f90_real 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Type_create_hindexed.3 b/ompi/mpi/man/man3/MPI_Type_create_hindexed.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Type_create_hindexed.3
rename to ompi/mpi/man/man3/MPI_Type_create_hindexed.3in
index dd3ca270e6..cf5607abbd 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_hindexed.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_hindexed.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_hindexed 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_hindexed 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_hindexed\fP \- Creates an indexed data type with offsets in bytes.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_hvector.3 b/ompi/mpi/man/man3/MPI_Type_create_hvector.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_create_hvector.3
rename to ompi/mpi/man/man3/MPI_Type_create_hvector.3in
index 63045d632f..2581223a26 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_hvector.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_hvector.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_hvector 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_hvector 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_hvector\fP \- Creates a vector (strided) data type with offset in bytes. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_indexed_block.3 b/ompi/mpi/man/man3/MPI_Type_create_indexed_block.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Type_create_indexed_block.3
rename to ompi/mpi/man/man3/MPI_Type_create_indexed_block.3in
index 4ffeaadf19..d5f20ac09d 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_indexed_block.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_indexed_block.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_indexed_block 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_indexed_block 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_indexed_block\fP \- Creates an indexed data type with the same block length for all blocks. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_keyval.3 b/ompi/mpi/man/man3/MPI_Type_create_keyval.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_create_keyval.3
rename to ompi/mpi/man/man3/MPI_Type_create_keyval.3in
index e9fea671a1..fdf497be73 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_keyval.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_keyval.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_keyval 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_keyval 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_keyval\fP \- Generates a new attribute key for caching on data types. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_resized.3 b/ompi/mpi/man/man3/MPI_Type_create_resized.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_create_resized.3
rename to ompi/mpi/man/man3/MPI_Type_create_resized.3in
index 94ce533f82..0347550c2a 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_resized.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_resized.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_create_resized 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_resized 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_resized\fP \- Returns a new data type with new extent and upper and lower bounds. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_struct.3 b/ompi/mpi/man/man3/MPI_Type_create_struct.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_create_struct.3
rename to ompi/mpi/man/man3/MPI_Type_create_struct.3in
index 614cf299fe..f14d58a884 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_struct.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_struct.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_struct 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_struct 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_struct\fP \- Creates a structured data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_create_subarray.3 b/ompi/mpi/man/man3/MPI_Type_create_subarray.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_create_subarray.3
rename to ompi/mpi/man/man3/MPI_Type_create_subarray.3in
index b40a39f254..07c6e1a4c3 100644
--- a/ompi/mpi/man/man3/MPI_Type_create_subarray.3
+++ b/ompi/mpi/man/man3/MPI_Type_create_subarray.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_create_subarray 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_create_subarray 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_create_subarray\fP \- Creates a data type describing an \fIn\fP-dimensional subarray of an \fIn\fP-dimensional array. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_delete_attr.3 b/ompi/mpi/man/man3/MPI_Type_delete_attr.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Type_delete_attr.3
rename to ompi/mpi/man/man3/MPI_Type_delete_attr.3in
index 1aace64503..76c34cba4b 100644
--- a/ompi/mpi/man/man3/MPI_Type_delete_attr.3
+++ b/ompi/mpi/man/man3/MPI_Type_delete_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_delete_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_delete_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_delete_attr\fP \- Deletes a datatype-caching attribute value associated with a key. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_dup.3 b/ompi/mpi/man/man3/MPI_Type_dup.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Type_dup.3
rename to ompi/mpi/man/man3/MPI_Type_dup.3in
index 2328fb239d..3a1dfe06ab 100644
--- a/ompi/mpi/man/man3/MPI_Type_dup.3
+++ b/ompi/mpi/man/man3/MPI_Type_dup.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_dup 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_dup 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_dup\fP \- Duplicates a data type with associated key values.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_extent.3 b/ompi/mpi/man/man3/MPI_Type_extent.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_extent.3
rename to ompi/mpi/man/man3/MPI_Type_extent.3in
index 19a49f68e5..ecebd9d3dd 100644
--- a/ompi/mpi/man/man3/MPI_Type_extent.3
+++ b/ompi/mpi/man/man3/MPI_Type_extent.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_extent 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_extent 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_extent\fP \- Returns the extent of a data type, the difference between the upper and lower bounds of the data type -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_f2c.3 b/ompi/mpi/man/man3/MPI_Type_f2c.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Type_f2c.3
rename to ompi/mpi/man/man3/MPI_Type_f2c.3in
diff --git a/ompi/mpi/man/man3/MPI_Type_free.3 b/ompi/mpi/man/man3/MPI_Type_free.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Type_free.3
rename to ompi/mpi/man/man3/MPI_Type_free.3in
index 82e0a822b8..200cbe3b10 100644
--- a/ompi/mpi/man/man3/MPI_Type_free.3
+++ b/ompi/mpi/man/man3/MPI_Type_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_free 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_free 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_free\fP \- Frees a data type.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_free_keyval.3 b/ompi/mpi/man/man3/MPI_Type_free_keyval.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Type_free_keyval.3
rename to ompi/mpi/man/man3/MPI_Type_free_keyval.3in
index 98851c21b1..101a564378 100644
--- a/ompi/mpi/man/man3/MPI_Type_free_keyval.3
+++ b/ompi/mpi/man/man3/MPI_Type_free_keyval.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_free_keyval 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_free_keyval 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_free_keyval\fP \- Frees a previously created type key value. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_get_attr.3 b/ompi/mpi/man/man3/MPI_Type_get_attr.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_get_attr.3
rename to ompi/mpi/man/man3/MPI_Type_get_attr.3in
index e33de8b3c6..4268ad84b6 100644
--- a/ompi/mpi/man/man3/MPI_Type_get_attr.3
+++ b/ompi/mpi/man/man3/MPI_Type_get_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_get_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_get_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_get_attr\fP \- Returns the attribute associated with a data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_get_contents.3 b/ompi/mpi/man/man3/MPI_Type_get_contents.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_get_contents.3
rename to ompi/mpi/man/man3/MPI_Type_get_contents.3in
index 3be14fb779..7f06911a9c 100644
--- a/ompi/mpi/man/man3/MPI_Type_get_contents.3
+++ b/ompi/mpi/man/man3/MPI_Type_get_contents.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_get_contents 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_get_contents 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_get_contents\fP \- Returns information about arguments used in creation of a data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_get_envelope.3 b/ompi/mpi/man/man3/MPI_Type_get_envelope.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_get_envelope.3
rename to ompi/mpi/man/man3/MPI_Type_get_envelope.3in
index 4ed9ce53c8..375dbfe1a3 100644
--- a/ompi/mpi/man/man3/MPI_Type_get_envelope.3
+++ b/ompi/mpi/man/man3/MPI_Type_get_envelope.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_get_envelope 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_get_envelope 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_get_envelope\fP \- Returns informaion about input arguments associated with a data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_get_extent.3 b/ompi/mpi/man/man3/MPI_Type_get_extent.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Type_get_extent.3
rename to ompi/mpi/man/man3/MPI_Type_get_extent.3in
index 4652a20582..754be208f0 100644
--- a/ompi/mpi/man/man3/MPI_Type_get_extent.3
+++ b/ompi/mpi/man/man3/MPI_Type_get_extent.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_get_extent 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_get_extent 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_get_extent\fP \- Returns the lower bound and extent of a data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_get_name.3 b/ompi/mpi/man/man3/MPI_Type_get_name.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Type_get_name.3
rename to ompi/mpi/man/man3/MPI_Type_get_name.3in
index e7fcd64d73..8994a64e2c 100644
--- a/ompi/mpi/man/man3/MPI_Type_get_name.3
+++ b/ompi/mpi/man/man3/MPI_Type_get_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_get_name 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_get_name 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_get_name\fP \- Gets the name of a data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_get_true_extent.3 b/ompi/mpi/man/man3/MPI_Type_get_true_extent.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_get_true_extent.3
rename to ompi/mpi/man/man3/MPI_Type_get_true_extent.3in
index ffe32b450d..78f20dbe17 100644
--- a/ompi/mpi/man/man3/MPI_Type_get_true_extent.3
+++ b/ompi/mpi/man/man3/MPI_Type_get_true_extent.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_get_true_extent 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_get_true_extent 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_get_true_extent\fP \- Returns the true lower bound and extent of a data type's corresponding typemap, ignoring MPI_UB and MPI_LB markers. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_hindexed.3 b/ompi/mpi/man/man3/MPI_Type_hindexed.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Type_hindexed.3
rename to ompi/mpi/man/man3/MPI_Type_hindexed.3in
index 37bc203788..cf8a014206 100644
--- a/ompi/mpi/man/man3/MPI_Type_hindexed.3
+++ b/ompi/mpi/man/man3/MPI_Type_hindexed.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_hindexed 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_hindexed 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_hindexed\fP \- Creates an indexed datatype with offsets in bytes -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_hvector.3 b/ompi/mpi/man/man3/MPI_Type_hvector.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Type_hvector.3
rename to ompi/mpi/man/man3/MPI_Type_hvector.3in
index 57aa6d045a..454612c191 100644
--- a/ompi/mpi/man/man3/MPI_Type_hvector.3
+++ b/ompi/mpi/man/man3/MPI_Type_hvector.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_hvector 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_hvector 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_hvector\fP \- Creates a vector (strided) datatype with offset in bytes -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_indexed.3 b/ompi/mpi/man/man3/MPI_Type_indexed.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_indexed.3
rename to ompi/mpi/man/man3/MPI_Type_indexed.3in
index 6f44c7d735..1b874f27fe 100644
--- a/ompi/mpi/man/man3/MPI_Type_indexed.3
+++ b/ompi/mpi/man/man3/MPI_Type_indexed.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_indexed 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_indexed 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_indexed\fP \- Creates an indexed datatype.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_lb.3 b/ompi/mpi/man/man3/MPI_Type_lb.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Type_lb.3
rename to ompi/mpi/man/man3/MPI_Type_lb.3in
index ca75f0957d..68c4a9c4a0 100644
--- a/ompi/mpi/man/man3/MPI_Type_lb.3
+++ b/ompi/mpi/man/man3/MPI_Type_lb.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_lb 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_lb 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_lb\fP \- Returns the lower bound of a data type. This may differ from zero if the type was constructed using MPI_LB. Use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_match_size.3 b/ompi/mpi/man/man3/MPI_Type_match_size.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Type_match_size.3
rename to ompi/mpi/man/man3/MPI_Type_match_size.3in
index 0ad831793b..9f461a9155 100644
--- a/ompi/mpi/man/man3/MPI_Type_match_size.3
+++ b/ompi/mpi/man/man3/MPI_Type_match_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_match_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_match_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 
 \fBMPI_Type_match_size\fP \- Returns an MPI datatype of a given type and size
diff --git a/ompi/mpi/man/man3/MPI_Type_set_attr.3 b/ompi/mpi/man/man3/MPI_Type_set_attr.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Type_set_attr.3
rename to ompi/mpi/man/man3/MPI_Type_set_attr.3in
index b0940879bb..5fcd8f162b 100644
--- a/ompi/mpi/man/man3/MPI_Type_set_attr.3
+++ b/ompi/mpi/man/man3/MPI_Type_set_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_set_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_set_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_set_attr\fP \- Sets a key value/attribute pair to a data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_set_name.3 b/ompi/mpi/man/man3/MPI_Type_set_name.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Type_set_name.3
rename to ompi/mpi/man/man3/MPI_Type_set_name.3in
index bf26167966..3a8702d737 100644
--- a/ompi/mpi/man/man3/MPI_Type_set_name.3
+++ b/ompi/mpi/man/man3/MPI_Type_set_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\"Copyright (c) 1996 Thinking Machines
-.TH MPI_Type_set_name 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_set_name 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_set_name\fP \- Sets the name of a data type. 
 
diff --git a/ompi/mpi/man/man3/MPI_Type_size.3 b/ompi/mpi/man/man3/MPI_Type_size.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Type_size.3
rename to ompi/mpi/man/man3/MPI_Type_size.3in
index 891141e205..2fa8aa4475 100644
--- a/ompi/mpi/man/man3/MPI_Type_size.3
+++ b/ompi/mpi/man/man3/MPI_Type_size.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_size 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_size 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_size\fP \- Returns the number of bytes occupied by entries in a data type.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_struct.3 b/ompi/mpi/man/man3/MPI_Type_struct.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_struct.3
rename to ompi/mpi/man/man3/MPI_Type_struct.3in
index 8632edd08d..ea31a4c459 100644
--- a/ompi/mpi/man/man3/MPI_Type_struct.3
+++ b/ompi/mpi/man/man3/MPI_Type_struct.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_struct 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_struct 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_struct\fP \- Creates a \fIstruct\fP data type -- use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_ub.3 b/ompi/mpi/man/man3/MPI_Type_ub.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Type_ub.3
rename to ompi/mpi/man/man3/MPI_Type_ub.3in
index d343dc27b0..c8f6f64514 100644
--- a/ompi/mpi/man/man3/MPI_Type_ub.3
+++ b/ompi/mpi/man/man3/MPI_Type_ub.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_ub 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_ub 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_ub\fP \- Returns the upper bound of a datatype. This will differ from zero if the type was constructed using MPI_UB. The upper bound will take into account any alignment considerations. Use of this routine is deprecated.
 
diff --git a/ompi/mpi/man/man3/MPI_Type_vector.3 b/ompi/mpi/man/man3/MPI_Type_vector.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Type_vector.3
rename to ompi/mpi/man/man3/MPI_Type_vector.3in
index 6ba04af134..33514fdcc8 100644
--- a/ompi/mpi/man/man3/MPI_Type_vector.3
+++ b/ompi/mpi/man/man3/MPI_Type_vector.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Type_vector 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Type_vector 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Type_vector\fP \- Creates a vector (strided) datatype.
 
diff --git a/ompi/mpi/man/man3/MPI_Unpack.3 b/ompi/mpi/man/man3/MPI_Unpack.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Unpack.3
rename to ompi/mpi/man/man3/MPI_Unpack.3in
index 5647ee96d5..9636a573de 100644
--- a/ompi/mpi/man/man3/MPI_Unpack.3
+++ b/ompi/mpi/man/man3/MPI_Unpack.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Unpack 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Unpack 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Unpack\fP \- Unpacks a datatype into contiguous memory.
 
diff --git a/ompi/mpi/man/man3/MPI_Unpack_external.3 b/ompi/mpi/man/man3/MPI_Unpack_external.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Unpack_external.3
rename to ompi/mpi/man/man3/MPI_Unpack_external.3in
index 62d8345941..e40b55d8fa 100644
--- a/ompi/mpi/man/man3/MPI_Unpack_external.3
+++ b/ompi/mpi/man/man3/MPI_Unpack_external.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Unpack_external 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Unpack_external 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Unpack_external\fP \- Reads data from a portable format
diff --git a/ompi/mpi/man/man3/MPI_Unpublish_name.3 b/ompi/mpi/man/man3/MPI_Unpublish_name.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Unpublish_name.3
rename to ompi/mpi/man/man3/MPI_Unpublish_name.3in
index 80106922e5..0da515b5ba 100644
--- a/ompi/mpi/man/man3/MPI_Unpublish_name.3
+++ b/ompi/mpi/man/man3/MPI_Unpublish_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Unpublish_name 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Unpublish_name 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 
 .SH NAME
 .nf
diff --git a/ompi/mpi/man/man3/MPI_Wait.3 b/ompi/mpi/man/man3/MPI_Wait.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Wait.3
rename to ompi/mpi/man/man3/MPI_Wait.3in
index e960001ded..b1a4bde0a8 100644
--- a/ompi/mpi/man/man3/MPI_Wait.3
+++ b/ompi/mpi/man/man3/MPI_Wait.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Wait 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Wait 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Wait\fP \- Waits for an MPI send or receive to complete.
 
diff --git a/ompi/mpi/man/man3/MPI_Waitall.3 b/ompi/mpi/man/man3/MPI_Waitall.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Waitall.3
rename to ompi/mpi/man/man3/MPI_Waitall.3in
index ef9b5c07cf..7df4d7cded 100644
--- a/ompi/mpi/man/man3/MPI_Waitall.3
+++ b/ompi/mpi/man/man3/MPI_Waitall.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Waitall 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Waitall 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Waitall\fP \- Waits for all given communications to complete.
 
diff --git a/ompi/mpi/man/man3/MPI_Waitany.3 b/ompi/mpi/man/man3/MPI_Waitany.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Waitany.3
rename to ompi/mpi/man/man3/MPI_Waitany.3in
index c270d0c30b..5e2fa3f976 100644
--- a/ompi/mpi/man/man3/MPI_Waitany.3
+++ b/ompi/mpi/man/man3/MPI_Waitany.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Waitany 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Waitany 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Waitany\fP \- Waits for any specified send or receive to complete.
 
diff --git a/ompi/mpi/man/man3/MPI_Waitsome.3 b/ompi/mpi/man/man3/MPI_Waitsome.3in
similarity index 98%
rename from ompi/mpi/man/man3/MPI_Waitsome.3
rename to ompi/mpi/man/man3/MPI_Waitsome.3in
index c1654bdf8a..e1bd97923c 100644
--- a/ompi/mpi/man/man3/MPI_Waitsome.3
+++ b/ompi/mpi/man/man3/MPI_Waitsome.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Waitsome 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Waitsome 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Waitsome\fP \- Waits for some given communications to complete.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_c2f.3 b/ompi/mpi/man/man3/MPI_Win_c2f.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Win_c2f.3
rename to ompi/mpi/man/man3/MPI_Win_c2f.3in
diff --git a/ompi/mpi/man/man3/MPI_Win_call_errhandler.3 b/ompi/mpi/man/man3/MPI_Win_call_errhandler.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Win_call_errhandler.3
rename to ompi/mpi/man/man3/MPI_Win_call_errhandler.3in
index ec5867d956..64b7397af9 100644
--- a/ompi/mpi/man/man3/MPI_Win_call_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Win_call_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_call_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_call_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 
 .SH NAME
 \fBMPI_Win_call_errhandler\fP \- Passes the supplied error code to the
diff --git a/ompi/mpi/man/man3/MPI_Win_complete.3 b/ompi/mpi/man/man3/MPI_Win_complete.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Win_complete.3
rename to ompi/mpi/man/man3/MPI_Win_complete.3in
index 62e3209d42..1bad766b87 100644
--- a/ompi/mpi/man/man3/MPI_Win_complete.3
+++ b/ompi/mpi/man/man3/MPI_Win_complete.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_complete 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_complete 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_complete\fP \- Completes an RMA access epoch on \fIwin\fP started by a call to MPI_Win_start
 
diff --git a/ompi/mpi/man/man3/MPI_Win_create.3 b/ompi/mpi/man/man3/MPI_Win_create.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Win_create.3
rename to ompi/mpi/man/man3/MPI_Win_create.3in
index 9f1bc48345..83ee478c52 100644
--- a/ompi/mpi/man/man3/MPI_Win_create.3
+++ b/ompi/mpi/man/man3/MPI_Win_create.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_create 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_create 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_create\fP \- One-sided MPI call that returns a window object for RMA operations.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_create_errhandler.3 b/ompi/mpi/man/man3/MPI_Win_create_errhandler.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Win_create_errhandler.3
rename to ompi/mpi/man/man3/MPI_Win_create_errhandler.3in
index 3b70d98dcf..83b60bc2b7 100644
--- a/ompi/mpi/man/man3/MPI_Win_create_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Win_create_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_create_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_create_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_create_errhandler\fP \- Creates an error handler for a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_create_keyval.3 b/ompi/mpi/man/man3/MPI_Win_create_keyval.3in
similarity index 97%
rename from ompi/mpi/man/man3/MPI_Win_create_keyval.3
rename to ompi/mpi/man/man3/MPI_Win_create_keyval.3in
index fae164ceab..a2c07a3aab 100644
--- a/ompi/mpi/man/man3/MPI_Win_create_keyval.3
+++ b/ompi/mpi/man/man3/MPI_Win_create_keyval.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_create_keyval 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_create_keyval 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_create_keyval\fP \- Creates a keyval for a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_delete_attr.3 b/ompi/mpi/man/man3/MPI_Win_delete_attr.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Win_delete_attr.3
rename to ompi/mpi/man/man3/MPI_Win_delete_attr.3in
index cacbe683d1..757b37ae7d 100644
--- a/ompi/mpi/man/man3/MPI_Win_delete_attr.3
+++ b/ompi/mpi/man/man3/MPI_Win_delete_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_delete_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_delete_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_delete_attr\fP \- Deletes an attribute from a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_f2c.3 b/ompi/mpi/man/man3/MPI_Win_f2c.3in
similarity index 100%
rename from ompi/mpi/man/man3/MPI_Win_f2c.3
rename to ompi/mpi/man/man3/MPI_Win_f2c.3in
diff --git a/ompi/mpi/man/man3/MPI_Win_fence.3 b/ompi/mpi/man/man3/MPI_Win_fence.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Win_fence.3
rename to ompi/mpi/man/man3/MPI_Win_fence.3in
index 11560e205c..0cf3e1e876 100644
--- a/ompi/mpi/man/man3/MPI_Win_fence.3
+++ b/ompi/mpi/man/man3/MPI_Win_fence.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_fence 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_fence 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_fence\fP \- Synchronizes RMA calls on a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_free.3 b/ompi/mpi/man/man3/MPI_Win_free.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Win_free.3
rename to ompi/mpi/man/man3/MPI_Win_free.3in
index 3ca8fe92af..9d45ff0437 100644
--- a/ompi/mpi/man/man3/MPI_Win_free.3
+++ b/ompi/mpi/man/man3/MPI_Win_free.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_free 3OpenMPI "March 2006" "Open MPI 1.2" " "
+.TH MPI_Win_free 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_free\fP \- Frees the window object and returns a null handle.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_free_keyval.3 b/ompi/mpi/man/man3/MPI_Win_free_keyval.3in
similarity index 91%
rename from ompi/mpi/man/man3/MPI_Win_free_keyval.3
rename to ompi/mpi/man/man3/MPI_Win_free_keyval.3in
index 7e9c103154..f4cf638e3c 100644
--- a/ompi/mpi/man/man3/MPI_Win_free_keyval.3
+++ b/ompi/mpi/man/man3/MPI_Win_free_keyval.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_free_keyval 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_free_keyval 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_free_keyval\fP \- Frees a window keyval.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_get_attr.3 b/ompi/mpi/man/man3/MPI_Win_get_attr.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Win_get_attr.3
rename to ompi/mpi/man/man3/MPI_Win_get_attr.3in
index 9b553ff3e2..fc4b9f991c 100644
--- a/ompi/mpi/man/man3/MPI_Win_get_attr.3
+++ b/ompi/mpi/man/man3/MPI_Win_get_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_get_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_get_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_get_attr\fP \- Obtains the value of a window attribute.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_get_errhandler.3 b/ompi/mpi/man/man3/MPI_Win_get_errhandler.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Win_get_errhandler.3
rename to ompi/mpi/man/man3/MPI_Win_get_errhandler.3in
index 2e332fb412..f794600258 100644
--- a/ompi/mpi/man/man3/MPI_Win_get_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Win_get_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_get_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_get_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_get_errhandler\fP \- Retrieves the error handler currently associated with a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_get_group.3 b/ompi/mpi/man/man3/MPI_Win_get_group.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Win_get_group.3
rename to ompi/mpi/man/man3/MPI_Win_get_group.3in
index 6a5e01f6c7..a9050aecbb 100644
--- a/ompi/mpi/man/man3/MPI_Win_get_group.3
+++ b/ompi/mpi/man/man3/MPI_Win_get_group.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_get_group 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_get_group 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_get_group\fP \- Returns a duplicate of the group of the communicator used to create the window. 
 
diff --git a/ompi/mpi/man/man3/MPI_Win_get_name.3 b/ompi/mpi/man/man3/MPI_Win_get_name.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Win_get_name.3
rename to ompi/mpi/man/man3/MPI_Win_get_name.3in
index 078d511cf3..a6475caf6c 100644
--- a/ompi/mpi/man/man3/MPI_Win_get_name.3
+++ b/ompi/mpi/man/man3/MPI_Win_get_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_get_name 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_get_name 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_get_name\fP \- Obtains the name of a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_lock.3 b/ompi/mpi/man/man3/MPI_Win_lock.3in
similarity index 96%
rename from ompi/mpi/man/man3/MPI_Win_lock.3
rename to ompi/mpi/man/man3/MPI_Win_lock.3in
index 5a8dea967a..1651915c52 100644
--- a/ompi/mpi/man/man3/MPI_Win_lock.3
+++ b/ompi/mpi/man/man3/MPI_Win_lock.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_lock 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_lock 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_lock\fP \- Starts an RMA access epoch locking access to a particular rank.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_post.3 b/ompi/mpi/man/man3/MPI_Win_post.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Win_post.3
rename to ompi/mpi/man/man3/MPI_Win_post.3in
index 31f771ffd0..0fad734fe6 100644
--- a/ompi/mpi/man/man3/MPI_Win_post.3
+++ b/ompi/mpi/man/man3/MPI_Win_post.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_post 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_post 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_post\fP \- Starts an RMA exposure epoch for the local window associated with \fIwin\fP
 
diff --git a/ompi/mpi/man/man3/MPI_Win_set_attr.3 b/ompi/mpi/man/man3/MPI_Win_set_attr.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Win_set_attr.3
rename to ompi/mpi/man/man3/MPI_Win_set_attr.3in
index 7960a4d76e..a7f4582245 100644
--- a/ompi/mpi/man/man3/MPI_Win_set_attr.3
+++ b/ompi/mpi/man/man3/MPI_Win_set_attr.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_set_attr 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_set_attr 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_set_attr\fP \- Sets the value of a window attribute.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_set_errhandler.3 b/ompi/mpi/man/man3/MPI_Win_set_errhandler.3in
similarity index 93%
rename from ompi/mpi/man/man3/MPI_Win_set_errhandler.3
rename to ompi/mpi/man/man3/MPI_Win_set_errhandler.3in
index 39c8d74d6e..377568c979 100644
--- a/ompi/mpi/man/man3/MPI_Win_set_errhandler.3
+++ b/ompi/mpi/man/man3/MPI_Win_set_errhandler.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_set_errhandler 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_set_errhandler 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_set_errhandler\fP \- Attaches a new error handler to a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_set_name.3 b/ompi/mpi/man/man3/MPI_Win_set_name.3in
similarity index 92%
rename from ompi/mpi/man/man3/MPI_Win_set_name.3
rename to ompi/mpi/man/man3/MPI_Win_set_name.3in
index f93cc3f488..3025e04fbe 100644
--- a/ompi/mpi/man/man3/MPI_Win_set_name.3
+++ b/ompi/mpi/man/man3/MPI_Win_set_name.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_set_name 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Win_set_name 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_set_name\fP \- Sets the name of a window.
 
diff --git a/ompi/mpi/man/man3/MPI_Win_start.3 b/ompi/mpi/man/man3/MPI_Win_start.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Win_start.3
rename to ompi/mpi/man/man3/MPI_Win_start.3in
index 62656f98f8..f6e367cf91 100644
--- a/ompi/mpi/man/man3/MPI_Win_start.3
+++ b/ompi/mpi/man/man3/MPI_Win_start.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_start 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_start 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_start\fP \- Starts an RMA access epoch for \fIwin\fP
 
diff --git a/ompi/mpi/man/man3/MPI_Win_test.3 b/ompi/mpi/man/man3/MPI_Win_test.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Win_test.3
rename to ompi/mpi/man/man3/MPI_Win_test.3in
index 093340eeb3..838308c1d1 100644
--- a/ompi/mpi/man/man3/MPI_Win_test.3
+++ b/ompi/mpi/man/man3/MPI_Win_test.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_test 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_test 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_test\fP \- Attempts to complete an RMA exposure epoch; a nonblocking version of MPI_Win_wait
 
diff --git a/ompi/mpi/man/man3/MPI_Win_unlock.3 b/ompi/mpi/man/man3/MPI_Win_unlock.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Win_unlock.3
rename to ompi/mpi/man/man3/MPI_Win_unlock.3in
index 1875270cf0..65e5230e7b 100644
--- a/ompi/mpi/man/man3/MPI_Win_unlock.3
+++ b/ompi/mpi/man/man3/MPI_Win_unlock.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_unlock 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_unlock 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_unlock\fP \- Completes an RMA access epoch started by a call to MPI_Win_lock. 
 
diff --git a/ompi/mpi/man/man3/MPI_Win_wait.3 b/ompi/mpi/man/man3/MPI_Win_wait.3in
similarity index 94%
rename from ompi/mpi/man/man3/MPI_Win_wait.3
rename to ompi/mpi/man/man3/MPI_Win_wait.3in
index 28f0e0fcf6..8944a1eee6 100644
--- a/ompi/mpi/man/man3/MPI_Win_wait.3
+++ b/ompi/mpi/man/man3/MPI_Win_wait.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2007, Sun Microsystems, Inc.
+.\"Copyright 2007-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Win_wait 3OpenMPI "March 2007" "Open MPI 1.2" " "
+.TH MPI_Win_wait 3 "#OMPI_DATE#" ""#PACKAGE_VERSION#"" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Win_wait\fP \- Completes an RMA exposure epoch started by a call to MPI_Win_post on \fIwin\fP
 
diff --git a/ompi/mpi/man/man3/MPI_Wtick.3 b/ompi/mpi/man/man3/MPI_Wtick.3in
similarity index 90%
rename from ompi/mpi/man/man3/MPI_Wtick.3
rename to ompi/mpi/man/man3/MPI_Wtick.3in
index 93e137958d..16f2730872 100644
--- a/ompi/mpi/man/man3/MPI_Wtick.3
+++ b/ompi/mpi/man/man3/MPI_Wtick.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Wtick 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Wtick 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Wtick\fP \- Returns the resolution of MPI_Wtime.
 
diff --git a/ompi/mpi/man/man3/MPI_Wtime.3 b/ompi/mpi/man/man3/MPI_Wtime.3in
similarity index 95%
rename from ompi/mpi/man/man3/MPI_Wtime.3
rename to ompi/mpi/man/man3/MPI_Wtime.3in
index 55dab09da5..0977c950b6 100644
--- a/ompi/mpi/man/man3/MPI_Wtime.3
+++ b/ompi/mpi/man/man3/MPI_Wtime.3in
@@ -1,6 +1,6 @@
-.\"Copyright 2006, Sun Microsystems, Inc.
+.\"Copyright 2006-2008 Sun Microsystems, Inc.
 .\" Copyright (c) 1996 Thinking Machines Corporation
-.TH MPI_Wtime 3OpenMPI "September 2006" "Open MPI 1.2" " "
+.TH MPI_Wtime 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBMPI_Wtime\fP \- Returns an elapsed time on the calling processor.
 
diff --git a/ompi/mpi/man/man3/Makefile.extra b/ompi/mpi/man/man3/Makefile.extra
index ff392bdcb5..bf8b4a75c8 100644
--- a/ompi/mpi/man/man3/Makefile.extra
+++ b/ompi/mpi/man/man3/Makefile.extra
@@ -1,5 +1,6 @@
-#
-# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# -*- makefile -*-
+# Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -7,6 +8,8 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
 mpi_api_man_pages = \
         mpi/man/man3/MPI.3 \
         mpi/man/man3/MPI_Abort.3 \
@@ -315,5 +318,5 @@ mpi_api_man_pages = \
         mpi/man/man3/MPI_Wtime.3 \
         mpi/man/man3/OpenMPI.3
 
-man_MANS += $(mpi_api_man_pages)
+dist_man_MANS += $(mpi_api_man_pages)
 EXTRA_DIST += $(mpi_api_man_pages)
diff --git a/ompi/mpi/man/man3/OpenMPI.3 b/ompi/mpi/man/man3/OpenMPI.3in
similarity index 100%
rename from ompi/mpi/man/man3/OpenMPI.3
rename to ompi/mpi/man/man3/OpenMPI.3in
diff --git a/ompi/tools/ompi-server/Makefile.am b/ompi/tools/ompi-server/Makefile.am
index b9e03fb8a0..75600e2c7c 100644
--- a/ompi/tools/ompi-server/Makefile.am
+++ b/ompi/tools/ompi-server/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,6 +18,11 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = ompi-server.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if OMPI_INSTALL_BINARIES
 if !ORTE_DISABLE_FULL_SUPPORT
 
@@ -24,7 +30,7 @@ bin_PROGRAMS = ompi-server
 
 dist_pkgdata_DATA = help-ompi-server.txt
 
-dist_man_MANS = ompi-server.1
+man_MANS = $(man_pages)
 
 endif # !ORTE_DISABLE_FULL_SUPPORT
 endif # OMPI_INSTALL_BINARIES
@@ -32,3 +38,5 @@ endif # OMPI_INSTALL_BINARIES
 ompi_server_SOURCES = ompi-server.c 
 ompi_server_LDADD = $(top_builddir)/ompi/libmpi.la
 
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/ompi/tools/ompi-server/ompi-server.1 b/ompi/tools/ompi-server/ompi-server.1in
similarity index 96%
rename from ompi/tools/ompi-server/ompi-server.1
rename to ompi/tools/ompi-server/ompi-server.1in
index 471c8974a2..6ccc2136f3 100644
--- a/ompi/tools/ompi-server/ompi-server.1
+++ b/ompi/tools/ompi-server/ompi-server.1in
@@ -6,7 +6,7 @@
 .\" Man page for OMPI's ompi-server command
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OMPI-SERVER  1       "July 2008" "Open MPI"   "OPEN MPI COMMANDS"
+.TH     OMPI-SERVER  1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
diff --git a/ompi/tools/ompi_info/Makefile.am b/ompi/tools/ompi_info/Makefile.am
index c72f7969c5..c2c03c3cb1 100644
--- a/ompi/tools/ompi_info/Makefile.am
+++ b/ompi/tools/ompi_info/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -38,13 +39,18 @@ AM_CPPFLAGS = \
             -DOMPI_F90_ABSOLUTE="\"@OMPI_F90_ABSOLUTE@\"" \
             -DOMPI_F90_BUILD_SIZE="\"@OMPI_F90_BUILD_SIZE@\""
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = ompi_info.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = ompi_info
 
 dist_pkgdata_DATA = help-ompi_info.txt
 
-dist_man_MANS = ompi_info.1
+man_MANS = $(man_pages)
 
 endif
 
@@ -59,3 +65,6 @@ ompi_info_LDADD = $(top_builddir)/ompi/libmpi.la
 
 clean-local:
 	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || $(RM) -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
+
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/ompi/tools/ompi_info/ompi_info.1 b/ompi/tools/ompi_info/ompi_info.1in
similarity index 96%
rename from ompi/tools/ompi_info/ompi_info.1
rename to ompi/tools/ompi_info/ompi_info.1in
index fc377d0d15..8923cc039e 100644
--- a/ompi/tools/ompi_info/ompi_info.1
+++ b/ompi/tools/ompi_info/ompi_info.1in
@@ -1,6 +1,7 @@
 .\" Man page contributed by Dirk Eddelbuettel <edd@debian.org>
 .\" and released under the BSD license
-.TH OMPI_INFO 1 "July 2006" "Open MPI" "OPEN MPI COMMANDS"
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+.TH OMPI_INFO 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 ompi_info - Display information about the Open MPI installation
 .
diff --git a/ompi/tools/ompi_info/version.cc b/ompi/tools/ompi_info/version.cc
index 87519750ca..5f0f96fbc4 100644
--- a/ompi/tools/ompi_info/version.cc
+++ b/ompi/tools/ompi_info/version.cc
@@ -10,6 +10,7 @@
 // Copyright (c) 2004-2005 The Regents of the University of California.
 //                         All rights reserved.
 // Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 // $COPYRIGHT$
 // 
 // Additional copyrights may follow
@@ -135,6 +136,8 @@ void ompi_info::show_ompi_version(const string& scope)
                        OMPI_WANT_SVN, OMPI_SVN_R));
   out("Open MPI SVN revision", type_ompi + ":version:svn",
       OMPI_SVN_R);
+  out("Open MPI release date", type_ompi + ":version:release_date", 
+      OMPI_RELEASE_DATE);
 
   out("Open RTE", type_orte + ":version:full",
       make_version_str(scope, 
@@ -144,6 +147,8 @@ void ompi_info::show_ompi_version(const string& scope)
                        ORTE_WANT_SVN, ORTE_SVN_R));
   out("Open RTE SVN revision", type_orte + ":version:svn",
       ORTE_SVN_R);
+  out("Open RTE release date", type_orte + ":version:release_date", 
+      ORTE_RELEASE_DATE);
 
   out("OPAL", type_opal + ":version:full",
       make_version_str(scope, 
@@ -153,6 +158,8 @@ void ompi_info::show_ompi_version(const string& scope)
                        OPAL_WANT_SVN, OPAL_SVN_R));
   out("OPAL SVN revision", type_opal + ":version:svn",
       OPAL_SVN_R);
+  out("OPAL release date", type_opal + ":version:release_date", 
+      OPAL_RELEASE_DATE);
   out("Ident string", "ident", OPAL_IDENT_STRING);
 }
 
diff --git a/ompi/tools/ortetools/Makefile.am b/ompi/tools/ortetools/Makefile.am
index 483dd59fee..f4b5d4ca66 100644
--- a/ompi/tools/ortetools/Makefile.am
+++ b/ompi/tools/ortetools/Makefile.am
@@ -17,14 +17,13 @@
 # $HEADER$
 #
 
+man_pages = mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1
+EXTRA_DIST = $(man_pages)
+
 if OMPI_INSTALL_BINARIES
 if !ORTE_DISABLE_FULL_SUPPORT
 
-dist_man_MANS =\
-        mpirun.1 \
-        mpiexec.1 \
-        ompi-ps.1 \
-        ompi-clean.1
+man_MANS = $(man_pages)
 
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); rm -f mpirun$(EXEEXT); $(LN_S) orterun$(EXEEXT) mpirun$(EXEEXT))
@@ -41,17 +40,26 @@ uninstall-local:
 endif # !ORTE_DISABLE_FULL_SUPPORT
 endif # OMPI_INSTALL_BINARIES
 
+$(top_srcdir)/orte/tools/orterun/orterun.1:
+	(cd $(top_srcdir)/orte/tools/orterun ; make orterun.1)
+
 mpirun.1: $(top_srcdir)/orte/tools/orterun/orterun.1
 	cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpirun.1
 
 mpiexec.1: $(top_srcdir)/orte/tools/orterun/orterun.1
 	cp -f $(top_srcdir)/orte/tools/orterun/orterun.1 mpiexec.1
 
+$(top_srcdir)/orte/tools/orte-ps/orte-ps.1:
+	(cd $(top_srcdir)/orte/tools/orte-ps ; make orte-ps.1)
+
 ompi-ps.1: $(top_srcdir)/orte/tools/orte-ps/orte-ps.1
 	cp -f $(top_srcdir)/orte/tools/orte-ps/orte-ps.1 ompi-ps.1
 
+$(top_srcdir)/orte/tools/orte-clean/orte-clean.1:
+	(cd $(top_srcdir)/orte/tools/orte-clean ; make orte-clean.1)
+
 ompi-clean.1: $(top_srcdir)/orte/tools/orte-clean/orte-clean.1
 	cp -f $(top_srcdir)/orte/tools/orte-clean/orte-clean.1 ompi-clean.1
 
-distclean-local:
-	rm -f mpirun.1 mpiexec.1 ompi-ps.1 ompi-clean.1
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am
index 3620f667dd..29993eb324 100644
--- a/ompi/tools/wrappers/Makefile.am
+++ b/ompi/tools/wrappers/Makefile.am
@@ -17,6 +17,8 @@
 # $HEADER$
 #
 
+man_pages = mpicc.1 mpic++.1 mpicxx.1 mpif77.1 mpif90.1
+EXTRA_DIST = $(man_pages)
 
 if OMPI_WANT_SCRIPT_WRAPPER_COMPILERS
 
@@ -50,12 +52,7 @@ else # OMPI_WANT_SHELL_WRAPPER_COMPILERS
 
 if OMPI_INSTALL_BINARIES
 
-dist_man_MANS = \
-	mpicc.1 \
-	mpic++.1 \
-	mpicxx.1 \
-	mpif77.1 \
-	mpif90.1
+man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = \
         mpicc-wrapper-data.txt \
@@ -113,24 +110,27 @@ endif # OMPI_WANT_SHELL_WRAPPER_COMPILERS
 #
 ########################################################
 maintainer-clean-local:
-	rm -f mpicc.1 mpic++.1 mpicxx.1 mpif77.1 mpif90.1
+	rm -f $(man_pages)
+
+$(top_srcdir)/opal/tools/wrappers/generic_wrapper.1:
+	(cd $(top_srcdir)/opal/tools/wrappers ; make generic_wrapper.1)
 
 mpicc.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1
 	rm -f mpicc.1
-	sed -e 's/@COMMAND@/mpicc/g' -e 's/@PROJECT@/Open MPI/g' -e 's/@PROJECT_SHORT@/OMPI/g' -e 's/@LANGUAGE@/C/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpicc.1
+	sed -e 's/#COMMAND#/mpicc/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/C/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpicc.1
 
 mpic++.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1
 	rm -f mpic++.1
-	sed -e 's/@COMMAND@/mpic++/g' -e 's/@PROJECT@/Open MPI/g' -e 's/@PROJECT_SHORT@/OMPI/g' -e 's/@LANGUAGE@/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpic++.1
+	sed -e 's/#COMMAND#/mpic++/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpic++.1
 
 mpicxx.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1
 	rm -f mpicxx.1
-	sed -e 's/@COMMAND@/mpicxx/g' -e 's/@PROJECT@/Open MPI/g' -e 's/@PROJECT_SHORT@/OMPI/g' -e 's/@LANGUAGE@/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpicxx.1
+	sed -e 's/#COMMAND#/mpicxx/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpicxx.1
 
 mpif77.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1
 	rm -f mpif77.1
-	sed -e 's/@COMMAND@/mpif77/g' -e 's/@PROJECT@/Open MPI/g' -e 's/@PROJECT_SHORT@/OMPI/g' -e 's/@LANGUAGE@/Fortran 77/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpif77.1
+	sed -e 's/#COMMAND#/mpif77/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/Fortran 77/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpif77.1
 
 mpif90.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1
 	rm -f mpif90.1
-	sed -e 's/@COMMAND@/mpif90/g' -e 's/@PROJECT@/Open MPI/g' -e 's/@PROJECT_SHORT@/OMPI/g' -e 's/@LANGUAGE@/Fortran 90/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpif90.1
+	sed -e 's/#COMMAND#/mpif90/g' -e 's/#PROJECT#/Open MPI/g' -e 's/#PROJECT_SHORT#/OMPI/g' -e 's/#LANGUAGE#/Fortran 90/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > mpif90.1
diff --git a/opal/mca/crs/Makefile.am b/opal/mca/crs/Makefile.am
index e19d134a36..7277e21b90 100644
--- a/opal/mca/crs/Makefile.am
+++ b/opal/mca/crs/Makefile.am
@@ -9,6 +9,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -16,6 +18,8 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
 # main library setup
 noinst_LTLIBRARIES = libmca_crs.la
 libmca_crs_la_SOURCES =
@@ -28,8 +32,8 @@ headers = crs.h
 libmca_crs_la_SOURCES += $(headers)
 
 # Manual pages
-man_MANS = opal_crs.7
-EXTRA_DIST = opal_crs.7
+dist_man_MANS = opal_crs.7
+EXTRA_DIST = $(dist_man_MANS:.7=.7in)
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
diff --git a/opal/mca/crs/opal_crs.7 b/opal/mca/crs/opal_crs.7in
similarity index 97%
rename from opal/mca/crs/opal_crs.7
rename to opal/mca/crs/opal_crs.7in
index d1ece88002..5ff652f90a 100644
--- a/opal/mca/crs/opal_crs.7
+++ b/opal/mca/crs/opal_crs.7in
@@ -6,14 +6,15 @@
 .\" Man page for OPAL's CRS Functionality
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OPAL_CRS  7       "March 2007" "Open PAL"   "OPEN PAL CRS OVERVIEW"
+.TH     OPAL_CRS  7 "#OMPI_DATE#" "#PACKAGE_VERSION" "#PACKAGE_NAME#"
+
 .\" **************************
 .\"    Name Section
 .\" **************************
 .SH NAME
 .
 Open PAL MCA Checkpoint/Restart Service (CRS) \- Overview of Open PAL's CRS 
-framework, and selected modules.
+framework, and selected modules.  #PACKAGE_NAME# #PACKAGE_VERSION#. 
 .
 .\" **************************
 .\"    Description Section
diff --git a/opal/tools/opal-checkpoint/Makefile.am b/opal/tools/opal-checkpoint/Makefile.am
index db2fec1dcb..38014172a6 100644
--- a/opal/tools/opal-checkpoint/Makefile.am
+++ b/opal/tools/opal-checkpoint/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,11 +18,16 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = opal-checkpoint.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = opal-checkpoint
 
-dist_man_MANS = opal-checkpoint.1
+man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = help-opal-checkpoint.txt
 
@@ -30,3 +36,5 @@ endif # OMPI_INSTALL_BINARIES
 opal_checkpoint_SOURCES = opal-checkpoint.c
 opal_checkpoint_LDADD = $(top_builddir)/opal/libopen-pal.la
 
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/opal/tools/opal-checkpoint/opal-checkpoint.1 b/opal/tools/opal-checkpoint/opal-checkpoint.1in
similarity index 94%
rename from opal/tools/opal-checkpoint/opal-checkpoint.1
rename to opal/tools/opal-checkpoint/opal-checkpoint.1in
index 11c18fb081..bad8dbb5b2 100644
--- a/opal/tools/opal-checkpoint/opal-checkpoint.1
+++ b/opal/tools/opal-checkpoint/opal-checkpoint.1in
@@ -2,11 +2,12 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for OPAL's opal-checkpoint command
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OPAL-CHECKPOINT  1       "March 2007" "Open PAL"   "OPEN PAL COMMANDS"
+.TH     OPAL-CHECKPOINT  1       "#OMPI_DATE#" "#PACKAGE_NAME#"   "#PACKAGE_VERSION#"
 .\" **************************
 .\"    Name Section
 .\" **************************
diff --git a/opal/tools/opal-restart/Makefile.am b/opal/tools/opal-restart/Makefile.am
index a3b292c9d2..98de085b79 100644
--- a/opal/tools/opal-restart/Makefile.am
+++ b/opal/tools/opal-restart/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,11 +18,16 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = opal-restart.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = opal-restart
 
-dist_man_MANS = opal-restart.1
+man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = help-opal-restart.txt
 
@@ -30,3 +36,5 @@ endif # OMPI_INSTALL_BINARIES
 opal_restart_SOURCES = opal-restart.c
 opal_restart_LDADD = $(top_builddir)/opal/libopen-pal.la
 
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/opal/tools/opal-restart/opal-restart.1 b/opal/tools/opal-restart/opal-restart.1in
similarity index 96%
rename from opal/tools/opal-restart/opal-restart.1
rename to opal/tools/opal-restart/opal-restart.1in
index 8b12a2fb0e..1309673e5e 100644
--- a/opal/tools/opal-restart/opal-restart.1
+++ b/opal/tools/opal-restart/opal-restart.1in
@@ -2,11 +2,12 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for OPAL's opal-restart command
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OPAL-RESTART  1       "March 2007" "Open PAL"   "OPEN PAL COMMANDS"
+.TH     OPAL-RESTART  1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am
index 93b1d8611d..9181360e25 100644
--- a/opal/tools/wrappers/Makefile.am
+++ b/opal/tools/wrappers/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2006-2008 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,14 +20,17 @@
 
 DEFS="-DEXEEXT=\"$(EXEEXT)\""
 
-EXTRA_DIST = generic_wrapper.1
+real_man_pages = generic_wrapper.1 opal_wrapper.1
+EXTRA_DIST = $(real_man_pages) $(real_man_pages:1.=.1in)
+
+include $(top_srcdir)/Makefile.man-page-rules
 
 if !OMPI_WANT_SCRIPT_WRAPPER_COMPILERS
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = opal_wrapper
 
-dist_man_MANS = opal_wrapper.1
+man_MANS = opal_wrapper.1
 
 dist_pkgdata_DATA = help-opal-wrapper.txt
 
@@ -37,7 +41,7 @@ nodist_pkgdata_DATA = \
 	opalcc-wrapper-data.txt \
 	opalc++-wrapper-data.txt
 
-dist_man_MANS += opalcc.1 opalc++.1
+man_MANS += opalcc.1 opalc++.1
 
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); rm -f opalcc$(EXEEXT); $(LN_S) opal_wrapper opalcc)
@@ -56,12 +60,13 @@ opal_wrapper_SOURCES = opal_wrapper.c
 opal_wrapper_LDADD = $(top_builddir)/opal/libopen-pal.la
 
 maintainer-clean-local:
-	rm -f opalcc.1 opalc++.1
+	rm -f $(real_man_pages) opalcc.1 opalc++.1
 
 opalcc.1: generic_wrapper.1
 	rm -f opalcc.1
-	sed -e 's/@COMMAND@/opalcc/g' -e 's/@PROJECT@/Open PAL/g' -e 's/@PROJECT_SHORT@/OPAL/g' -e 's/@LANGUAGE@/C/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > opalcc.1
+	sed -e 's/#COMMAND#/opalcc/g' -e 's/#PROJECT#/Open PAL/g' -e 's/#PROJECT_SHORT#/OPAL/g' -e 's/#LANGUAGE#/C/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > opalcc.1
 
 opalc++.1: generic_wrapper.1
 	rm -f opalc++.1
-	sed -e 's/@COMMAND@/opalc++/g' -e 's/@PROJECT@/Open PAL/g' -e 's/@PROJECT_SHORT@/OPAL/g' -e 's/@LANGUAGE@/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > opalc++.1
+	sed -e 's/#COMMAND#/opalc++/g' -e 's/#PROJECT#/Open PAL/g' -e 's/#PROJECT_SHORT#/OPAL/g' -e 's/#LANGUAGE#/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > opalc++.1
+
diff --git a/opal/tools/wrappers/generic_wrapper.1 b/opal/tools/wrappers/generic_wrapper.1in
similarity index 74%
rename from opal/tools/wrappers/generic_wrapper.1
rename to opal/tools/wrappers/generic_wrapper.1in
index e6df7acba8..a5a7e9cab7 100644
--- a/opal/tools/wrappers/generic_wrapper.1
+++ b/opal/tools/wrappers/generic_wrapper.1in
@@ -1,10 +1,12 @@
-.TH @COMMAND@ 1 "@PROJECT@" "@PROJECT_SHORT@" "@PROJECT@"
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+.TH #COMMAND# 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
+
 .
 .SH NAME
-@COMMAND@ -- @PROJECT@ @LANGUAGE@ wrapper compiler
+#COMMAND# -- #PROJECT# #LANGUAGE# wrapper compiler
 .
 .SH SYNTAX
-@COMMAND@ [-showme|-showme:compile|-showme:link] ...
+#COMMAND# [-showme|-showme:compile|-showme:link] ...
 .
 .SH OPTIONS
 .TP
@@ -13,27 +15,27 @@ Do not invoke the underlying compiler.  Instead, show the command line
 that would be executed to compile the program.  \fBNOTE:\fR If a
 non-filename argument is passed on the command line, the \fI-showme\fR
 option will \fInot\fR display any additional flags.  For example, both
-"@COMMAND@ --showme" and "@COMMAND@ --showme my_source.c" will show all the
-wrapper-supplied flags.  But "@COMMAND@ -showme -v" will only show the
+"#COMMAND# --showme" and "#COMMAND# --showme my_source.c" will show all the
+wrapper-supplied flags.  But "#COMMAND# -showme -v" will only show the
 underlying compiler name and "-v".
 .TP
 -showme:compile
-Do not invoke the underlying @LANGUAGE@ compiler.  Instead, show the
-compiler flags that would be supplied to the @LANGUAGE@ compiler.
+Do not invoke the underlying #LANGUAGE# compiler.  Instead, show the
+compiler flags that would be supplied to the #LANGUAGE# compiler.
 .TP
 -showme:link
-Do not invoke the underlying @LANGUAGE@ compiler.  Instead, show the linker
-flags that would be supplied to the @LANGUAGE@ compiler.
+Do not invoke the underlying #LANGUAGE# compiler.  Instead, show the linker
+flags that would be supplied to the #LANGUAGE# compiler.
 .PP
 See the man page for your underlying compiler for other options that
-can be passed through @COMMAND@
+can be passed through #COMMAND#
 .
 .
 .SH DESCRIPTION
 .PP
 Conceptually, the role of these commands is quite simple:
 transparently add relevant compiler and linker flags to the user's
-command line that are necessary to compile / link @PROJECT@
+command line that are necessary to compile / link #PROJECT#
 programs, and then invoke the underlying compiler to actually perform
 the command.
 .
@@ -74,32 +76,32 @@ Fortran 90 support was not built into the MPI layer.
 .
 .
 .SS Overview
-\fI@COMMAND@\fR is a convenience wrappers for the underlying
-@LANGUAGE@ compiler.  Translation of an @PROJECT@ program requires the
-linkage of the @PROJECT@-specific libraries which may not reside in
+\fI#COMMAND#\fR is a convenience wrappers for the underlying
+#LANGUAGE# compiler.  Translation of an #PROJECT# program requires the
+linkage of the #PROJECT#-specific libraries which may not reside in
 one of the standard search directories of ld(1).  It also often
 requires the inclusion of header files what may also not be found in a
 standard location.
 .
 .PP
-\fI@COMMAND@\fR passes its arguments to the underlying @LANGUAGE@
-compiler along with the -I, -L and -l options required by @PROJECT@
+\fI#COMMAND#\fR passes its arguments to the underlying #LANGUAGE#
+compiler along with the -I, -L and -l options required by #PROJECT#
 programs.
 .
 .PP
-The @PROJECT@ Team \fIstrongly\fR encourages using the wrapper
-compilers instead of attempting to link to the @PROJECT@ libraries
-manually.  This allows the specific implementation of @PROJECT@ to
+The #PROJECT# Team \fIstrongly\fR encourages using the wrapper
+compilers instead of attempting to link to the #PROJECT# libraries
+manually.  This allows the specific implementation of #PROJECT# to
 change without forcing changes to linker directives in users'
 Makefiles.  Indeed, the specific set of flags and libraries used by
-the wrapper compilers depends on how @PROJECT@ was configured and
+the wrapper compilers depends on how #PROJECT# was configured and
 built; the values can change between different installations of the
-same version of @PROJECT@.
+same version of #PROJECT#.
 .
 .PP
 Indeed, since the wrappers are simply thin shells on top of an
 underlying compiler, there are very, very few compelling reasons
-\fInot\fR to use \fI@COMMAND@\fR.  When it is not possible to use the
+\fInot\fR to use \fI#COMMAND#\fR.  When it is not possible to use the
 wrappers directly, the \fI-showme:compile\fR and \fI-showme:link\fR
 options should be used to determine what flags the wrappers would have
 used.  For example:
@@ -132,10 +134,10 @@ at:
 .PP
 The string that the wrapper compilers insert into the command line
 before invoking the underlying compiler are stored in a text file
-created by @PROJECT@ and installed to
-\fI$pkgdata/@COMMAND@-wrapper-data.txt\fR, where \fI$pkgdata\fR
+created by #PROJECT# and installed to
+\fI$pkgdata/#COMMAND#-wrapper-data.txt\fR, where \fI$pkgdata\fR
 is typically \fI$prefix/share/openmpi\fR, and \fI$prefix\fR is the top
-installation directory of @PROJECT@.
+installation directory of #PROJECT#.
 .
 .PP
 It is rarely necessary to edit this file, but it can be examined to
@@ -146,7 +148,7 @@ line.
 .SH ENVIRONMENT VARIABLES
 .PP 
 By default, the wrappers use the compilers that were selected when
-@PROJECT@ was configured.  These compilers were either found
+#PROJECT# was configured.  These compilers were either found
 automatically by Open MPI's "configure" script, or were selected by
 the user in the CC, CXX, F77, and/or FC environment variables 
 before "configure" was invoked.  Additionally, other arguments
@@ -156,7 +158,7 @@ specific to the compiler may have been selected by configure.
 These values can be selectively overridden by either editing the text
 files containing this configuration information (see the \fBFILES\fR
 section), or by setting selected environment variables of the
-form "@PROJECT_SHORT@_value".
+form "#PROJECT_SHORT#_value".
 .
 .PP
 Valid value names are:
diff --git a/opal/tools/wrappers/opal_wrapper.1 b/opal/tools/wrappers/opal_wrapper.1in
similarity index 92%
rename from opal/tools/wrappers/opal_wrapper.1
rename to opal/tools/wrappers/opal_wrapper.1in
index 3a2706a16d..d450064781 100644
--- a/opal/tools/wrappers/opal_wrapper.1
+++ b/opal/tools/wrappers/opal_wrapper.1in
@@ -1,6 +1,7 @@
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\" Man page contributed by Dirk Eddelbuettel <edd@debian.org>
 .\" and released under the BSD license
-.TH OPAL_WRAPPER 1 "July 2006" "Open MPI" "OPEN MPI COMMANDS"
+.TH OPAL_WRAPPER 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 opal_wrapper - Back-end Open MPI wrapper command
 .SH SYNOPSIS
diff --git a/orte/mca/filem/Makefile.am b/orte/mca/filem/Makefile.am
index 719bc41c6f..96abf52762 100644
--- a/orte/mca/filem/Makefile.am
+++ b/orte/mca/filem/Makefile.am
@@ -9,6 +9,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -16,6 +18,8 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
 # main library setup
 noinst_LTLIBRARIES = libmca_filem.la
 libmca_filem_la_SOURCES =
@@ -28,8 +32,8 @@ headers = filem.h
 libmca_filem_la_SOURCES += $(headers)
 
 # Manual pages
-man_MANS = orte_filem.7
-EXTRA_DIST = orte_filem.7
+dist_man_MANS = orte_filem.7
+EXTRA_DIST = $(dist_man_MANS:.7=.7in)
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
diff --git a/orte/mca/filem/orte_filem.7 b/orte/mca/filem/orte_filem.7in
similarity index 92%
rename from orte/mca/filem/orte_filem.7
rename to orte/mca/filem/orte_filem.7in
index 856ed5d9f0..5d214bf603 100644
--- a/orte/mca/filem/orte_filem.7
+++ b/orte/mca/filem/orte_filem.7in
@@ -2,18 +2,19 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for ORTE's FileM Functionality
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     ORTE_FILEM  7       "March 2007" "Open RTE"   "OPEN RTE FILEM OVERVIEW"
+.TH     ORTE_FILEM  7 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
 .SH NAME
 .
 Open RTE MCA File Management (FileM) Framework \- Overview of Open RTE's FileM 
-framework, and selected modules.
+framework, and selected modules.  #PACKAGE_NAME# #PACKAGE_VERSION#
 .
 .\" **************************
 .\"    Description Section
diff --git a/orte/mca/snapc/Makefile.am b/orte/mca/snapc/Makefile.am
index cf7ed612ce..91dbe26eeb 100644
--- a/orte/mca/snapc/Makefile.am
+++ b/orte/mca/snapc/Makefile.am
@@ -9,6 +9,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+# Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -16,6 +18,8 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
 # main library setup
 noinst_LTLIBRARIES = libmca_snapc.la
 libmca_snapc_la_SOURCES =
@@ -28,8 +32,8 @@ headers = snapc.h
 libmca_snapc_la_SOURCES += $(headers)
 
 # Manual pages
-man_MANS = orte_snapc.7
-EXTRA_DIST = orte_snapc.7
+dist_man_MANS = orte_snapc.7
+EXTRA_DIST =  $(dist_man_MANS:.7=.7in)
 
 # Conditionally install the header files
 if WANT_INSTALL_HEADERS
diff --git a/orte/mca/snapc/orte_snapc.7 b/orte/mca/snapc/orte_snapc.7in
similarity index 94%
rename from orte/mca/snapc/orte_snapc.7
rename to orte/mca/snapc/orte_snapc.7in
index cc8b358303..ded043ac64 100644
--- a/orte/mca/snapc/orte_snapc.7
+++ b/orte/mca/snapc/orte_snapc.7in
@@ -2,18 +2,19 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for ORTE's SnapC Functionality
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     ORTE_SNAPC  7       "March 2007" "Open RTE"   "OPEN RTE SNAPC OVERVIEW"
+.TH     ORTE_SNAPC  7 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
 .SH NAME
 .
 Open RTE MCA Snapshot Coordination (SnapC) Framework \- Overview of Open RTE's SnapC 
-framework, and selected modules.
+framework, and selected modules.  #PACKAGE_NAME# #PACKAGE_VERSION#
 .
 .\" **************************
 .\"    Description Section
diff --git a/orte/tools/orte-checkpoint/Makefile.am b/orte/tools/orte-checkpoint/Makefile.am
index afcf3c80cf..df44df2a00 100644
--- a/orte/tools/orte-checkpoint/Makefile.am
+++ b/orte/tools/orte-checkpoint/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,9 +18,12 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
 # Bug in AM 1.10.1: need to list man pages because dist_man_MANS is
 # not picked up inside of an AM_CONDITIONAL
-EXTRA_DIST = orte-checkpoint.1
+man_pages = orte-checkpoint.1 ompi-checkpoint.1
+EXTRA_DIST = $(man_pages) orte-checkpoint.1in
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if WANT_FT
@@ -27,7 +31,7 @@ if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = orte-checkpoint
 
-dist_man_MANS = orte-checkpoint.1 ompi-checkpoint.1
+man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = help-orte-checkpoint.txt
 
@@ -42,11 +46,11 @@ endif # OMPI_INSTALL_BINARIES
 orte_checkpoint_SOURCES = orte-checkpoint.c
 orte_checkpoint_LDADD = $(top_builddir)/orte/libopen-rte.la
 
+endif # WANT_FT
+endif # !ORTE_DISABLE_FULL_SUPPORT
+
 ompi-checkpoint.1: $(top_srcdir)/orte/tools/orte-checkpoint/orte-checkpoint.1
 	cp -f $(top_srcdir)/orte/tools/orte-checkpoint/orte-checkpoint.1 ompi-checkpoint.1
 
-distclean-local:
-	rm -f ompi-checkpoint.1
-
-endif # WANT_FT
-endif # !ORTE_DISABLE_FULL_SUPPORT
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/orte/tools/orte-checkpoint/orte-checkpoint.1 b/orte/tools/orte-checkpoint/orte-checkpoint.1in
similarity index 94%
rename from orte/tools/orte-checkpoint/orte-checkpoint.1
rename to orte/tools/orte-checkpoint/orte-checkpoint.1in
index f2e4e068cf..56a720799f 100644
--- a/orte/tools/orte-checkpoint/orte-checkpoint.1
+++ b/orte/tools/orte-checkpoint/orte-checkpoint.1in
@@ -2,11 +2,12 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for OMPI's ompi-checkpoint command
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OMPI-CHECKPOINT  1       "March 2007" "Open MPI"   "OPEN MPI COMMANDS"
+.TH     OMPI-CHECKPOINT  1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
diff --git a/orte/tools/orte-clean/Makefile.am b/orte/tools/orte-clean/Makefile.am
index 78e6f58e88..152df3507e 100644
--- a/orte/tools/orte-clean/Makefile.am
+++ b/orte/tools/orte-clean/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,12 +18,17 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = orte-clean.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = orte-clean
 
-dist_man_MANS = orte-clean.1
+man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = help-orte-clean.txt
 
@@ -32,3 +38,6 @@ orte_clean_SOURCES = orte-clean.c
 orte_clean_LDADD = $(top_builddir)/orte/libopen-rte.la
 
 endif # !ORTE_DISABLE_FULL_SUPPORT
+
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/orte/tools/orte-clean/orte-clean.1 b/orte/tools/orte-clean/orte-clean.1in
similarity index 88%
rename from orte/tools/orte-clean/orte-clean.1
rename to orte/tools/orte-clean/orte-clean.1in
index 9766aef068..40a3051f12 100644
--- a/orte/tools/orte-clean/orte-clean.1
+++ b/orte/tools/orte-clean/orte-clean.1in
@@ -2,10 +2,9 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright 2007-2008     Sun Microsystems, Inc.
 .\"
-.\" Copyright (c) 2007-2008 Sun Microsystems, Inc.
-.\"
-.TH orte-clean 1 "March 2007" "Open MPI 1.2" "OPEN MPI COMMANDS "
+.TH orte-clean 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 \fBorte-clean\fP - Cleans up any stale processes and files leftover
 from Open MPI jobs.
@@ -18,9 +17,9 @@ from Open MPI jobs.
 .SH SYNOPSIS
 .ft R
 .nf 
-orte-clean [--verbose] [--debug]
+orte-clean [--verbose]
 .br
-mpirun --pernode [--host | --hostfile \fIfile\fP] orte-clean [--verbose] [--debug]
+mpirun --pernode [--host | --hostfile \fIfile\fP] orte-clean [--verbose]
 .sp
 
 
@@ -33,11 +32,7 @@ mpirun --pernode [--host | --hostfile \fIfile\fP] orte-clean [--verbose] [--debu
 mode and print out the universes that are getting cleaned up 
 as well as processes that are being killed.
 .sp
-.ft R
-[-d | --debug] This argument will run the command in debug
-mode and print out lots of details about what the command is 
-doing.  This is intended for developer use only.
-.sp
+
 .\" **************************
 .\"    Description Section
 .\" **************************
diff --git a/orte/tools/orte-ps/Makefile.am b/orte/tools/orte-ps/Makefile.am
index e026bc792a..8157982748 100644
--- a/orte/tools/orte-ps/Makefile.am
+++ b/orte/tools/orte-ps/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,12 +18,17 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = orte-ps.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = orte-ps
 
-dist_man_MANS = orte-ps.1
+dist_man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = help-orte-ps.txt
 
@@ -32,3 +38,6 @@ orte_ps_SOURCES = orte-ps.c
 orte_ps_LDADD = $(top_builddir)/orte/libopen-rte.la
 
 endif # !ORTE_DISABLE_FULL_SUPPORT
+
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/orte/tools/orte-ps/orte-ps.1 b/orte/tools/orte-ps/orte-ps.1in
similarity index 93%
rename from orte/tools/orte-ps/orte-ps.1
rename to orte/tools/orte-ps/orte-ps.1in
index 25ef734eab..c7864bb2d1 100644
--- a/orte/tools/orte-ps/orte-ps.1
+++ b/orte/tools/orte-ps/orte-ps.1in
@@ -2,11 +2,12 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for OMPI's ompi-ps command
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OMPI-PS  1       "March 2007" "Open MPI"   "OPEN MPI COMMANDS"
+.TH     OMPI-PS  1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
diff --git a/orte/tools/orte-restart/Makefile.am b/orte/tools/orte-restart/Makefile.am
index ab7b99e5af..19b2db8e56 100644
--- a/orte/tools/orte-restart/Makefile.am
+++ b/orte/tools/orte-restart/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,9 +18,12 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
 # Bug in AM 1.10.1: need to list man pages because dist_man_MANS is
 # not picked up inside of an AM_CONDITIONAL
-EXTRA_DIST = orte-restart.1
+man_pages = orte-restart.1 ompi-restart.1
+EXTRA_DIST = $(man_pages) orte-restart.1in
 
 if !ORTE_DISABLE_FULL_SUPPORT
 if WANT_FT
@@ -27,7 +31,7 @@ if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = orte-restart
 
-dist_man_MANS = orte-restart.1 ompi-restart.1
+man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = help-orte-restart.txt
 
@@ -42,11 +46,11 @@ endif # OMPI_INSTALL_BINARIES
 orte_restart_SOURCES = orte-restart.c
 orte_restart_LDADD = $(top_builddir)/orte/libopen-rte.la
 
+endif # WANT_FT
+endif # ORTE_DISABLE_FULL_SUPPORT
+
 ompi-restart.1: $(top_srcdir)/orte/tools/orte-restart/orte-restart.1
 	cp -f $(top_srcdir)/orte/tools/orte-restart/orte-restart.1 ompi-restart.1
 
-distclean-local:
-	rm -f ompi-restart.1
-
-endif # WANT_FT
-endif # ORTE_DISABLE_FULL_SUPPORT
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/orte/tools/orte-restart/orte-restart.1 b/orte/tools/orte-restart/orte-restart.1in
similarity index 95%
rename from orte/tools/orte-restart/orte-restart.1
rename to orte/tools/orte-restart/orte-restart.1in
index 62afc9d584..35400602aa 100644
--- a/orte/tools/orte-restart/orte-restart.1
+++ b/orte/tools/orte-restart/orte-restart.1in
@@ -2,11 +2,12 @@
 .\" Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
 .\"                         University Research and Technology
 .\"                         Corporation.  All rights reserved.
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for OMPI's ompi-restart command
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     OMPI-RESTART  1       "March 2007" "Open MPI"   "OPEN MPI COMMANDS"
+.TH     OMPI-RESTART  1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
diff --git a/orte/tools/orted/Makefile.am b/orte/tools/orted/Makefile.am
index 7eb4c965b6..5086b4640e 100644
--- a/orte/tools/orted/Makefile.am
+++ b/orte/tools/orted/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2007-2008 Cisco, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -17,12 +18,17 @@
 # $HEADER$
 #
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = orted.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = orted
 
-dist_man_MANS = orted.1
+man_MANS = $(man_pages)
 
 endif # OMPI_INSTALL_BINARIES
 
@@ -37,3 +43,6 @@ orted_LDFLAGS =
 orted_LDADD = $(top_builddir)/orte/libopen-rte.la
 
 endif # !ORTE_DISABLE_FULL_SUPPORT
+
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/orte/tools/orted/orted.1 b/orte/tools/orted/orted.1in
similarity index 90%
rename from orte/tools/orted/orted.1
rename to orte/tools/orted/orted.1in
index 79a4cc5000..c99f542653 100644
--- a/orte/tools/orted/orted.1
+++ b/orte/tools/orted/orted.1in
@@ -1,6 +1,7 @@
 .\" Man page contributed by Dirk Eddelbuettel <edd@debian.org>
 .\" and released under the BSD license.
-.TH ORTED 1 "July 2006" "Open MPI" "OPEN MPI COMMANDS"
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
+.TH ORTED 1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .SH NAME
 orted - Start an Open RTE User-Level Daemon
 .SH SYNOPSIS
diff --git a/orte/tools/orterun/Makefile.am b/orte/tools/orterun/Makefile.am
index 89c801d97c..1a000e21a7 100644
--- a/orte/tools/orterun/Makefile.am
+++ b/orte/tools/orterun/Makefile.am
@@ -10,6 +10,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -26,12 +27,17 @@
 
 CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(TOTALVIEW_DEBUG_FLAGS)
 
+include $(top_srcdir)/Makefile.man-page-rules
+
+man_pages = orterun.1
+EXTRA_DIST = $(man_pages) $(man_pages:.1=.1in)
+
 if !ORTE_DISABLE_FULL_SUPPORT
 if OMPI_INSTALL_BINARIES
 
 bin_PROGRAMS = orterun
 
-dist_man_MANS = orterun.1
+dist_man_MANS = $(man_pages)
 
 dist_pkgdata_DATA = help-orterun.txt
 
@@ -47,3 +53,6 @@ orterun_SOURCES = \
 orterun_LDADD = $(top_builddir)/orte/libopen-rte.la
 
 endif # !ORTE_DISABLE_FULL_SUPPORT
+
+maintainer-clean-local:
+	rm -f $(man_pages)
diff --git a/orte/tools/orterun/orterun.1 b/orte/tools/orterun/orterun.1in
similarity index 99%
rename from orte/tools/orterun/orterun.1
rename to orte/tools/orterun/orterun.1in
index 880af0ebe6..fa24991e52 100644
--- a/orte/tools/orterun/orterun.1
+++ b/orte/tools/orterun/orterun.1in
@@ -1,8 +1,9 @@
+.\" Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 .\"
 .\" Man page for ORTE's orterun command
 .\" 
 .\" .TH name     section center-footer   left-footer  center-header
-.TH     MPIRUN  1       "March 2006" "Open MPI"   "OPEN MPI COMMANDS"
+.TH     MPIRUN  1 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
 .\" **************************
 .\"    Name Section
 .\" **************************
diff --git a/orte/tools/wrappers/Makefile.am b/orte/tools/wrappers/Makefile.am
index d984b2c06f..7ac91252dd 100644
--- a/orte/tools/wrappers/Makefile.am
+++ b/orte/tools/wrappers/Makefile.am
@@ -17,6 +17,9 @@
 # $HEADER$
 #
 
+man_pages = ortecc.1 ortec++.1
+EXTRA_DIST = $(man_pages)
+
 if !ORTE_DISABLE_FULL_SUPPORT
 if !OMPI_WANT_SCRIPT_WRAPPER_COMPILERS
 if WANT_INSTALL_HEADERS
@@ -27,9 +30,7 @@ nodist_pkgdata_DATA = \
 
 if OMPI_INSTALL_BINARIES
 
-dist_man_MANS = \
-	ortecc.1 \
-	ortec++.1
+man_MANS = $(man_pages)
 
 install-exec-hook:
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -46,14 +47,14 @@ endif # WANT_INSTALL_HEADERS
 endif # OMPI_WANT_SCRIPT_WRAPPER_COMPILERS
 
 maintainer-clean-local:
-	rm -f ortecc.1 ortec++.1
+	rm -f $(man_pages)
 
 ortecc.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1
 	rm -f ortecc.1
-	sed -e 's/@COMMAND@/ortecc/g' -e 's/@PROJECT@/OpenRTE/g' -e 's/@PROJECT_SHORT@/ORTE/g' -e 's/@LANGUAGE@/C/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > ortecc.1
+	sed -e 's/#COMMAND#/ortecc/g' -e 's/#PROJECT#/OpenRTE/g' -e 's/#PROJECT_SHORT#/ORTE/g' -e 's/#LANGUAGE#/C/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > ortecc.1
 
 ortec++.1: $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1
 	rm -f ortec++.1
-	sed -e 's/@COMMAND@/ortec++/g' -e 's/@PROJECT@/OpenRTE/g' -e 's/@PROJECT_SHORT@/ORTE/g' -e 's/@LANGUAGE@/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > ortec++.1
+	sed -e 's/#COMMAND#/ortec++/g' -e 's/#PROJECT#/OpenRTE/g' -e 's/#PROJECT_SHORT#/ORTE/g' -e 's/#LANGUAGE#/C++/g' < $(top_srcdir)/opal/tools/wrappers/generic_wrapper.1 > ortec++.1
 
 endif # !ORTE_DISABLE_FULL_SUPPORT