d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New release note: mergemaster(8) -p/-C.

Browse Source 
MFC noted:  inetd(8) off by default.
This commit is contained in:
Bruce A. Mah 2002-04-21 04:58:24 +00:00
parent 34ef85ee3d
commit 65e2390042
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=95176
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
release/doc/en_US.ISO8859-1/relnotes/article.sgml
View File

@ -2049,7 +2049,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>By default, &man.inetd.8; is no longer run by &man.rc.8; at
boot-time, although &man.sysinstall.8; gives the option of
enabling it during binary installations. &man.inetd.8; can also
enabling it during binary installations. &merged; &man.inetd.8; can also
be enabled by adding the following line to
<filename>/etc/rc.conf</filename>:</para>
@ -2282,6 +2282,17 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
the user to run recommended commands (such as
<command>newaliases</command>) as needed. &merged;</para>
<para>&man.mergemaster.8; now supports two new flags.
The <option>-p</option> flag enables a
<quote>pre-<literal>buildworld</literal></quote> mode to files
known to be essential to the success of the
<literal>buildworld</literal> and
<literal>installworld</literal> system updating steps. The
<option>-C</option> flag, used after a successful
&man.mergemaster.8; run, compares options in
<filename>/etc/rc.conf</filename> to the default options in
<filename>/etc/defaults/rc.conf</filename>. &merged;</para>
<para>&man.moused.8; now takes a <option>-a</option> option to
control mouse acceleration. &merged;</para>

13
release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
View File

@ -2049,7 +2049,7 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
<para>By default, &man.inetd.8; is no longer run by &man.rc.8; at
boot-time, although &man.sysinstall.8; gives the option of
enabling it during binary installations. &man.inetd.8; can also
enabling it during binary installations. &merged; &man.inetd.8; can also
be enabled by adding the following line to
<filename>/etc/rc.conf</filename>:</para>
@ -2282,6 +2282,17 @@ options HZ=1000 # not compulsory but strongly recommended</programlisting>
the user to run recommended commands (such as
<command>newaliases</command>) as needed. &merged;</para>
<para>&man.mergemaster.8; now supports two new flags.
The <option>-p</option> flag enables a
<quote>pre-<literal>buildworld</literal></quote> mode to files
known to be essential to the success of the
<literal>buildworld</literal> and
<literal>installworld</literal> system updating steps. The
<option>-C</option> flag, used after a successful
&man.mergemaster.8; run, compares options in
<filename>/etc/rc.conf</filename> to the default options in
<filename>/etc/defaults/rc.conf</filename>. &merged;</para>
<para>&man.moused.8; now takes a <option>-a</option> option to
control mouse acceleration. &merged;</para>