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

environmenet -> environment

Browse source 
PR:		24234
Submitted by:	Jimmy Olgeni <olgeni@uli.it>
This commit is contained in:
Daniel Harris 2001-01-13 02:04:07 +00:00
parent 47850f6150
commit f5d071f028
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=8675
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.45 2000/12/05 21:38:53 jim Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.46 2000/12/28 13:40:03 jedgar Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -122,7 +122,7 @@
<para>Note that when you use CVS on <hostid>freefall</hostid>, you <para>Note that when you use CVS on <hostid>freefall</hostid>, you
should set your <literal>umask</literal> to <literal>2</literal>, should set your <literal>umask</literal> to <literal>2</literal>,
as well as setting the <literal>CVSUMASK</literal> environmenet as well as setting the <literal>CVSUMASK</literal> environment
variable to <literal>2</literal>. This ensures that any new variable to <literal>2</literal>. This ensures that any new
files created by <command>cvs add</command> will have the correct files created by <command>cvs add</command> will have the correct
permissions. If you add a file or directory and discover that the permissions. If you add a file or directory and discover that the
@ -515,11 +515,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>

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

@ -19,7 +19,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.45 2000/12/05 21:38:53 jim Exp $</pubdate> <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.46 2000/12/28 13:40:03 jedgar Exp $</pubdate>
<copyright> <copyright>
<year>1999</year> <year>1999</year>
@ -122,7 +122,7 @@
<para>Note that when you use CVS on <hostid>freefall</hostid>, you <para>Note that when you use CVS on <hostid>freefall</hostid>, you
should set your <literal>umask</literal> to <literal>2</literal>, should set your <literal>umask</literal> to <literal>2</literal>,
as well as setting the <literal>CVSUMASK</literal> environmenet as well as setting the <literal>CVSUMASK</literal> environment
variable to <literal>2</literal>. This ensures that any new variable to <literal>2</literal>. This ensures that any new
files created by <command>cvs add</command> will have the correct files created by <command>cvs add</command> will have the correct
permissions. If you add a file or directory and discover that the permissions. If you add a file or directory and discover that the
@ -515,11 +515,11 @@
</itemizedlist> </itemizedlist>
<para>You'll almost certainly get a conflict because <para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line, leaving the original the second <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.46 2000-12-28 13:40:03 jedgar Exp $</literal> line intact).</para> <literal>$Id: article.sgml,v 1.47 2001-01-13 02:04:07 dannyboy Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>