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

ISO_* -> ISO* rename

Browse source
This commit is contained in:
Andrey A. Chernov 2001-06-11 01:20:40 +00:00
parent e8fc3b162e
commit f749b200c1
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9587
418 changed files with 190 additions and 296745 deletions
Download patch file Download diff file Expand all files Collapse all files

4
en_US.ISO8859-1/articles/Makefile.inc
View file

@ -1,5 +1,5 @@
#
# $FreeBSD$
# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile.inc,v 1.3 1999/09/06 06:52:35 peter Exp $
#
DESTDIR?= ${DOCDIR}/en_US.ISO_8859-1/articles/${.CURDIR:T}
DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/articles/${.CURDIR:T}

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

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.70 2001/06/03 21:39:50 dd Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.71 2001/06/09 14:01:06 nik Exp $</pubdate>
<copyright>
<year>1999</year>
@ -519,11 +519,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.72 2001-06-11 01:16:39 ache 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.71 2001-06-09 14:01:06 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.71 2001-06-09 14:01:06 nik Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.72 2001-06-11 01:16:39 ache Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.72 2001-06-11 01:16:39 ache Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -798,7 +798,7 @@ checkout -P</programlisting>
<listitem>
<para>If you have a PGP or GnuPG key, you may want to add it to
<filename>doc/en_US.ISO_8859-1/books/handbook/pgpkeys</filename>.
<filename>doc/en_US.ISO8859-1/books/handbook/pgpkeys</filename>.
</para>
</listitem>