compress_parallel.c: Determine physical memory on OS X

[wimlib] / README

diff --git a/README b/README
index 8c9c97ccf33d6ce806a2d533cbed9a5625fe7fc9..dbef7a8b27e1f988a0b75bbbf14819527fc7cb9a 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                                   INTRODUCTION
 
-This is wimlib version 1.6.0 (January 2014).  wimlib is a C library for
+This is wimlib version 1.6.1 (January 2014).  wimlib is a C library for
 creating, modifying, extracting, and mounting files in the Windows Imaging
 Format (WIM files).  These files are normally created using the ImageX
 (imagex.exe) or Dism (Dism.exe) utilities on Windows, but wimlib is distributed
@@ -65,7 +65,7 @@ wimlib (and wimlib-imagex) can create XPRESS, LZX, or LZMS compressed WIM
 archives.  wimlib includes its own compression codecs and does not use the
 compression API available on some versions of Windows.  The below table provides
 the results (file size, in bytes, and time to create, in seconds) of capturing a
-WIM containing a x86 Windows PE image, using various compression types and
+WIM containing an x86 Windows PE image, using various compression types and
 options.  When applicable, the results with the equivalent Microsoft
 implementation in WIMGAPI, which is the library used by ImageX and Dism, are
 included.
@@ -102,20 +102,19 @@ Notes:
        no known equivalent for WIMGAPI.
        Compression chunk size is 32768 (the default for LZX).
 
-   [6] '--compress=recovery' or '--compress=lzms' for wimlib-imagex;
+   [6] '--compress=recovery' or '--compress=LZMS' for wimlib-imagex;
        no known way to create the equivalent with WIMGAPI.
        Compression chunk size is 131072 (the default for LZMS).  Note: this
        compression type is not generally recommended due to its limited
        compatibility with the MS implementations.
 
-   [7] '--compress=recovery --packed-streams' or
-       '--compress=lzms --packed-streams' for wimlib-imagex;
-       WIMCreateFile with WIM_COMPRESSION_LZMS and flag 0x20000000 for WIMGAPI.
-       Compression chunk size in packed resources is 33554432 for wimlib,
-       67108864 for WIMGAPI.  Note: this compression type is not generally
-       recommended due to its limited compatibility with the MS implementations.
-       Also, due to the large chunk size, wimlib uses about 500MB of memory per
-       thread when compressing in this format.
+   [7] '--compress=recovery --solid' or '--compress=LZMS --solid' for
+       wimlib-imagex; WIMCreateFile with WIM_COMPRESSION_LZMS and flag
+       0x20000000 for WIMGAPI.  Compression chunk size in packed resources is
+       33554432 for wimlib, 67108864 for WIMGAPI.  Note: this compression type
+       is not generally recommended due to its limited compatibility with the MS
+       implementations.  Also, due to the large chunk size, wimlib uses about
+       500MB of memory per thread when compressing in this format.
 
 The above timings were done on Windows 8 (x86) so that side-by-side comparisons
 with the Microsoft implementation would be possible; however, wimlib may have
@@ -140,9 +139,9 @@ data streams.
      | WIM (WIMGAPI, XPRESS)          | 825,410      |
      | WIM (wimlib, XPRESS)           | 792,024      |
      | tar.gz (gzip, default)         | 738,796      |
-     | ZIP (Info-Zip, default)        | 735,334      |
+     | ZIP (Info-ZIP, default)        | 735,334      |
      | tar.gz (gzip, -9)              | 733,971      |
-     | ZIP (Info-Zip, -9)             | 732,297      |
+     | ZIP (Info-ZIP, -9)             | 732,297      |
      | WIM (wimlib, LZX quick)        | 722,196      |
      | WIM (WIMGAPI, LZX)             | 651,766      |
      | WIM (wimlib, LZX normal)       | 639,464      |