summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-07-12 22:07:59 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-07-12 22:07:59 +1000
commit11318476842a01eef47ceff67f31afc06cf2eaa5 (patch)
tree319e6d1381e3233da2baa1588cbfe6ec600f1868
parenta5362458d0e1d2387a05f5c7c29e4f5b87501824 (diff)
- jmc@cvs.openbsd.org 2006/07/10 16:04:21
[sshd.8] s/and and/and/
-rw-r--r--ChangeLog5
-rw-r--r--sshd.84
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6964eb52..ba787e05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
[sftp-glob.c sftp-common.h sftp.c]
buffer.h only needed in sftp-common.h and remove some unneeded
user includes; ok djm@
+ - jmc@cvs.openbsd.org 2006/07/10 16:04:21
+ [sshd.8]
+ s/and and/and/
20060711
- (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
@@ -4860,4 +4863,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4392 2006/07/12 12:07:08 dtucker Exp $
+$Id: ChangeLog,v 1.4393 2006/07/12 12:07:59 dtucker Exp $
diff --git a/sshd.8 b/sshd.8
index f614b8dc..48be5a76 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.231 2006/07/10 12:46:52 dtucker Exp $
+.\" $OpenBSD: sshd.8,v 1.232 2006/07/10 16:04:21 jmc Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -594,7 +594,7 @@ and
.Ql \&]
brackets then followed by
.Ql \&:
-and and a non-standard port number.
+and a non-standard port number.
.Pp
Alternately, hostnames may be stored in a hashed form which hides host names
and addresses should the file's contents be disclosed.