Correct an error in the instructions for using cvpasswd.
Noticed by: gerald
This commit is contained in:
parent
5249769cab
commit
2efcfdddbb
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=14647
1 changed files with 8 additions and 5 deletions
|
@ -579,11 +579,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You will almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.139 2002-10-14 23:18:35 jdp Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -2506,8 +2506,11 @@ docs:Documentation Bug:nik:</programlisting>
|
|||
to <hostid role="fqdn">cvsup-master.FreeBSD.org</hostid>,
|
||||
providing the public key output from <command>cvpasswd
|
||||
<replaceable>yourusername</replaceable>@FreeBSD.org
|
||||
cvsup-master.FreeBSD.org</command>. Access to
|
||||
<hostid>cvsup-master</hostid> should not be over-used as it is
|
||||
freefall.FreeBSD.org</command>. Please note: you must
|
||||
specify <hostid>freefall.FreeBSD.org</hostid> on the
|
||||
<command>cvpasswd</command> command line even though the
|
||||
actual server is <hostid>cvsup-master</hostid>. Access to
|
||||
<hostid>cvsup-master</hostid> should not be overused as it is
|
||||
a busy machine.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
|
Loading…
Reference in a new issue