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

- Remove references to databases/tkgnats as it has been removed from the Ports

Browse source 
Collection [1]
- Add missing reference to pgpkeys-developers.sgml in connection with
  adding a new PGP key [2]

PR:		docs/122999 [1], docs/122917 [2]
Submitted by:	pgj
This commit is contained in:
Gabor Kovesdan 2008-04-27 12:01:34 +00:00
parent 33ebde6c78
commit 8f63e0a54b
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=31917
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -750,11 +750,11 @@ alias scvs cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.org:/home/ncvs</p
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.272 2008-02-02 07:57:44 imp Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.273 2008-04-27 12:01:34 gabor Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict 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.272 2008-02-02 07:57:44 imp Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.273 2008-04-27 12:01:34 gabor Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.272 2008-02-02 07:57:44 imp Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.273 2008-04-27 12:01:34 gabor Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1126,7 +1126,8 @@ Host pcvs.FreeBSD.org
<para>You should add your PGP or GnuPG key to <para>You should add your PGP or GnuPG key to
<filename>doc/share/pgpkeys</filename> (and if you do not <filename>doc/share/pgpkeys</filename> (and if you do not
have a key, you should create one). Do not forget to commit have a key, you should create one). Do not forget to commit
the updated <filename>doc/share/pgpkeys/pgpkeys.ent</filename>.</para> the updated <filename>doc/share/pgpkeys/pgpkeys.ent</filename>
and <filename>doc/share/pgpkeys/pgpkeys-developers.sgml</filename>.</para>
<para>&a.des; has <para>&a.des; has
written a shell script to make this extremely simple. See the written a shell script to make this extremely simple. See the
@ -1409,7 +1410,7 @@ Host pcvs.FreeBSD.org
<para>You can run a local copy of GNATS, and then integrate the FreeBSD <para>You can run a local copy of GNATS, and then integrate the FreeBSD
GNATS tree in to it using CVSup. Then you can run GNATS commands GNATS tree in to it using CVSup. Then you can run GNATS commands
locally, or use other interfaces, such as <command>tkgnats</command>. locally.
This lets you query the PR database without needing to be connected to This lets you query the PR database without needing to be connected to
the Internet.</para> the Internet.</para>
@ -1492,9 +1493,6 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
<screen>&prompt.root; <userinput>query-pr -c docs -s open</userinput></screen> <screen>&prompt.root; <userinput>query-pr -c docs -s open</userinput></screen>
<para>Other interfaces, such as that provided by the
<filename role="package">databases/tkgnats</filename> port should also work
nicely.</para>
</step> </step>
<step> <step>