diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /release/mkfsimage.sh | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'release/mkfsimage.sh')
| -rw-r--r-- | release/mkfsimage.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/mkfsimage.sh b/release/mkfsimage.sh index 181928f8..07b142f0 100644 --- a/release/mkfsimage.sh +++ b/release/mkfsimage.sh @@ -75,7 +75,7 @@ while :; do --help Display this help and exit --version Output version information and exit -If multiple SRCs are specified, then each occurance of --files pertains only to +If multiple SRCs are specified, then each occurrence of --files pertains only to the corresponding SRC. Each FILE named in a --copy-rules option contains lines of the form: @@ -83,8 +83,8 @@ Each FILE named in a --copy-rules option contains lines of the form: [gzip] [rename TARGET] COPY-OP NAME and says to copy NAME from the source tree to the destination, using the -method specified by COPY-OP. A preceeding "\`"rename TARGET"\'" says to give -NAME a different name in the target tree, and a preceeding "\`"gzip"\'" says +method specified by COPY-OP. A preceding "\`"rename TARGET"\'" says to give +NAME a different name in the target tree, and a preceding "\`"gzip"\'" says to compress the result (appending .gz to the name). COPY-OP may be one of the following: |