summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.56
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 93e4c9aee..788d91729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,9 @@
55 control paths. 55 control paths.
56 56
57 bz#2220, based on patch from mancha1 AT zoho.com; ok markus@ 57 bz#2220, based on patch from mancha1 AT zoho.com; ok markus@
58 - jmc@cvs.openbsd.org 2014/07/03 07:45:27
59 [ssh_config.5]
60 escape %C since groff thinks it part of an Rs/Re block;
58 61
5920140702 6220140702
60 - OpenBSD CVS Sync 63 - OpenBSD CVS Sync
diff --git a/ssh_config.5 b/ssh_config.5
index 756762e49..81b20aa09 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,7 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.188 2014/07/03 06:39:19 djm Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.189 2014/07/03 07:45:27 jmc Exp $
37.Dd $Mdocdate: July 3 2014 $ 37.Dd $Mdocdate: July 3 2014 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
@@ -503,7 +503,7 @@ by the remote login username,
503.Ql %u 503.Ql %u
504by the username of the user running 504by the username of the user running
505.Xr ssh 1 , and 505.Xr ssh 1 , and
506.Ql %C 506.Ql \&%C
507by a hash of the concatenation: %l%h%p%r. 507by a hash of the concatenation: %l%h%p%r.
508It is recommended that any 508It is recommended that any
509.Cm ControlPath 509.Cm ControlPath
@@ -942,7 +942,7 @@ The following escape character substitutions will be performed:
942(remote user name) or 942(remote user name) or
943.Ql %u 943.Ql %u
944(local user name) or 944(local user name) or
945.Ql %C 945.Ql \&%C
946by a hash of the concatenation: %l%h%p%r. 946by a hash of the concatenation: %l%h%p%r.
947.Pp 947.Pp
948The command is run synchronously and does not have access to the 948The command is run synchronously and does not have access to the