Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #294

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ACKNOWLEDGEMENTS
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ for the Squashfs kernel code.

Vito Di Leo sent a patch extending Mksquashfs to support regex filters.
While his patched worked, it unfortunately made it easy to make Mksquashfs
perform unpredictably with poorly choosen regex expressions. It, however,
perform unpredictably with poorly chosen regex expressions. It, however,
encouraged myself to add support for wildcard pattern matching and regex
filters in a different way.

Expand Down
10 changes: 5 additions & 5 deletions ACTIONS-README
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ and vice-versa:

An action consists of two parts, separated by an "@". The action to
be executed is placed before the @, and one or more tests are
placed afer the @. If the action or tests has an argument, it is
placed after the @. If the action or tests has an argument, it is
given in brackets. Brackets are optional if no argument is needed,
e.g.

Expand Down Expand Up @@ -580,7 +580,7 @@ solid state media, seeking is not such a major issue anymore.
Tell Mksquashfs not to use tail-end packing for the files matching the
exppression.

For obvious reasons this should be used in conjuction with the global
For obvious reasons this should be used in conjunction with the global
Mksquashfs option -always-use-fragments. By default tail-ends are not
packed into fragments.

Expand Down Expand Up @@ -662,7 +662,7 @@ Adds the read and write permissions to both user and group.

3. chmod(u=rw,go=r)

Sets the permissions to rw-r--r--, which is eqivalent to
Sets the permissions to rw-r--r--, which is equivalent to

4. chmod(644)

Expand Down Expand Up @@ -767,9 +767,9 @@ Otherwise it can be added to all files.
The extended attribute value by default will be treated as binary (i.e. an
uninterpreted byte sequence), but it can be prefixed with 0s, where it will be
treated as base64 encoded, or prefixed with 0x, where it will be treated as
hexidecimal.
hexadecimal.

Obviously using base64 or hexidecimal allows values to be used that cannot be
Obviously using base64 or hexadecimal allows values to be used that cannot be
entered on the command line such as non-printable characters etc. But it
renders the string non-human readable. To keep readability and to allow
non-printable characters to be entered, the 0t prefix is supported. This
Expand Down
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ to /usr/local/bin by typing "sudo make install".
2.1 Compressors supported

By default the Makefile is configured to build Mksquashfs and Unsquashfs
with GZIP suppport. Read the Makefile in squashfs-tools for instructions on
with GZIP support. Read the Makefile in squashfs-tools for instructions on
building LZO, LZ4, XZ and ZSTD compression support.

2.2 Extended attribute support (XATTRs)
Expand Down
20 changes: 10 additions & 10 deletions README-4.5
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ of files within fragments. Specifically, it creates a specialised fragment
called "cfiles" which packs files matching the wildcard name "*.[ch]".

It also creates another specialised fragment called "ofiles" which packs
files matching the wilcard name "*.o".
files matching the wildcard name "*.o".

Producing specialised fragments which only pack files which match a range
of tests, can produce better compression and/or I/O performance as
Expand Down Expand Up @@ -353,7 +353,7 @@ Mksquashfs now allows you to pipe the set of files to be added to the
filesystem to standard in (stdin), if the -cpiostyle option is given.

As with cpio, directories are not recursively scanned, and their contents
added. Evey file to be added to the filesystem must be explicitly
added. Every file to be added to the filesystem must be explicitly
specified.

Typically the list of files to be added will be produced via find, or a
Expand All @@ -365,7 +365,7 @@ For example

Will create an image containing everything in squashfs-tools and its
sub-directories. Note, "-" is given as the source pathname in Mksquashfs,
and indicates no commmand line sources.
and indicates no command line sources.

and the following will add just the files ending in .c, .h and .o.

Expand Down Expand Up @@ -412,7 +412,7 @@ higher the percentage, the greater the throughput of the reader thread.

The Pseudo file definitions previously supported did not allow the time
of the file to be set. New extended pseudo file definitions have been added
which take a <time> timestamp. These are distinquished from the previous
which take a <time> timestamp. These are distinguished from the previous
definitions by using an upper-case type character. For example the "D"
definition is identical to the previous "d" definition (it creates
a directory), but it takes a <time> timestamp.
Expand Down Expand Up @@ -459,7 +459,7 @@ Hard Link) Pseudo definition has been added named 'l'.
README l /home/phillip/latest-version/README

