From 0f4b0e49a9f87c3c5f6ba6972927800e4769539a Mon Sep 17 00:00:00 2001
From: Josef El-Rayes <josef@FreeBSD.org>
Date: Sat, 21 Feb 2004 15:59:56 +0000
Subject: [PATCH] Note that ssh2 uses id_(r|d)sa.pub instead of indentity.pub
 and pubkeys are now stored in /c/ssh_keys

Pointed out by: arved
Approved by:    simon(mentor)
---
 .../articles/committers-guide/article.sgml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index 85e691b38e..5464f1aaff 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -678,11 +678,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.178 2004-01-17 19:29:55 simon Exp $</literal> (or in FreeBSD's case,
+	  of the <literal>$Id: article.sgml,v 1.179 2004-02-21 15:59:56 josef 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.178 2004-01-17 19:29:55 simon Exp $</literal> line,
-	  leaving the original <literal>$Id: article.sgml,v 1.178 2004-01-17 19:29:55 simon Exp $</literal> line intact).</para>
+	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.179 2004-02-21 15:59:56 josef Exp $</literal> line,
+	  leaving the original <literal>$Id: article.sgml,v 1.179 2004-02-21 15:59:56 josef Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -1518,18 +1518,18 @@ docs:Documentation Bug:freebsd-doc:</programlisting>
       <step>
 	<para>Generate a key pair using &man.ssh-keygen.1;.  The key
 	  pair will wind up in your
-	  <filename><envar>$HOME</envar>/.ssh</filename>
+	  <filename><envar>$HOME</envar>/.ssh/</filename>
 	  directory.</para>
       </step>
 
       <step>
 	<para>Send your public key
-	  (<filename><envar>$HOME</envar>/.ssh/identity.pub</filename>)
+	  (<filename><envar>$HOME</envar>/.ssh/id_dsa.pub</filename>
+	  or <filename><envar>$HOME</envar>/.ssh/id_rsa.pub</filename>)
 	  to the person setting you up as a committer so it can be put
-	  into your <filename>authorized_keys</filename> file in your
-	  home directory on <hostid>freefall</hostid>
-	  (i.e.
-	  <filename><envar>$HOME</envar>/.ssh/authorized_keys</filename>).
+	  into <filename><replaceable>yourlogin</replaceable></filename> file in
+	  <filename class="directory">/c/ssh-keys/</filename> on
+	  <hostid>freefall</hostid>.
 	</para>
       </step>
     </procedure>