diff options
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 10 | ||||
-rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index 586bf22..b7dc744 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -248,24 +248,26 @@ <para>&man.ftpd.8; now supports a <option>-h</option> option to disable printing any host-specific information, such as the - &man.ftpd.8; version or hostname, in server messages.</para> + &man.ftpd.8; version or hostname, in server messages. + &merged;</para> <para>&man.ftpd.8; now supports a <option>-P</option> option to specify a port on which to listen in daemon mode. The default data port number is now set to be one less than the control port - number, rather than being hard-coded.</para> + number, rather than being hard-coded. &merged;</para> <para>&man.ftpd.8; now supports an extended format of the <filename>/etc/ftpchroot</filename> file. Please refer to the &man.ftpchroot.5; manpage, which is now available, - for details.</para> + for details. &merged;</para> <para>&man.ftpd.8; now supports login directory pathnames that specify simultaneously a directory for &man.chroot.2; and that to change to in the chrooted environment. The <literal>/./</literal> separator is used for this purpose, like in other FTP daemons having this feature. - It may be used in both &man.ftpchroot.5; and &man.passwd.5;.</para> + It may be used in both &man.ftpchroot.5; and &man.passwd.5;. + &merged;</para> <para>&man.fwcontrol.8; now supports <option>-R</option> and <option>-S</option> options for receiving and sending DV diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml index 586bf22..b7dc744 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -248,24 +248,26 @@ <para>&man.ftpd.8; now supports a <option>-h</option> option to disable printing any host-specific information, such as the - &man.ftpd.8; version or hostname, in server messages.</para> + &man.ftpd.8; version or hostname, in server messages. + &merged;</para> <para>&man.ftpd.8; now supports a <option>-P</option> option to specify a port on which to listen in daemon mode. The default data port number is now set to be one less than the control port - number, rather than being hard-coded.</para> + number, rather than being hard-coded. &merged;</para> <para>&man.ftpd.8; now supports an extended format of the <filename>/etc/ftpchroot</filename> file. Please refer to the &man.ftpchroot.5; manpage, which is now available, - for details.</para> + for details. &merged;</para> <para>&man.ftpd.8; now supports login directory pathnames that specify simultaneously a directory for &man.chroot.2; and that to change to in the chrooted environment. The <literal>/./</literal> separator is used for this purpose, like in other FTP daemons having this feature. - It may be used in both &man.ftpchroot.5; and &man.passwd.5;.</para> + It may be used in both &man.ftpchroot.5; and &man.passwd.5;. + &merged;</para> <para>&man.fwcontrol.8; now supports <option>-R</option> and <option>-S</option> options for receiving and sending DV |