os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add a note that you can use the vim editor as a useful tool for viewing

Browse source 
diffs, logs, etc, with syntax highlighting switched on.
This commit is contained in:
Josef Karthauser 2000-08-13 14:07:12 +00:00
parent 7adb21b707
commit 407df909f1
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=7835
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -16,7 +16,7 @@
</author>
</authorgroup>
<pubdate>$Date: 2000-08-05 21:05:39 $</pubdate>
<pubdate>$Date: 2000-08-13 14:07:12 $</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.32 2000-08-05 21:05:39 ben Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe 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.32 2000-08-05 21:05:39 ben Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.32 2000-08-05 21:05:39 ben Exp $</literal> line intact).</para>
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>
</listitem>
<listitem>
@ -739,6 +739,16 @@ checkout -P</programlisting>
<para>Simply use instead of &man.more.1; or &man.less.1;:</para>
<screen>&prompt.user; <userinput>cvs diff -Nu shazam | cdiff</userinput></screen>
<para>Alternatively some editors like &man.vim.1;
(ports/editors/vim5) have color support and when used as
a pager with color syntax highlighting switched on will
highlight many types of file, including diffs, patches,
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>
</listitem>
<listitem>

18
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -16,7 +16,7 @@
</author>
</authorgroup>
<pubdate>$Date: 2000-08-05 21:05:39 $</pubdate>
<pubdate>$Date: 2000-08-13 14:07:12 $</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.32 2000-08-05 21:05:39 ben Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.33 2000-08-13 14:07:12 joe 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.32 2000-08-05 21:05:39 ben Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.32 2000-08-05 21:05:39 ben Exp $</literal> line intact).</para>
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>
</listitem>
<listitem>
@ -739,6 +739,16 @@ checkout -P</programlisting>
<para>Simply use instead of &man.more.1; or &man.less.1;:</para>
<screen>&prompt.user; <userinput>cvs diff -Nu shazam | cdiff</userinput></screen>
<para>Alternatively some editors like &man.vim.1;
(ports/editors/vim5) have color support and when used as
a pager with color syntax highlighting switched on will
highlight many types of file, including diffs, patches,
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>
</listitem>
<listitem>