From 004462b40ea156b783456463b042a8f71bd22d1e Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Mon, 30 Sep 2019 12:23:00 -0400 Subject: Base case re #717 works now. Huge ass squashed commit because I was experimenting with "commit entire feature at once so you do not leave broken tests around to break bisecting". Not sure it's worth it, at least not for large-ish, overhauling-existing-code feature adds. Breaking the work up over months did not help either, L M A O --- sites/docs/api/config.rst | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'sites/docs/api/config.rst') diff --git a/sites/docs/api/config.rst b/sites/docs/api/config.rst index 579fb913..8ee0b444 100644 --- a/sites/docs/api/config.rst +++ b/sites/docs/api/config.rst @@ -61,6 +61,14 @@ Paramiko releases) are included. A keyword by itself means no known departures. - ``Host`` - ``HostName``: used in ``%h`` :ref:`token expansion ` +- ``Match``: fully supported, with the usual caveat that connection-time + information is not present during config lookup, and thus cannot be used to + determine matching. This primarily impacts ``Match user``, which can match + against loaded ``User`` values but has no knowledge about connection-time + usernames. + + .. versionadded:: 2.7 + - ``Port``: supplies potential values for ``%p`` :ref:`token expansion `. - ``ProxyCommand``: see our `.ProxyCommand` class for an easy @@ -94,7 +102,8 @@ OpenSSH, ``%L`` works in ``ControlPath`` but not elsewhere): - ``%n`` - ``%p`` - ``%r`` -- ``%u`` +- ``%u``: substitutes the configured ``User`` value, or the local user (as seen + by ``getpass.getuser``) if not specified. In addition, we extend OpenSSH's tokens as follows: -- cgit v1.2.3