Skip to content

Commit

Permalink
Merge pull request #1409 from marcospb19/fix-docs-typo
Browse files Browse the repository at this point in the history
Fix docs typos
  • Loading branch information
tmccombs authored Oct 24, 2023
2 parents c6fcdbe + 7263b5e commit 8b5532d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/fd.1
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ This option can be specified multiple times, in which case all commands are run
file found, in the order they are provided. In that case, you must supply a ';' argument for
all but the last commands.

If parallelism is enabled, the order commands will be exectued in is non-deterministic. And even with
If parallelism is enabled, the order commands will be executed in is non-deterministic. And even with
--threads=1, the order is determined by the operating system and may not be what you expect. Thus, it is
recommended that you don't rely on any ordering of the results.

Expand Down
4 changes: 2 additions & 2 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub struct Opts {

/// Show search results from files and directories that would otherwise be
/// ignored by '.gitignore', '.ignore', '.fdignore', the global ignore file,
/// or the default rule tthat excludes .git/.
/// or the default rule that excludes .git/.
/// The flag can be overridden with --ignore.
#[arg(
long,
Expand Down Expand Up @@ -226,7 +226,7 @@ pub struct Opts {
alias = "dereference",
long_help = "By default, fd does not descend into symlinked directories. Using this \
flag, symbolic links are also traversed. \
Flag can be overriden with --no-follow."
Flag can be overridden with --no-follow."
)]
pub follow: bool,

Expand Down
2 changes: 1 addition & 1 deletion src/exec/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub(super) fn tokenize(input: &str) -> ArgumentTemplate {
0 | 1 => {
// we found an escaped {{ or }}, so add
// everything up to the first char to the buffer
// then skipp the second one.
// then skip the second one.
buf += &remaining[..m.start() + BRACE_LEN];
remaining = &remaining[m.end()..];
}
Expand Down

0 comments on commit 8b5532d

Please sign in to comment.