summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.19
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index a8967c2f8..035823da3 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
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.1,v 1.410 2020/02/07 03:54:44 dtucker Exp $ 36.\" $OpenBSD: ssh.1,v 1.412 2020/04/17 03:34:42 djm Exp $
37.Dd $Mdocdate: February 7 2020 $ 37.Dd $Mdocdate: April 17 2020 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -233,6 +233,9 @@ the system-wide configuration file
233will be ignored. 233will be ignored.
234The default for the per-user configuration file is 234The default for the per-user configuration file is
235.Pa ~/.ssh/config . 235.Pa ~/.ssh/config .
236If set to
237.Dq none ,
238no configuration files will be read.
236.Pp 239.Pp
237.It Fl f 240.It Fl f
238Requests 241Requests
@@ -872,7 +875,7 @@ If the machine the user logs in from is listed in
872.Pa /etc/hosts.equiv 875.Pa /etc/hosts.equiv
873or 876or
874.Pa /etc/shosts.equiv 877.Pa /etc/shosts.equiv
875on the remote machine, and the user names are 878on the remote machine, the user is non-root and the user names are
876the same on both sides, or if the files 879the same on both sides, or if the files
877.Pa ~/.rhosts 880.Pa ~/.rhosts
878or 881or