Will create a reference to "/home/phillip/latest-version/README",
and obviously the timestamp/mode and owership will be used.
and obviously the timestamp/mode and ownership will be used.

The definition also be used to create additional references to
files within the source directories. For instance if "phillip/latest/README"
Expand Down Expand Up @@ -589,7 +589,7 @@ in a similar way to "cp -L". But this is dangerous, and can cause
Unsquashfs to produce output which does not match the input Squashfs
filesystem, which is something Unsquashfs should never do.

The reason for this is whereas "cp -L" is derefencing the *input*,
The reason for this is whereas "cp -L" is dereferencing the *input*,
Unsquashfs is dereferencing the *output*. If a filesystem has a real
filename, say

Expand All @@ -612,7 +612,7 @@ file, and two copies of directory "c".

Superficially the output may look the same, but, it may not work the same,
and obviously edits to the one hello_world file will not get reflected in
the other copies. Any option that can be accidently or maliciously used
the other copies. Any option that can be accidentally or maliciously used
to produce such an output is too dangerous to be added.

Unsquashfs solves the problem in an equivalent way, but which does not alter
Expand Down Expand Up @@ -645,8 +645,8 @@ with the sub-set of files matched by the exclude file(s) excluded.

Often you want to output the filesystem where you're only interested in
some files, which is where extract files are useful. But equally, you
often want to to output the entire filesystem, but, with some unwanted
files removed. An example of this, perhaps, is where you've inadvertantly,
often want to output the entire filesystem, but, with some unwanted
files removed. An example of this, perhaps, is where you've inadvertently,
archived binaries (.o files etc.) and you're only interested in extracting
the source code.

Expand Down Expand Up @@ -784,5 +784,5 @@ This will change the ownership to uid 1234, and change the name of
=================

Mksquashfs 4.5 generates 4.0 filesystems. These filesystems are fully
compatible/interchangable with filesystems generated by Mksquashfs 4.x and are
compatible/interchangeable with filesystems generated by Mksquashfs 4.x and are
mountable on 2.6.29 and later kernels.
20 changes: 10 additions & 10 deletions README-4.5.1
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ of files within fragments. Specifically, it creates a specialised fragment
called "cfiles" which packs files matching the wildcard name "*.[ch]".

It also creates another specialised fragment called "ofiles" which packs
files matching the wilcard name "*.o".
files matching the wildcard name "*.o".

Producing specialised fragments which only pack files which match a range
of tests, can produce better compression and/or I/O performance as
Expand Down Expand Up @@ -355,7 +355,7 @@ Mksquashfs now allows you to pipe the set of files to be added to the
filesystem to standard in (stdin), if the -cpiostyle option is given.

As with cpio, directories are not recursively scanned, and their contents
added. Evey file to be added to the filesystem must be explicitly
added. Every file to be added to the filesystem must be explicitly
specified.

Typically the list of files to be added will be produced via find, or a
Expand All @@ -367,7 +367,7 @@ For example

Will create an image containing everything in squashfs-tools and its
sub-directories. Note, "-" is given as the source pathname in Mksquashfs,
and indicates no commmand line sources.
and indicates no command line sources.

and the following will add just the files ending in .c, .h and .o.

Expand Down Expand Up @@ -414,7 +414,7 @@ higher the percentage, the greater the throughput of the reader thread.

The Pseudo file definitions previously supported did not allow the time
of the file to be set. New extended pseudo file definitions have been added
which take a <time> timestamp. These are distinquished from the previous
which take a <time> timestamp. These are distinguished from the previous
definitions by using an upper-case type character. For example the "D"
definition is identical to the previous "d" definition (it creates
a directory), but it takes a <time> timestamp.
Expand Down Expand Up @@ -461,7 +461,7 @@ Hard Link) Pseudo definition has been added named 'l'.
README l /home/phillip/latest-version/README

Will create a reference to "/home/phillip/latest-version/README",
and obviously the timestamp/mode and owership will be used.
and obviously the timestamp/mode and ownership will be used.

The definition also be used to create additional references to
files within the source directories. For instance if "phillip/latest/README"
Expand Down Expand Up @@ -591,7 +591,7 @@ in a similar way to "cp -L". But this is dangerous, and can cause
Unsquashfs to produce output which does not match the input Squashfs
filesystem, which is something Unsquashfs should never do.

The reason for this is whereas "cp -L" is derefencing the *input*,
The reason for this is whereas "cp -L" is dereferencing the *input*,
Unsquashfs is dereferencing the *output*. If a filesystem has a real
filename, say

Expand All @@ -614,7 +614,7 @@ file, and two copies of directory "c".

Superficially the output may look the same, but, it may not work the same,
and obviously edits to the one hello_world file will not get reflected in
the other copies. Any option that can be accidently or maliciously used
the other copies. Any option that can be accidentally or maliciously used
to produce such an output is too dangerous to be added.

Unsquashfs solves the problem in an equivalent way, but which does not alter
Expand Down Expand Up @@ -647,8 +647,8 @@ with the sub-set of files matched by the exclude file(s) excluded.

Often you want to output the filesystem where you're only interested in
some files, which is where extract files are useful. But equally, you
often want to to output the entire filesystem, but, with some unwanted
files removed. An example of this, perhaps, is where you've inadvertantly,
often want to output the entire filesystem, but, with some unwanted
files removed. An example of this, perhaps, is where you've inadvertently,
archived binaries (.o files etc.) and you're only interested in extracting
the source code.

Expand Down Expand Up @@ -786,5 +786,5 @@ This will change the ownership to uid 1234, and change the name of
=================

Mksquashfs 4.5 generates 4.0 filesystems. These filesystems are fully
compatible/interchangable with filesystems generated by Mksquashfs 4.x and are
compatible/interchangeable with filesystems generated by Mksquashfs 4.x and are
mountable on 2.6.29 and later kernels.
8 changes: 4 additions & 4 deletions README-4.6
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ files.

The -xattrs-include option instead specifies a regular expression (regex)
which includes any extended attribute that matches, and removes anything
that does't match.
that doesn't match.

Examples:

Expand Down Expand Up @@ -194,9 +194,9 @@ all files.
The extended attribute value by default will be treated as binary (i.e. an
uninterpreted byte sequence), but it can be prefixed with 0s, where it will be
treated as base64 encoded, or prefixed with 0x, where it will be treated as
hexidecimal.
hexadecimal.

Obviously using base64 or hexidecimal allows values to be used that cannot be
Obviously using base64 or hexadecimal allows values to be used that cannot be
entered on the command line such as non-printable characters etc. But it
renders the string non-human readable. To keep readability and to allow
non-printable characters to be entered, the 0t prefix is supported. This
Expand Down Expand Up @@ -310,7 +310,7 @@ extract that:

% unsquashfs -pf - image.sqsh foobar | mksquashfs - new.sqsh -pf -

If you had inadvertantly stored binary ".o" files, you can remove them by
If you had inadvertently stored binary ".o" files, you can remove them by
using the new "non-anchored" Unsquashfs exclude file functionality:

% unsquashfs -excludes -pf - image.sqsh "... *.o" | mksquashfs - new.sqsh -pf -
Expand Down
8 changes: 4 additions & 4 deletions README-4.6.1
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ files.

The -xattrs-include option instead specifies a regular expression (regex)
which includes any extended attribute that matches, and removes anything
that does't match.
that doesn't match.

Examples:

Expand Down Expand Up @@ -206,9 +206,9 @@ all files.
The extended attribute value by default will be treated as binary (i.e. an
uninterpreted byte sequence), but it can be prefixed with 0s, where it will be
treated as base64 encoded, or prefixed with 0x, where it will be treated as
hexidecimal.
hexadecimal.

Obviously using base64 or hexidecimal allows values to be used that cannot be
Obviously using base64 or hexadecimal allows values to be used that cannot be
entered on the command line such as non-printable characters etc. But it
renders the string non-human readable. To keep readability and to allow
non-printable characters to be entered, the 0t prefix is supported. This
Expand Down Expand Up @@ -322,7 +322,7 @@ extract that:

% unsquashfs -pf - image.sqsh foobar | mksquashfs - new.sqsh -pf -

If you had inadvertantly stored binary ".o" files, you can remove them by
If you had inadvertently stored binary ".o" files, you can remove them by
using the new "non-anchored" Unsquashfs exclude file functionality:

