Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Sun, 24 Feb 2013 13:24:16 +0000 (14:24 +0100)
committerJens Axboe <axboe@kernel.dk>
Sun, 24 Feb 2013 13:24:16 +0000 (14:24 +0100)
HOWTO
os/windows/install.wxs

diff --git a/HOWTO b/HOWTO
index ea8730caea033ec4fce10d00ceef7256170bfd8e..fbe8f7919988db293b921334268a424e887604fd 100644 (file)
--- a/HOWTO
+++ b/HOWTO
@@ -9,6 +9,7 @@ Table of contents
 6. Normal output
 7. Terse output
 8. Trace file format
+9. CPU idleness profiling
 
 1.0 Overview and history
 ------------------------
@@ -775,7 +776,7 @@ random_generator=str        Fio supports the following engines for generating
                block sizes, not with workloads that use multiple block
                sizes. If used with such a workload, fio may read or write
                some blocks multiple times.
-               
+
 nice=int       Run the job with the given nice value. See man nice(2).
 
 prio=int       Set the io priority value of this job. Linux limits us to
index 5b4b9398c3f2a53a8e2295e017013f2f3ad148d9..37216b4d448e334319e32927f652feab30806d5b 100755 (executable)
                                                        <File KeyPath="yes" Source="..\..\pthreadGC2.dll"/>
                                                </Component>
                                                <Component>
-                                                       <File Id="README" Name="README.rtf" Source="..\..\README"/>
+                                                       <File Id="README" Name="README.txt" Source="..\..\README"/>
                                                </Component>
                                                <Component>
-                                                       <File Id="REPORTING_BUGS" Name="REPORTING-BUGS.rtf" Source="..\..\REPORTING-BUGS"/>
+                                                       <File Id="REPORTING_BUGS" Name="REPORTING-BUGS.txt" Source="..\..\REPORTING-BUGS"/>
                                                </Component>
                                                <Component>
-                                                       <File Id="HOWTO" Name="HOWTO.rtf" Source="..\..\HOWTO"/>
+                                                       <File Id="HOWTO" Name="HOWTO.txt" Source="..\..\HOWTO"/>
                                                </Component>
                                                <Component>
-                                                       <File Id="COPYING" Name="COPYING.rtf" Source="..\..\COPYING"/>
+                                                       <File Id="COPYING" Name="COPYING.txt" Source="..\..\COPYING"/>
+                                               </Component>
+                                               <Component>
+                                                       <File Id="LICENSE" Name="LICENSE.txt" Source="..\..\LICENSE"/>
                                                </Component>
                                                <Directory Id="examples" Name="examples"/>
                                        </Directory>
                <ComponentRef Id="README"/>
                <ComponentRef Id="REPORTING_BUGS"/>
                <ComponentRef Id="COPYING"/>
+               <ComponentRef Id="LICENSE"/>
                <ComponentGroupRef Id="examples"/>
        </Feature>
 
        <Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/?p=fio.git" />
        <Property Id='ARPCONTACT'>fio@vger.kernel.org</Property>
        <Property Id='ARPHELPLINK'>http://www.spinics.net/lists/fio/</Property>
-       <Property Id='ARPURLUPDATEINFO'>http://git.kernel.dk/?p=fio.git</Property>
+       <Property Id='ARPURLUPDATEINFO'>http://bluestop.org/fio/</Property>
 
        <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />