summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-10 11:15:10 +1000
committerDamien Miller <djm@mindrot.org>2010-09-10 11:15:10 +1000
commitd44279029243ca238682bbc171e80531badbd3fb (patch)
tree7918ec5e9e92fd37e89c6385250ebdf186da4583
parentde735ea3bddf5813aabd76de18151e55172626b3 (diff)
- jmc@cvs.openbsd.org 2010/08/31 21:14:58
[ssh.1] small text tweak to accommodate previous;
-rw-r--r--ChangeLog3
-rw-r--r--ssh.14
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 50dd15954..d4558ea15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - jmc@cvs.openbsd.org 2010/08/31 17:40:54 12 - jmc@cvs.openbsd.org 2010/08/31 17:40:54
13 [ssh-agent.1] 13 [ssh-agent.1]
14 fix some macro abuse; 14 fix some macro abuse;
15 - jmc@cvs.openbsd.org 2010/08/31 21:14:58
16 [ssh.1]
17 small text tweak to accommodate previous;
15 18
1620100831 1920100831
17 - OpenBSD CVS Sync 20 - OpenBSD CVS Sync
diff --git a/ssh.1 b/ssh.1
index a3d001152..be4a334f3 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.310 2010/08/31 11:54:45 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.311 2010/08/31 21:14:58 jmc Exp $
38.Dd $Mdocdate: August 31 2010 $ 38.Dd $Mdocdate: August 31 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -729,7 +729,7 @@ The
729.Sx HISTORY 729.Sx HISTORY
730section of 730section of
731.Xr ssl 8 731.Xr ssl 8
732contains a brief discussion of the two algorithms. 732contains a brief discussion of the DSA and RSA algorithms.
733.Pp 733.Pp
734The file 734The file
735.Pa ~/.ssh/authorized_keys 735.Pa ~/.ssh/authorized_keys