[src/trunk]: src/external/bsd/openpam/dist/doc/man fix conflicts

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/50ca66032f93
branches:  trunk
changeset: 333237:50ca66032f93
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 24 18:25:14 2014 +0000

description:
fix conflicts

diffstat:

 external/bsd/openpam/dist/doc/man/openpam.3              |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3  |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_free_data.3    |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_get_feature.3  |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_get_option.3   |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_log.3          |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_nullconv.3     |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_readline.3     |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_readlinev.3    |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_readword.3     |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_set_feature.3  |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_set_option.3   |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_straddch.3     |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_subst.3        |  5 +----
 external/bsd/openpam/dist/doc/man/openpam_ttyconv.3      |  5 +----
 external/bsd/openpam/dist/doc/man/pam.3                  |  5 +----
 external/bsd/openpam/dist/doc/man/pam.conf.5             |  5 +----
 external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3        |  5 +----
 external/bsd/openpam/dist/doc/man/pam_authenticate.3     |  5 +----
 external/bsd/openpam/dist/doc/man/pam_chauthtok.3        |  5 +----
 external/bsd/openpam/dist/doc/man/pam_close_session.3    |  5 +----
 external/bsd/openpam/dist/doc/man/pam_conv.3             |  5 +----
 external/bsd/openpam/dist/doc/man/pam_end.3              |  5 +----
 external/bsd/openpam/dist/doc/man/pam_error.3            |  5 +----
 external/bsd/openpam/dist/doc/man/pam_get_authtok.3      |  5 +----
 external/bsd/openpam/dist/doc/man/pam_get_data.3         |  5 +----
 external/bsd/openpam/dist/doc/man/pam_get_item.3         |  5 +----
 external/bsd/openpam/dist/doc/man/pam_get_user.3         |  5 +----
 external/bsd/openpam/dist/doc/man/pam_getenv.3           |  5 +----
 external/bsd/openpam/dist/doc/man/pam_getenvlist.3       |  5 +----
 external/bsd/openpam/dist/doc/man/pam_info.3             |  5 +----
 external/bsd/openpam/dist/doc/man/pam_open_session.3     |  5 +----
 external/bsd/openpam/dist/doc/man/pam_prompt.3           |  5 +----
 external/bsd/openpam/dist/doc/man/pam_putenv.3           |  5 +----
 external/bsd/openpam/dist/doc/man/pam_set_data.3         |  5 +----
 external/bsd/openpam/dist/doc/man/pam_set_item.3         |  5 +----
 external/bsd/openpam/dist/doc/man/pam_setcred.3          |  5 +----
 external/bsd/openpam/dist/doc/man/pam_setenv.3           |  5 +----
 external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3     |  5 +----
 external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3  |  5 +----
 external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3     |  5 +----
 external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 |  5 +----
 external/bsd/openpam/dist/doc/man/pam_sm_open_session.3  |  5 +----
 external/bsd/openpam/dist/doc/man/pam_sm_setcred.3       |  5 +----
 external/bsd/openpam/dist/doc/man/pam_start.3            |  5 +----
 external/bsd/openpam/dist/doc/man/pam_strerror.3         |  5 +----
 external/bsd/openpam/dist/doc/man/pam_verror.3           |  5 +----
 external/bsd/openpam/dist/doc/man/pam_vinfo.3            |  5 +----
 external/bsd/openpam/dist/doc/man/pam_vprompt.3          |  5 +----
 51 files changed, 51 insertions(+), 204 deletions(-)

diffs (truncated from 663 to 300 lines):

diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam.3
--- a/external/bsd/openpam/dist/doc/man/openpam.3       Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam.3       Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam.3
-.\"    $NetBSD: openpam.3,v 1.7 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam.3,v 1.8 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated by gendoc.pl
 .Dd September 12, 2014
 .Dt OPENPAM 3
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3
--- a/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3   Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3   Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_borrow_cred.3
-.\"    $NetBSD: openpam_borrow_cred.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_borrow_cred.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_borrow_cred.c by gendoc.pl
 .\" Id: openpam_borrow_cred.c 649 2013-03-05 17:58:33Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_free_data.3
--- a/external/bsd/openpam/dist/doc/man/openpam_free_data.3     Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_free_data.3     Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_free_data.3
-.\"    $NetBSD: openpam_free_data.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_free_data.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_free_data.c by gendoc.pl
 .\" Id: openpam_free_data.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_free_envlist.3
--- a/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3  Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3  Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_free_envlist.3
-.\"    $NetBSD: openpam_free_envlist.3,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_free_envlist.3,v 1.7 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_free_envlist.c by gendoc.pl
 .\" Id: openpam_free_envlist.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_get_feature.3
--- a/external/bsd/openpam/dist/doc/man/openpam_get_feature.3   Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_get_feature.3   Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_get_feature.3
-.\"    $NetBSD: openpam_get_feature.3,v 1.4 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_get_feature.3,v 1.5 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.3
 .\" Generated from openpam_get_feature.c by gendoc.pl
 .\" Id: openpam_get_feature.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_get_option.3
--- a/external/bsd/openpam/dist/doc/man/openpam_get_option.3    Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_get_option.3    Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_get_option.3
-.\"    $NetBSD: openpam_get_option.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_get_option.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_get_option.c by gendoc.pl
 .\" Id: openpam_get_option.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_log.3
--- a/external/bsd/openpam/dist/doc/man/openpam_log.3   Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_log.3   Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_log.3
-.\"    $NetBSD: openpam_log.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_log.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_log.c by gendoc.pl
 .\" Id: openpam_log.c 686 2013-07-11 16:36:02Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_nullconv.3
