Merge simpleftp.1 and mod-active.8 change from inn-stable/Makefile.

Submitted by:	bento

2 files changed, 8 insertions, 6 deletions

diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 41a755abfd90..6d0df7b22bff 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=	--with-largefiles
 #CONFIGURE_ARGS+=	--enable-tagged-hash
 
 MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 innfeed.1 \
-	installit.1 nntpget.1 rnews.1 shlock.1 shrinkfile.1 startinnfeed.1 \
-	subst.1
+	installit.1 nntpget.1 rnews.1 shlock.1 shrinkfile.1 simpleftp.1 \
+	startinnfeed.1 subst.1
 MAN3=	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
 	wildmat.3
 MAN5=	active.5 control.ctl.5 cycbuff.conf.5 distrib.pats.5 expire.ctl.5 \
@@ -53,7 +53,8 @@ MAN8=	actived.8 actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 \
 	cnfsstat.8 controlchan.8 crosspost.8 ctlinnd.8 cvtbatch.8 expire.8 \
 	expireindex.8 expireover.8 expirerm.8 fastrm.8 filechan.8 inncheck.8 \
 	innd.8 inndf.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 innxmit.8 \
-	mailpost.8 makeactive.8 makehistory.8 news-recovery.8 news.daily.8 \
+	mailpost.8 makeactive.8 makehistory.8 mod-active.8 \
+	news-recovery.8 news.daily.8 \
 	news2mail.8 newslog.8 newsrequeue.8 nnrpd.8 nntpsend.8 overchan.8 \
 	pgpverify.8 prunehistory.8 pullnews.8 scanlogs.8 send-uucp.8 sm.8 \
 	tally.control.8 tally.unwanted.8 writelog.8
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 41a755abfd90..6d0df7b22bff 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=	--with-largefiles
 #CONFIGURE_ARGS+=	--enable-tagged-hash
 
 MAN1=	convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 innfeed.1 \
-	installit.1 nntpget.1 rnews.1 shlock.1 shrinkfile.1 startinnfeed.1 \
-	subst.1
+	installit.1 nntpget.1 rnews.1 shlock.1 shrinkfile.1 simpleftp.1 \
+	startinnfeed.1 subst.1
 MAN3=	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
 	wildmat.3
 MAN5=	active.5 control.ctl.5 cycbuff.conf.5 distrib.pats.5 expire.ctl.5 \
@@ -53,7 +53,8 @@ MAN8=	actived.8 actsync.8 actsyncd.8 archive.8 batcher.8 buffchan.8 \
 	cnfsstat.8 controlchan.8 crosspost.8 ctlinnd.8 cvtbatch.8 expire.8 \
 	expireindex.8 expireover.8 expirerm.8 fastrm.8 filechan.8 inncheck.8 \
 	innd.8 inndf.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 innxmit.8 \
-	mailpost.8 makeactive.8 makehistory.8 news-recovery.8 news.daily.8 \
+	mailpost.8 makeactive.8 makehistory.8 mod-active.8 \
+	news-recovery.8 news.daily.8 \
 	news2mail.8 newslog.8 newsrequeue.8 nnrpd.8 nntpsend.8 overchan.8 \
 	pgpverify.8 prunehistory.8 pullnews.8 scanlogs.8 send-uucp.8 sm.8 \
 	tally.control.8 tally.unwanted.8 writelog.8