[Buildbot-devel] two timeout settings?

[tom fogal]

In master/docs/cfg-buildsteps.texinfo we have:

  @item timeout
  if the command fails to produce any output for this many seconds, it
  is assumed to be locked up and will be killed.

  @item maxTime
  if the command takes longer than this many seconds, it will be killed.

These are exactly the same, no?  Are both actually supported?  What
happens when one sets both; which one "wins"?

Can we deprecate one && remove it from the documentation?

-tom