Module Name: src
Committed By: christos
Date: Fri Oct 24 18:25:14 UTC 2014
Modified Files:
src/external/bsd/openpam/dist/doc/man: openpam.3 openpam_borrow_cred.3
openpam_free_data.3 openpam_free_envlist.3 openpam_get_feature.3
openpam_get_option.3 openpam_log.3 openpam_nullconv.3
openpam_readline.3 openpam_readlinev.3 openpam_readword.3
openpam_restore_cred.3 openpam_set_feature.3 openpam_set_option.3
openpam_straddch.3 openpam_subst.3 openpam_ttyconv.3 pam.3
pam_acct_mgmt.3 pam_authenticate.3 pam_chauthtok.3
pam_close_session.3 pam_conv.3 pam_end.3 pam_error.3
pam_get_authtok.3 pam_get_data.3 pam_get_item.3 pam_get_user.3
pam_getenv.3 pam_getenvlist.3 pam_info.3 pam_open_session.3
pam_prompt.3 pam_putenv.3 pam_set_data.3 pam_set_item.3
pam_setcred.3 pam_setenv.3 pam_sm_acct_mgmt.3 pam_sm_authenticate.3
pam_sm_chauthtok.3 pam_sm_close_session.3 pam_sm_open_session.3
pam_sm_setcred.3 pam_start.3 pam_strerror.3 pam_verror.3
pam_vinfo.3 pam_vprompt.3
Log Message:
fix conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/openpam/dist/doc/man/openpam.3 \
src/external/bsd/openpam/dist/doc/man/pam.3
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 \
src/external/bsd/openpam/dist/doc/man/openpam_free_data.3 \
src/external/bsd/openpam/dist/doc/man/openpam_get_option.3 \
src/external/bsd/openpam/dist/doc/man/openpam_log.3 \
src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3 \
src/external/bsd/openpam/dist/doc/man/openpam_readline.3 \
src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 \
src/external/bsd/openpam/dist/doc/man/openpam_set_option.3 \
src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3 \
src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 \
src/external/bsd/openpam/dist/doc/man/pam_authenticate.3 \
src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_close_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_end.3 \
src/external/bsd/openpam/dist/doc/man/pam_error.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_data.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_item.3 \
src/external/bsd/openpam/dist/doc/man/pam_getenv.3 \
src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3 \
src/external/bsd/openpam/dist/doc/man/pam_info.3 \
src/external/bsd/openpam/dist/doc/man/pam_open_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_prompt.3 \
src/external/bsd/openpam/dist/doc/man/pam_putenv.3 \
src/external/bsd/openpam/dist/doc/man/pam_set_data.3 \
src/external/bsd/openpam/dist/doc/man/pam_set_item.3 \
src/external/bsd/openpam/dist/doc/man/pam_setcred.3 \
src/external/bsd/openpam/dist/doc/man/pam_setenv.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3 \
src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3 \
src/external/bsd/openpam/dist/doc/man/pam_start.3 \
src/external/bsd/openpam/dist/doc/man/pam_strerror.3 \
src/external/bsd/openpam/dist/doc/man/pam_verror.3 \
src/external/bsd/openpam/dist/doc/man/pam_vinfo.3 \
src/external/bsd/openpam/dist/doc/man/pam_vprompt.3
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 \
src/external/bsd/openpam/dist/doc/man/openpam_subst.3 \
src/external/bsd/openpam/dist/doc/man/pam_conv.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 \
src/external/bsd/openpam/dist/doc/man/pam_get_user.3
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3 \
src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3 \
src/external/bsd/openpam/dist/doc/man/openpam_readword.3 \
src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3 \
src/external/bsd/openpam/dist/doc/man/openpam_straddch.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openpam/dist/doc/man/openpam.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam.3:1.7 src/external/bsd/openpam/dist/doc/man/openpam.3:1.8
--- src/external/bsd/openpam/dist/doc/man/openpam.3:1.7 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/pam.3
diff -u src/external/bsd/openpam/dist/doc/man/pam.3:1.7 src/external/bsd/openpam/dist/doc/man/pam.3:1.8
--- src/external/bsd/openpam/dist/doc/man/pam.3:1.7 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_free_data.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_free_data.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_free_data.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_free_data.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_free_data.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_get_option.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_get_option.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_get_option.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_get_option.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_get_option.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_log.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_log.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_log.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_log.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_log.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_readline.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_readline.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_readline.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_readline.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_readline.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_set_option.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_set_option.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_set_option.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_set_option.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_set_option.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3:1.5 src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3:1.6
--- src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/pam_authenticate.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_authenticate.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_authenticate.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_authenticate.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_authenticate.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/pam_close_session.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_close_session.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_close_session.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_close_session.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_close_session.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/pam_end.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_end.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_end.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_end.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_end.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_end.3
-.\" $NetBSD: pam_end.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_end.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_end.c by gendoc.pl
.\" Id: pam_end.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_error.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_error.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_error.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_error.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_error.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_error.3
-.\" $NetBSD: pam_error.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_error.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_error.c by gendoc.pl
.\" Id: pam_error.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_get_data.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_get_data.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_get_data.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_get_data.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_get_data.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_get_data.3
-.\" $NetBSD: pam_get_data.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_get_data.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_get_data.c by gendoc.pl
.\" Id: pam_get_data.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_get_item.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_get_item.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_get_item.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_get_item.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_get_item.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_get_item.3
-.\" $NetBSD: pam_get_item.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_get_item.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_get_item.c by gendoc.pl
.\" Id: pam_get_item.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_getenv.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_getenv.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_getenv.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_getenv.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_getenv.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_getenv.3
-.\" $NetBSD: pam_getenv.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_getenv.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_getenv.c by gendoc.pl
.\" Id: pam_getenv.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_getenvlist.3
-.\" $NetBSD: pam_getenvlist.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_getenvlist.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_getenvlist.c by gendoc.pl
.\" Id: pam_getenvlist.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_info.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_info.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_info.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_info.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_info.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_info.3
-.\" $NetBSD: pam_info.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_info.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_info.c by gendoc.pl
.\" Id: pam_info.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_open_session.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_open_session.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_open_session.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_open_session.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_open_session.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_open_session.3
-.\" $NetBSD: pam_open_session.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_open_session.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_open_session.c by gendoc.pl
.\" Id: pam_open_session.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_prompt.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_prompt.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_prompt.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_prompt.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_prompt.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_prompt.3
-.\" $NetBSD: pam_prompt.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_prompt.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_prompt.c by gendoc.pl
.\" Id: pam_prompt.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_putenv.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_putenv.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_putenv.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_putenv.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_putenv.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_putenv.3
-.\" $NetBSD: pam_putenv.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_putenv.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_putenv.c by gendoc.pl
.\" Id: pam_putenv.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_set_data.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_set_data.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_set_data.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_set_data.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_set_data.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_set_data.3
-.\" $NetBSD: pam_set_data.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_set_data.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_set_data.c by gendoc.pl
.\" Id: pam_set_data.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_set_item.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_set_item.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_set_item.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_set_item.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_set_item.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_set_item.3
-.\" $NetBSD: pam_set_item.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_set_item.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_set_item.c by gendoc.pl
.\" Id: pam_set_item.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_setcred.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_setcred.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_setcred.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_setcred.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_setcred.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_setcred.3
-.\" $NetBSD: pam_setcred.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_setcred.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_setcred.c by gendoc.pl
.\" Id: pam_setcred.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_setenv.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_setenv.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_setenv.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_setenv.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_setenv.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_setenv.3
-.\" $NetBSD: pam_setenv.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_setenv.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_setenv.c by gendoc.pl
.\" Id: pam_setenv.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_sm_acct_mgmt.3
-.\" $NetBSD: pam_sm_acct_mgmt.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_sm_acct_mgmt.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_sm_acct_mgmt.c by gendoc.pl
.\" Id: pam_sm_acct_mgmt.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_sm_authenticate.3
-.\" $NetBSD: pam_sm_authenticate.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_sm_authenticate.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_sm_authenticate.c by gendoc.pl
.\" Id: pam_sm_authenticate.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_sm_chauthtok.3
-.\" $NetBSD: pam_sm_chauthtok.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_sm_chauthtok.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_sm_chauthtok.c by gendoc.pl
.\" Id: pam_sm_chauthtok.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_sm_close_session.3
-.\" $NetBSD: pam_sm_close_session.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_sm_close_session.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_sm_close_session.c by gendoc.pl
.\" Id: pam_sm_close_session.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_sm_open_session.3
-.\" $NetBSD: pam_sm_open_session.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_sm_open_session.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_sm_open_session.c by gendoc.pl
.\" Id: pam_sm_open_session.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_sm_setcred.3
-.\" $NetBSD: pam_sm_setcred.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_sm_setcred.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_sm_setcred.c by gendoc.pl
.\" Id: pam_sm_setcred.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_start.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_start.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_start.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_start.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_start.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_start.3
-.\" $NetBSD: pam_start.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_start.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_start.c by gendoc.pl
.\" Id: pam_start.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_strerror.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_strerror.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_strerror.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_strerror.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_strerror.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_strerror.3
-.\" $NetBSD: pam_strerror.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_strerror.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_strerror.c by gendoc.pl
.\" Id: pam_strerror.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_verror.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_verror.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_verror.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_verror.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_verror.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_verror.3
-.\" $NetBSD: pam_verror.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_verror.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_verror.c by gendoc.pl
.\" Id: pam_verror.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_vinfo.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_vinfo.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_vinfo.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_vinfo.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_vinfo.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_vinfo.3
-.\" $NetBSD: pam_vinfo.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_vinfo.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_vinfo.c by gendoc.pl
.\" Id: pam_vinfo.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_vprompt.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_vprompt.3:1.5 src/external/bsd/openpam/dist/doc/man/pam_vprompt.3:1.6
--- src/external/bsd/openpam/dist/doc/man/pam_vprompt.3:1.5 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_vprompt.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_vprompt.3
-.\" $NetBSD: pam_vprompt.3,v 1.5 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_vprompt.3,v 1.6 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_vprompt.c by gendoc.pl
.\" Id: pam_vprompt.c 648 2013-03-05 17:54:27Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3:1.6 src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3:1.7
--- src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3:1.6 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_subst.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_subst.3:1.6 src/external/bsd/openpam/dist/doc/man/openpam_subst.3:1.7
--- src/external/bsd/openpam/dist/doc/man/openpam_subst.3:1.6 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_subst.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/pam_conv.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_conv.3:1.6 src/external/bsd/openpam/dist/doc/man/pam_conv.3:1.7
--- src/external/bsd/openpam/dist/doc/man/pam_conv.3:1.6 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_conv.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_conv.3
-.\" $NetBSD: pam_conv.3,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_conv.3,v 1.7 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\"-
.\" Copyright (c) 2002-2003 Networks Associates Technology, Inc.
.\" Copyright (c) 2004-2011 Dag-Erling Smørgrav
Index: src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.6 src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.7
--- src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.6 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_get_authtok.3
-.\" $NetBSD: pam_get_authtok.3,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_get_authtok.3,v 1.7 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_get_authtok.c by gendoc.pl
.\" Id: pam_get_authtok.c 807 2014-09-09 09:41:32Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/pam_get_user.3
diff -u src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.6 src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.7
--- src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.6 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/pam_get_user.3 Fri Oct 24 14:25:14 2014
@@ -1,8 +1,5 @@
-<<<<<<< pam_get_user.3
-.\" $NetBSD: pam_get_user.3,v 1.6 2014/10/24 18:17:56 christos Exp $
+.\" $NetBSD: pam_get_user.3,v 1.7 2014/10/24 18:25:14 christos Exp $
.\"
-=======
->>>>>>> 1.1.1.4
.\" Generated from pam_get_user.c by gendoc.pl
.\" Id: pam_get_user.c 670 2013-03-17 19:26:07Z des
.Dd September 12, 2014
Index: src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3:1.4 src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3:1.5
--- src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3:1.4 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3:1.4 src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3:1.5
--- src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3:1.4 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_readword.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_readword.3:1.4 src/external/bsd/openpam/dist/doc/man/openpam_readword.3:1.5
--- src/external/bsd/openpam/dist/doc/man/openpam_readword.3:1.4 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_readword.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3:1.4 src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3:1.5
--- src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3:1.4 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3 Fri Oct 24 14:25:14 2014
@@ -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
Index: src/external/bsd/openpam/dist/doc/man/openpam_straddch.3
diff -u src/external/bsd/openpam/dist/doc/man/openpam_straddch.3:1.4 src/external/bsd/openpam/dist/doc/man/openpam_straddch.3:1.5
--- src/external/bsd/openpam/dist/doc/man/openpam_straddch.3:1.4 Fri Oct 24 14:17:56 2014
+++ src/external/bsd/openpam/dist/doc/man/openpam_straddch.3 Fri Oct 24 14:25:14 2014
@@ -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