% unsquashfs -excludes -pf - image.sqsh "... *.o" | mksquashfs - new.sqsh -pf -
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-READMEs/DONATIONS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Help sponsor Squashfs development!

Maintaining and improving Squashfs is a lot of work, but Squashfs is one of
the only widely used Linux file systems that has no company backing. Squashfs
development is funded soley by the author, partially supported by donations
development is funded solely by the author, partially supported by donations
from companies and individuals that want to improve Squashfs for themselves
and others.

Expand Down
2 changes: 1 addition & 1 deletion RELEASE-READMEs/PERFORMANCE.README
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ liveCD filesystem from the Damn Small Linux liveCD (release 0.8.4).
The Ubuntu liveCD filesystem was used to test filesystem performance
from CDROM and hard disk for Zisofs, Cloop, Squashfs 2.0 and Squashfs2.1.
CRAMFS filesystem performance could not be tested for this filesystem
bacause it exceeds the maximum supported size of CRAMFS. To test
because it exceeds the maximum supported size of CRAMFS. To test
CRAMFS performance against Squashfs, the liveCD filesystem from
Damn Small Linux was used.

Expand Down
2 changes: 1 addition & 1 deletion TECHNICAL-INFO
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ or if it is stored out of line (in which case the value field stores a
reference to where the actual value is stored). This allows large values
to be stored out of line improving scanning and lookup performance and it
also allows values to be de-duplicated, the value being stored once, and
all other occurences holding an out of line reference to that value.
all other occurrences holding an out of line reference to that value.

The xattr lists are packed into compressed 8K metadata blocks.
To reduce overhead in inodes, rather than storing the on-disk
Expand Down
12 changes: 6 additions & 6 deletions USAGE
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ for more information.

Note: both SOURCE_DATE_EPOCH and the command line options cannot
be used at the same time. They are different ways to do the same thing,
and both have FORCE sematics which mean they can't be over-ridden
and both have FORCE semantics which mean they can't be over-ridden
elsewhere (otherwise it would defeat the purpose).

1.1.5 -not-reproducible
Expand Down Expand Up @@ -587,7 +587,7 @@ either by name (i.e. "root") or by number.
The -e and -ef options allow files/directories to be specified which are
excluded from the output filesystem. The -e option takes the exclude
files/directories from the command line, the -ef option takes the
exlude files/directories from the specified exclude file, one file/directory
exclude files/directories from the specified exclude file, one file/directory
per line.

Two styles of exclude file matching are supported: basic exclude matching, and
Expand Down Expand Up @@ -683,7 +683,7 @@ being generated, i.e.
%mksquashfs / /tmp/root.sqsh -e proc /tmp/root.sqsh

Multiple -ef options can be specified on the command line, and the -ef
option can be used in conjuction with the -e option.
option can be used in conjunction with the -e option.

3.6 Appending to squashfs filesystems
-------------------------------------
Expand Down Expand Up @@ -762,14 +762,14 @@ requiring root access.
Mksquashfs 4.1 added support for "dynamic pseudo files" and a modify operation.
Dynamic pseudo files allow files to be dynamically created when Mksquashfs
is run, their contents being the result of running a command or piece of
shell script. The modifiy operation allows the mode/uid/gid of an existing
shell script. The modify operation allows the mode/uid/gid of an existing
file in the source filesystem to be modified.

Mksquashfs 4.4 adds support for Symbolic links.

Two Mksquashfs options are supported, -p allows one pseudo file to be specified
on the command line, and -pf allows a pseudo file to be specified containing a
list of pseduo definitions, one per line.
list of pseudo definitions, one per line.

3.8.1. Creating a dynamic file
------------------------------
Expand Down Expand Up @@ -1271,7 +1271,7 @@ or if it is stored out of line (in which case the value field stores a
reference to where the actual value is stored). This allows large values
to be stored out of line improving scanning and lookup performance and it
also allows values to be de-duplicated, the value being stored once, and
all other occurences holding an out of line reference to that value.
all other occurrences holding an out of line reference to that value.

The xattr lists are packed into compressed 8K metadata blocks.
To reduce overhead in inodes, rather than storing the on-disk
Expand Down
Loading