From 64b915781f702cf49aca1793524879c5a73756df Mon Sep 17 00:00:00 2001
From: Ken Smith <kensmith@FreeBSD.org>
Date: Fri, 15 Aug 2003 15:24:51 +0000
Subject: [PATCH] PR: Reviewed by:	blackend (mentor) Approved by:
 blackend (mentor) Obtained from: MFC after:

Change cvsup-master maintainer from jdp to kuriyama.
---
 en_US.ISO8859-1/articles/committers-guide/article.sgml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index dfb50d8416..df324e7be2 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -295,7 +295,7 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
 	as well as give access to <hostid>cvsup-master</hostid> if you
 	really need to stay current to the latest changes.
 	<hostid>cvsup-master</hostid> has got the horsepower to deal with
-	this, the repository master server does not.  &a.jdp; is in
+	this, the repository master server does not.  &a.kuriyama; is in
 	charge of <hostid>cvsup-master</hostid>.
       </para>
     </note>
@@ -676,11 +676,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.freebsd.o
 	</itemizedlist>
 
 	<para>You will almost certainly get a conflict because
-	  of the <literal>$Id: article.sgml,v 1.173 2003-08-06 21:48:38 simon Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.174 2003-08-15 15:24:51 kensmith Exp $</literal> (or in FreeBSD's case,
 	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
 	  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.173 2003-08-06 21:48:38 simon Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.173 2003-08-06 21:48:38 simon Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.174 2003-08-15 15:24:51 kensmith Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.174 2003-08-15 15:24:51 kensmith Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -2612,7 +2612,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
 	<term>Direct access to <hostid>cvsup-master</hostid></term>
 
 	<listitem>
-	  <para>As a committer, you may apply to &a.jdp; for direct access
+	  <para>As a committer, you may apply to &a.kuriyama; for direct access
 	    to <hostid role="fqdn">cvsup-master.FreeBSD.org</hostid>,
 	    providing the public key output from <command>cvpasswd
 	    <replaceable>yourusername</replaceable>@FreeBSD.org