Add &man.vim.1; entry.
Fix bugs in using <screen> element. Use $FreeBSD$ instead of $Date$.
This commit is contained in:
parent
1c0c7ff01a
commit
61306ad2cc
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=7844
3 changed files with 14 additions and 13 deletions
|
@ -16,7 +16,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$Date: 2000-08-13 14:07:12 $</pubdate>
|
||||
<pubdate>$FreeBSD$</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
@ -520,11 +520,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.34 2000-08-15 01:39:50 kuriyama Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.34 2000-08-15 01:39:50 kuriyama Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.34 2000-08-15 01:39:50 kuriyama Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -747,8 +747,8 @@ checkout -P</programlisting>
|
|||
and cvs/rcs logs. </para>
|
||||
|
||||
<screen>&prompt.user; <userinput> echo "syn on" >> ~/.vimrc </userinput>
|
||||
<screen>&prompt.user; <userinput> cvs diff -Nu shazam | vim -</userinput> </screen>
|
||||
<screen>&prompt.user; <userinput> cvs log shazam | vim -</userinput> </screen>
|
||||
&prompt.user; <userinput> cvs diff -Nu shazam | vim -</userinput>
|
||||
&prompt.user; <userinput> cvs log shazam | vim -</userinput> </screen>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
</author>
|
||||
</authorgroup>
|
||||
|
||||
<pubdate>$Date: 2000-08-13 14:07:12 $</pubdate>
|
||||
<pubdate>$FreeBSD$</pubdate>
|
||||
|
||||
<copyright>
|
||||
<year>1999</year>
|
||||
|
@ -520,11 +520,11 @@
|
|||
</itemizedlist>
|
||||
|
||||
<para>You'll almost certainly get a conflict because
|
||||
of the <literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe Exp $</literal> (or in FreeBSD's case,
|
||||
of the <literal>$Id: article.sgml,v 1.34 2000-08-15 01:39:50 kuriyama Exp $</literal> (or in FreeBSD's case,
|
||||
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
|
||||
the file to resolve the conflict (remove the marker lines and
|
||||
the second <literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe Exp $</literal> line intact).</para>
|
||||
the second <literal>$Id: article.sgml,v 1.34 2000-08-15 01:39:50 kuriyama Exp $</literal> line, leaving the original
|
||||
<literal>$Id: article.sgml,v 1.34 2000-08-15 01:39:50 kuriyama Exp $</literal> line intact).</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
@ -747,8 +747,8 @@ checkout -P</programlisting>
|
|||
and cvs/rcs logs. </para>
|
||||
|
||||
<screen>&prompt.user; <userinput> echo "syn on" >> ~/.vimrc </userinput>
|
||||
<screen>&prompt.user; <userinput> cvs diff -Nu shazam | vim -</userinput> </screen>
|
||||
<screen>&prompt.user; <userinput> cvs log shazam | vim -</userinput> </screen>
|
||||
&prompt.user; <userinput> cvs diff -Nu shazam | vim -</userinput>
|
||||
&prompt.user; <userinput> cvs log shazam | vim -</userinput> </screen>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
for "foo.bar" would exist. Hopefully the chance of this is
|
||||
sufficiently small that it is not an issue.
|
||||
|
||||
$FreeBSD: doc/share/sgml/man-refs.ent,v 1.46 2000/07/26 22:09:55 ben Exp $
|
||||
$FreeBSD: doc/share/sgml/man-refs.ent,v 1.47 2000/07/27 19:17:31 ben Exp $
|
||||
-->
|
||||
|
||||
<!ENTITY man.CC.1 "<citerefentry/<refentrytitle/CC/<manvolnum/1//">
|
||||
|
@ -575,6 +575,7 @@
|
|||
<!ENTITY man.vidcontrol.1 "<citerefentry/<refentrytitle/vidcontrol/<manvolnum/1//">
|
||||
<!ENTITY man.vidfont.1 "<citerefentry/<refentrytitle/vidfont/<manvolnum/1//">
|
||||
<!ENTITY man.view.1 "<citerefentry/<refentrytitle/view/<manvolnum/1//">
|
||||
<!ENTITY man.vim.1 "<citerefentry/<refentrytitle/vim/<manvolnum/1//">
|
||||
<!ENTITY man.vis.1 "<citerefentry/<refentrytitle/vis/<manvolnum/1//">
|
||||
<!ENTITY man.vt220keys.1 "<citerefentry/<refentrytitle/vt220keys/<manvolnum/1//">
|
||||
<!ENTITY man.vttest.1 "<citerefentry/<refentrytitle/vttest/<manvolnum/1//">
|
||||
|
|
Loading…
Reference in a new issue