On Sat, Mar 28, 2015 at 07:19:13AM +0000, Jason McIntyre wrote:
> > > maybe this is clearer:
> > > 
> > > Index: ssh-add.1
> > > ===================================================================
> > > RCS file: /cvs/src/usr.bin/ssh/ssh-add.1,v
> > > retrieving revision 1.61
> > > diff -u -r1.61 ssh-add.1
> > > --- ssh-add.1     21 Dec 2014 22:27:56 -0000      1.61
> > > +++ ssh-add.1     27 Mar 2015 23:21:34 -0000
> > > @@ -88,12 +88,11 @@
> > >  .It Fl c
> > >  Indicates that added identities should be subject to confirmation before
> > >  being used for authentication.
> > > -Confirmation is performed by the
> > > -.Ev SSH_ASKPASS
> > > -program mentioned below.
> > > -Successful confirmation is signaled by a zero exit status from the
> > > -.Ev SSH_ASKPASS
> > > -program, rather than text entered into the requester.
> > > +Confirmation is performed by
> > > +.Xr ssh-askpass 1 .
> > > +Successful confirmation is signaled by a zero exit status from
> > > +.Xr ssh-askpass 1 ,
> > > +rather than text entered into the requester.
> > >  .It Fl D
> > >  Deletes all identities from the agent.
> > >  .It Fl d
> > > @@ -156,6 +155,8 @@
> > >  .Ev SSH_ASKPASS
> > >  are set, it will execute the program specified by
> > >  .Ev SSH_ASKPASS
> > > +(by default
> > > +.Dq ssh-askpass )
> > >  and open an X11 window to read the passphrase.
> > >  This is particularly useful when calling
> > >  .Nm
> > > @@ -197,6 +198,7 @@
> > >  .Sh SEE ALSO
> > >  .Xr ssh 1 ,
> > >  .Xr ssh-agent 1 ,
> > > +.Xr ssh-askpass 1 ,
> > >  .Xr ssh-keygen 1 ,
> > >  .Xr sshd 8
> > >  .Sh AUTHORS
> >
>
> [...]
> 
> currently the doc (specifically -c) refers to SSH_ASKPASS. i understand
> you want to be clear that SSH_ASKPASS does not need to be set, so you
> added some text to say that explicitly.
> 
> my diff takes a different approach - it is actually not that common to
> talk about the environment variable when a sane default exists. usually
> we document the usual case and in ENVIRONMENT we document the variable
> that can override defualt behaviour. my diff does that.

I'm OK with this.

j.

Reply via email to