diff options
author | Ben Smithurst <ben@FreeBSD.org> | 2000-07-29 00:47:52 +0000 |
---|---|---|
committer | Ben Smithurst <ben@FreeBSD.org> | 2000-07-29 00:47:52 +0000 |
commit | 17d5973aca8767dde5b6c394f8990664623a4b22 (patch) | |
tree | 1bee4d7c20516a7ef3d1c321fdddfa2acc62b9d1 /en_US.ISO_8859-1/articles | |
parent | 097d1cf9193f9ff3dd0cc7e933c4e5ba50f755e5 (diff) | |
download | doc-17d5973aca8767dde5b6c394f8990664623a4b22.tar.gz doc-17d5973aca8767dde5b6c394f8990664623a4b22.zip |
Mention that SSH is in the base system from 4.0 onwards.
Approved by: jhb
Notes
Notes:
svn path=/head/; revision=7747
Diffstat (limited to 'en_US.ISO_8859-1/articles')
-rw-r--r-- | en_US.ISO_8859-1/articles/committers-guide/article.sgml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml index dfebf6ba9f..62bff6722e 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ </author> </authorgroup> - <pubdate>$Date: 2000-07-26 17:53:17 $</pubdate> + <pubdate>$Date: 2000-07-29 00:47:52 $</pubdate> <copyright> <year>1999</year> @@ -520,11 +520,11 @@ </itemizedlist> <para>You'll almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.31 2000-07-29 00:47:52 ben 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.30 2000-07-26 17:53:17 ben Exp $</literal> line, leaving the original - <literal>$Id: article.sgml,v 1.30 2000-07-26 17:53:17 ben Exp $</literal> line intact).</para> + the second <literal>$Id: article.sgml,v 1.31 2000-07-29 00:47:52 ben Exp $</literal> line, leaving the original + <literal>$Id: article.sgml,v 1.31 2000-07-29 00:47:52 ben Exp $</literal> line intact).</para> </listitem> <listitem> @@ -1112,7 +1112,10 @@ docs:Documentation Bug:nik:</programlisting> <procedure> <step> - <para>Update and install one of the SSH ports. In general, + <para>If you are using FreeBSD 4.0 or later, + OpenSSH is included in the base system. + If you are using an earlier release, + update and install one of the SSH ports. In general, you will probably want to get OpenSSH from the port in <filename>/usr/ports/security/openssh</filename>. You may also wish to check out the original ssh1 in |