7090667 proftpd.conf should have a man page
authorTomas Klacko <tomas.klacko@oracle.com>
Thu, 26 Jul 2012 01:47:24 -0700
changeset 930 b051ff1aad38
parent 929 20bde096663e
child 931 edad31738126
7090667 proftpd.conf should have a man page
components/proftpd/patches/proftpd-manpage-see-also.patch
components/proftpd/proftpd.conf.4
components/proftpd/proftpd.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/proftpd/patches/proftpd-manpage-see-also.patch	Thu Jul 26 01:47:24 2012 -0700
@@ -0,0 +1,11 @@
+--- a/src/proftpd.8.in
++++ b/src/proftpd.8.in
+@@ -125,7 +125,7 @@ can be found on
+ .BR http://www.proftpd.org/credits.html
+ .PD
+ .SH SEE ALSO
+-.BR inetd(8), ftp(1), ftpwho(1), ftpcount(1), ftpshut(8)
++.BR inetd(8), ftp(1), proftpd.conf(4), ftpwho(1), ftpcount(1), ftpshut(8)
+ .PP
+ Full documentation on ProFTPD, including configuration and FAQs, is available at
+ .BR http://www.proftpd.org/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/proftpd/proftpd.conf.4	Thu Jul 26 01:47:24 2012 -0700
@@ -0,0 +1,22 @@
+'\" te
+.\" Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+.TH proftpd.conf 4 "12 Jul 2012" "SunOS 5.11" "File Formats"
+.SH NAME
+proftpd.conf \- configuration file for the proftpd FTP server
+.SH SYNOPSIS
+.LP
+.nf
+\fB/etc/proftpd.conf\fR
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+The file \fB/etc/proftpd.conf\fR contains configuration for the \fBproftpd\fR(8) FTP server. The configuration documentation is located in \fBfile:///usr/share/doc/proftpd/Configuration.html\fR.
+.sp
+.LP
+
+.SH SEE ALSO
+.sp
+.LP
+\fBproftpd\fR(8)
--- a/components/proftpd/proftpd.p5m	Wed Jul 25 10:48:11 2012 -0700
+++ b/components/proftpd/proftpd.p5m	Thu Jul 26 01:47:24 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 # PSARC/2011/088
@@ -81,6 +81,7 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
+dir path=usr/share/man/man4
 dir path=usr/share/man/man5
 dir path=usr/share/man/man8
 file proftpd.conf path=etc/proftpd.conf mode=0644 preserve=true
@@ -186,6 +187,7 @@
 file path=usr/share/man/man1/ftpcount.1
 file path=usr/share/man/man1/ftptop.1
 file path=usr/share/man/man1/ftpwho.1
+file proftpd.conf.4 path=usr/share/man/man4/proftpd.conf.4
 file path=usr/share/man/man5/xferlog.5
 file path=usr/share/man/man8/ftpdctl.8
 file path=usr/share/man/man8/ftpscrub.8