Merge branch 'master' of ssh://router/data/git/fio

diff --combined fio.1
index 144a4ac75f354cea3bb0995b00d37ec22fd6bcd4,21ccda5e7917cbe1db59a76a5b2af9705a097103..2b63476a902812261d427a6ce58f73b5398ee373
--- 1/fio.1
--- 2/fio.1
+++ b/fio.1
@@@ -411,8 -411,8 +411,8 @@@ approach to asycnronous I/O
  See <http://www.xmailserver.org/guasi\-lib.html>.
  .TP
  .B rdma
- The RDMA I/O engine supports both RDMA memory semantic(RDMA_WRITE/RDMA_READ)
- and channel semantic(Send/Recv) in InfiniBand, RoCE and iWarp environment.
+ The RDMA I/O engine supports both RDMA memory semantics (RDMA_WRITE/RDMA_READ)
+ and channel semantics (Send/Recv) for the InfiniBand, RoCE and iWARP protocols.
  .TP
  .B external
  Loads an external I/O engine object file.  Append the engine filename as
@@@ -512,7 -512,7 +512,7 @@@ Normally \fBfio\fR will cover every blo
  this parameter is given, a new offset will be chosen without looking at past
  I/O history.  This parameter is mutually exclusive with \fBverify\fR.
  .TP
 -.B softrandommap
 +.B softrandommap \fR=\fPbool
  See \fBnorandommap\fR. If fio runs with the random block map enabled and it
  fails to allocate the map, if this option is set it will continue without a
  random block map. As coverage will not be as complete as with random maps, this