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

diff --git a/HOWTO b/HOWTO
index f4f596a4c02e7880a0394f809a1f24aae05a6737..9bfa437833d0703e2ee10cac8501c6d40a521d3d 100644 (file)
--- a/HOWTO
+++ b/HOWTO
@@ -230,7 +230,7 @@ description=str     Text description of the job. Doesn't do anything except
                dump this text description when this job is run. It's
                not parsed.
 
-directory=str  Prefix filenames with this directory. Used to places files
+directory=str  Prefix filenames with this directory. Used to place files
                in a different location than "./".
 
 filename=str   Fio normally makes up a filename based on the job name,
@@ -250,7 +250,7 @@ filename=str        Fio normally makes up a filename based on the job name,
 opendir=str    Tell fio to recursively add any file it can find in this
                directory and down the file system tree.
 
-lockfile=str   Fio defaults to not doing any locking files before it does
+lockfile=str   Fio defaults to not locking any files before it does
                IO to them. If a file or file descriptor is shared, fio
                can serialize IO to that file to make the end result
                consistent. This is usual for emulating real workloads that
@@ -303,7 +303,7 @@ fadvise_hint=bool By default, fio will use fadvise() to advise the kernel
 size=int       The total size of file io for this job. Fio will run until
                this many bytes has been transferred, unless runtime is
                limited by other options (such as 'runtime', for instance).
-               Unless specific nr_files and filesize options are given,
+               Unless specific nrfiles and filesize options are given,
                fio will divide this size between the available files
                specified by the job.
 
@@ -874,7 +874,7 @@ cpuload=int If the job is a CPU cycle eater, attempt to use the specified
                percentage of CPU cycles.
 
 cpuchunks=int  If the job is a CPU cycle eater, split the load into
-               cycles of the given time. In milliseconds.
+               cycles of the given time. In microseconds.
 
 disk_util=bool Generate disk utilization statistics, if the platform
                supports it. Defaults to on.

diff --git a/REPORTING-BUGS b/REPORTING-BUGS
index dab2ef4e5ba260d0fff6299ba1a0bc10c1858e9b..ded68ab4fea9de3cfbc54385ad54b25cf7a30f2c 100644 (file)
--- a/REPORTING-BUGS
+++ b/REPORTING-BUGS
@@ -2,7 +2,7 @@ Reporting a bug
 ---------------
 
 If you notice anything that seems like a fio bug, please do send email
-to the list (fio-devel@kernel.dk, see README) about it. You'll need
+to the list (fio@vger.kernel.org, see README) about it. You'll need
 to report at least:
 
 1) A description of what you think the bug is