summaryrefslogtreecommitdiffhomepage
path: root/sites/docs/api/config.rst
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2019-09-30 12:23:00 -0400
committerJeff Forcier <jeff@bitprophet.org>2019-12-02 21:06:53 -0500
commit004462b40ea156b783456463b042a8f71bd22d1e (patch)
tree7de6b49927dbbc86455461d532a3a98e21f0adcd /sites/docs/api/config.rst
parentc99388364bb840677e9ea27c7755f4a0af621e1b (diff)
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
Diffstat (limited to 'sites/docs/api/config.rst')
-rw-r--r--sites/docs/api/config.rst11
1 files changed, 10 insertions, 1 deletions
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 <TOKENS>`
+- ``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
<TOKENS>`.
- ``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: