Consistently use &prompt.user; for the CVS examples.
Reviewed by: jim
This commit is contained in:
parent
8cab15f40b
commit
03965b6123
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=12987
1 changed files with 4 additions and 4 deletions
|
@ -314,7 +314,7 @@
|
|||
<para>Check out the directory <filename>miscfs</filename>, but
|
||||
none of the subdirectories:</para>
|
||||
|
||||
<screen>&prompt.root; <userinput>cvs co -l miscfs</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>cvs co -l miscfs</userinput></screen>
|
||||
|
||||
<para>You now have a directory named <filename>miscfs</filename>
|
||||
with just one subdirectory named
|
||||
|
@ -583,11 +583,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You will almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.112 2002-04-30 08:05:16 rwatson Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.113 2002-05-06 19:13:38 jmallett 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.112 2002-04-30 08:05:16 rwatson Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.112 2002-04-30 08:05:16 rwatson Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.113 2002-05-06 19:13:38 jmallett Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.113 2002-05-06 19:13:38 jmallett Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
Loading…
Reference in a new issue