--- a/external/bsd/openpam/dist/doc/man/openpam_nullconv.3      Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_nullconv.3      Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_nullconv.3
-.\"    $NetBSD: openpam_nullconv.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_nullconv.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_nullconv.c by gendoc.pl
 .\" Id: openpam_nullconv.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_readline.3
--- a/external/bsd/openpam/dist/doc/man/openpam_readline.3      Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_readline.3      Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_readline.3
-.\"    $NetBSD: openpam_readline.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_readline.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_readline.c by gendoc.pl
 .\" Id: openpam_readline.c 703 2013-08-16 11:57:54Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_readlinev.3
--- a/external/bsd/openpam/dist/doc/man/openpam_readlinev.3     Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_readlinev.3     Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_readlinev.3
-.\"    $NetBSD: openpam_readlinev.3,v 1.4 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_readlinev.3,v 1.5 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.3
 .\" Generated from openpam_readlinev.c by gendoc.pl
 .\" Id: openpam_readlinev.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_readword.3
--- a/external/bsd/openpam/dist/doc/man/openpam_readword.3      Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_readword.3      Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_readword.3
-.\"    $NetBSD: openpam_readword.3,v 1.4 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_readword.3,v 1.5 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.3
 .\" Generated from openpam_readword.c by gendoc.pl
 .\" Id: openpam_readword.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_restore_cred.3
--- a/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3  Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3  Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_restore_cred.3
-.\"    $NetBSD: openpam_restore_cred.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_restore_cred.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_restore_cred.c by gendoc.pl
 .\" Id: openpam_restore_cred.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_set_feature.3
--- a/external/bsd/openpam/dist/doc/man/openpam_set_feature.3   Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_set_feature.3   Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_set_feature.3
-.\"    $NetBSD: openpam_set_feature.3,v 1.4 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_set_feature.3,v 1.5 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.3
 .\" Generated from openpam_set_feature.c by gendoc.pl
 .\" Id: openpam_set_feature.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_set_option.3
--- a/external/bsd/openpam/dist/doc/man/openpam_set_option.3    Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_set_option.3    Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_set_option.3
-.\"    $NetBSD: openpam_set_option.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_set_option.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_set_option.c by gendoc.pl
 .\" Id: openpam_set_option.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_straddch.3
--- a/external/bsd/openpam/dist/doc/man/openpam_straddch.3      Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_straddch.3      Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_straddch.3
-.\"    $NetBSD: openpam_straddch.3,v 1.4 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_straddch.3,v 1.5 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.3
 .\" Generated from openpam_straddch.c by gendoc.pl
 .\" Id: openpam_straddch.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_subst.3
--- a/external/bsd/openpam/dist/doc/man/openpam_subst.3 Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_subst.3 Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_subst.3
-.\"    $NetBSD: openpam_subst.3,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_subst.3,v 1.7 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_subst.c by gendoc.pl
 .\" Id: openpam_subst.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/openpam_ttyconv.3
--- a/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3       Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3       Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< openpam_ttyconv.3
-.\"    $NetBSD: openpam_ttyconv.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: openpam_ttyconv.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from openpam_ttyconv.c by gendoc.pl
 .\" Id: openpam_ttyconv.c 807 2014-09-09 09:41:32Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/pam.3
--- a/external/bsd/openpam/dist/doc/man/pam.3   Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam.3   Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam.3
-.\"    $NetBSD: pam.3,v 1.7 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: pam.3,v 1.8 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated by gendoc.pl
 .Dd September 12, 2014
 .Dt PAM 3
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/pam.conf.5
--- a/external/bsd/openpam/dist/doc/man/pam.conf.5      Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam.conf.5      Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam.conf.5
-.\"    $NetBSD: pam.conf.5,v 1.7 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: pam.conf.5,v 1.8 2014/10/24 18:25:42 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\"-
 .\" Copyright (c) 2005-2011 Dag-Erling Smørgrav
 .\" All rights reserved.
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3
--- a/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam_acct_mgmt.3
-.\"    $NetBSD: pam_acct_mgmt.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: pam_acct_mgmt.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from pam_acct_mgmt.c by gendoc.pl
 .\" Id: pam_acct_mgmt.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/pam_authenticate.3
--- a/external/bsd/openpam/dist/doc/man/pam_authenticate.3      Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam_authenticate.3      Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam_authenticate.3
-.\"    $NetBSD: pam_authenticate.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: pam_authenticate.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from pam_authenticate.c by gendoc.pl
 .\" Id: pam_authenticate.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/pam_chauthtok.3
--- a/external/bsd/openpam/dist/doc/man/pam_chauthtok.3 Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam_chauthtok.3 Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam_chauthtok.3
-.\"    $NetBSD: pam_chauthtok.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: pam_chauthtok.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from pam_chauthtok.c by gendoc.pl
 .\" Id: pam_chauthtok.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/pam_close_session.3
--- a/external/bsd/openpam/dist/doc/man/pam_close_session.3     Fri Oct 24 18:21:02 2014 +0000
+++ b/external/bsd/openpam/dist/doc/man/pam_close_session.3     Fri Oct 24 18:25:14 2014 +0000
@@ -1,8 +1,5 @@
-<<<<<<< pam_close_session.3
-.\"    $NetBSD: pam_close_session.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\"    $NetBSD: pam_close_session.3,v 1.6 2014/10/24 18:25:14 christos Exp $
 .\"
-=======
->>>>>>> 1.1.1.4
 .\" Generated from pam_close_session.c by gendoc.pl
 .\" Id: pam_close_session.c 648 2013-03-05 17:54:27Z des 
 .Dd September 12, 2014
diff -r 433396de5976 -r 50ca66032f93 external/bsd/openpam/dist/doc/man/pam_conv.3