From d6e8874f263552d6e64966434b2cbbf5dd36d6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 2 Oct 2024 01:01:35 +0000 Subject: [PATCH] Fix typos --- build/fbcode_builder/CMake/fb_py_test_main.py | 4 ++-- build/fbcode_builder/getdeps/cargo.py | 2 +- watchman/ChildProcess.h | 2 +- watchman/PendingCollection.h | 4 ++-- watchman/SanityCheck.cpp | 2 +- watchman/cli/src/rage/mod.rs | 2 +- watchman/cmds/state.cpp | 2 +- watchman/cmds/subscribe.cpp | 2 +- watchman/cppclient/WatchmanClient.h | 2 +- watchman/fs/FSDetect.cpp | 2 +- watchman/fs/FileInformation.h | 2 +- watchman/fs/FileSystem.cpp | 2 +- watchman/fs/ParallelWalk.cpp | 2 +- watchman/fs/ParallelWalk.h | 6 +++--- watchman/integration/cppclient.cpp | 2 +- watchman/integration/eden/test_eden_since.py | 8 ++++---- watchman/integration/lib/WatchmanTestCase.py | 2 +- .../java/src/com/facebook/watchman/Deserializer.java | 2 +- watchman/node/bser/index.js | 2 +- watchman/python/pywatchman/__init__.py | 2 +- watchman/query/eval.cpp | 4 ++-- watchman/root/Root.h | 2 +- watchman/rust/serde_bser/src/bytestring.rs | 2 +- watchman/rust/watchman_client/src/lib.rs | 6 +++--- watchman/rust/watchman_client/src/pdu.rs | 2 +- watchman/scm/Mercurial.cpp | 2 +- watchman/stream_win.cpp | 2 +- watchman/test/StringTest.cpp | 2 +- watchman/test/async/test_subscribe_async.py | 2 +- watchman/watcher/eden.cpp | 10 +++++----- watchman/watcher/portfs.cpp | 2 +- website/docs/cmd/query.md | 2 +- website/docs/cmd/trigger.md | 2 +- website/docs/expr/dirname.md | 2 +- 34 files changed, 48 insertions(+), 48 deletions(-) diff --git a/build/fbcode_builder/CMake/fb_py_test_main.py b/build/fbcode_builder/CMake/fb_py_test_main.py index a9499e221a4d..8bd7829f3a85 100644 --- a/build/fbcode_builder/CMake/fb_py_test_main.py +++ b/build/fbcode_builder/CMake/fb_py_test_main.py @@ -545,12 +545,12 @@ def init_option_parser(self): op.add_option( "--coverage-include", default="*", - help='File globs to include in converage (split by ",")', + help='File globs to include in coverage (split by ",")', ) op.add_option( "--coverage-omit", default="", - help='File globs to omit from converage (split by ",")', + help='File globs to omit from coverage (split by ",")', ) op.add_option( "--logger", diff --git a/build/fbcode_builder/getdeps/cargo.py b/build/fbcode_builder/getdeps/cargo.py index cae8bf54cac1..60e3bb1f0399 100644 --- a/build/fbcode_builder/getdeps/cargo.py +++ b/build/fbcode_builder/getdeps/cargo.py @@ -306,7 +306,7 @@ def _resolve_config(self, dep_to_git) -> typing.Dict[str, typing.Dict[str, str]] def _resolve_dep_to_git(self): """ For each direct dependency of the currently build manifest check if it - is also cargo-builded and if yes then extract it's git configs and + is also cargo-built and if yes then extract it's git configs and install dir """ dependencies = self.manifest.get_dependencies(self.ctx) diff --git a/watchman/ChildProcess.h b/watchman/ChildProcess.h index 8ef89fe0439c..ba7e4ec843f6 100644 --- a/watchman/ChildProcess.h +++ b/watchman/ChildProcess.h @@ -66,7 +66,7 @@ class ChildProcess { #ifdef POSIX_SPAWN_SETSIGMASK void setSigMask(const sigset_t& mask); #endif - // Adds flags to the set of flags maintainted in the spawn attributes. + // Adds flags to the set of flags maintained in the spawn attributes. // This is logically equivalent to calling setflags(getflags()|flags) void setFlags(short flags); diff --git a/watchman/PendingCollection.h b/watchman/PendingCollection.h index 9e9d0cca8219..6abba3cc1ccc 100644 --- a/watchman/PendingCollection.h +++ b/watchman/PendingCollection.h @@ -113,9 +113,9 @@ struct watchman_pending_fs : watchman::PendingChange { * efficiently prunes redundant changes. * * PendingChanges is only intended to be accessed by one thread at a time. - * If you would like to use a single pending changes object accross + * If you would like to use a single pending changes object across * threads, you should use PendingCollection which puts a lock around - * accesses to the unerlying PendingChanges object. If you only intend to + * accesses to the underlying PendingChanges object. If you only intend to * use the object on one thread, then you can use PendingChanges directly. */ class PendingChanges { diff --git a/watchman/SanityCheck.cpp b/watchman/SanityCheck.cpp index 9c81cd577f20..9311dad3f48a 100644 --- a/watchman/SanityCheck.cpp +++ b/watchman/SanityCheck.cpp @@ -20,7 +20,7 @@ namespace watchman { namespace { -// Work-around decodeNext which implictly resets to non-blocking +// Work-around decodeNext which implicitly resets to non-blocking std::optional decodeNext(watchman_stream* client, PduBuffer& buf, json_error_t& jerr) { client->setNonBlock(false); diff --git a/watchman/cli/src/rage/mod.rs b/watchman/cli/src/rage/mod.rs index 023dbcb72a9d..86b3a1072bdd 100644 --- a/watchman/cli/src/rage/mod.rs +++ b/watchman/cli/src/rage/mod.rs @@ -471,7 +471,7 @@ impl WatchmanRage { } else { writeln!( self.stream, - "Failed to retireve configuration from Watchman. Not checking if configuration matches on-disk setting" + "Failed to retrieve configuration from Watchman. Not checking if configuration matches on-disk setting" )?; } diff --git a/watchman/cmds/state.cpp b/watchman/cmds/state.cpp index 8a21e7dc9b64..9a1fe04be20f 100644 --- a/watchman/cmds/state.cpp +++ b/watchman/cmds/state.cpp @@ -216,7 +216,7 @@ static UntypedResponse cmd_state_leave( try { result.throwUnlessValue(); } catch (const std::exception& exc) { - // The sync failed for whatever reason; log it and take no futher + // The sync failed for whatever reason; log it and take no further // action log(ERR, "state-leave sync failed: ", exc.what(), "\n"); return; diff --git a/watchman/cmds/subscribe.cpp b/watchman/cmds/subscribe.cpp index 112d65fd23b7..4f836087ae40 100644 --- a/watchman/cmds/subscribe.cpp +++ b/watchman/cmds/subscribe.cpp @@ -254,7 +254,7 @@ std::optional ClientSubscription::buildSubscriptionResults( position = res.clockAtStartOfQuery; // An SCM operation was interleaved with the query execution. This could - // result in over-reporing query results. Discard our results but, do not + // result in over-reporting query results. Discard our results but, do not // update the clock in order to allow changes to be reported the next time // the query is run. bool scmAwareQuery = since_spec && since_spec->hasScmParams(); diff --git a/watchman/cppclient/WatchmanClient.h b/watchman/cppclient/WatchmanClient.h index 45a7246e60ee..0838bbae5799 100644 --- a/watchman/cppclient/WatchmanClient.h +++ b/watchman/cppclient/WatchmanClient.h @@ -9,7 +9,7 @@ /* A C++ client library for accessing Watchman. This builds on top of * WatchmanConnection to provide a C++ friendly subscription API and maybe - * later other convienence functions. The entry point for this API is via + * later other convenience functions. The entry point for this API is via * the WatchmanClient type. * * Example usage: diff --git a/watchman/fs/FSDetect.cpp b/watchman/fs/FSDetect.cpp index daec91dd4963..b99c9eb8ee79 100644 --- a/watchman/fs/FSDetect.cpp +++ b/watchman/fs/FSDetect.cpp @@ -60,7 +60,7 @@ std::optional find_fstype_in_linux_proc_mounts( if (folly::split( " ", line, device, mountPoint, vfstype, opts, freq, passno)) { // Look for the mountPoint that matches the longest prefix of path - // we intentially bias towards the last matching path + // we intentionally bias towards the last matching path if (mountPoint.size() >= bestMountPoint.size() && folly::StringPiece{path}.startsWith(mountPoint)) { if ( diff --git a/watchman/fs/FileInformation.h b/watchman/fs/FileInformation.h index 7f033956ec97..cff150a63545 100644 --- a/watchman/fs/FileInformation.h +++ b/watchman/fs/FileInformation.h @@ -25,7 +25,7 @@ using ino_t = unsigned int; using nlink_t = unsigned int; /** - * Convertion between st_mode and d_type on Windows. On Windows the 4th nibble + * Conversion between st_mode and d_type on Windows. On Windows the 4th nibble * of mode contains the type of directory entry. Right shifting by 12 bits to * form a d_type. */ diff --git a/watchman/fs/FileSystem.cpp b/watchman/fs/FileSystem.cpp index 7cc159a6bd1c..bf1de13a176a 100644 --- a/watchman/fs/FileSystem.cpp +++ b/watchman/fs/FileSystem.cpp @@ -328,7 +328,7 @@ w_string realPath(const char* path) { // On Windows, "" is used to refer to the CWD. // We also allow using "." for parity with unix, even though that // doesn't generally work for that purpose on windows. - // This allows `watchman watch-project .` to succeeed on windows. + // This allows `watchman watch-project .` to succeed on windows. if (path[0] == 0 || (path[0] == '.' && path[1] == 0)) { return getCurrentDirectory(); } diff --git a/watchman/fs/ParallelWalk.cpp b/watchman/fs/ParallelWalk.cpp index 94884f972703..bf859919f6c1 100644 --- a/watchman/fs/ParallelWalk.cpp +++ b/watchman/fs/ParallelWalk.cpp @@ -198,7 +198,7 @@ void readDirTask( IoErrorWithPath error{ std::move(fileFullPath), err, "getFileInformation"}; context->errorQueue.enqueue(error); - // Contine checking other entries. + // Continue checking other entries. continue; } } diff --git a/watchman/fs/ParallelWalk.h b/watchman/fs/ParallelWalk.h index b84f3471d432..28e57a0f7800 100644 --- a/watchman/fs/ParallelWalk.h +++ b/watchman/fs/ParallelWalk.h @@ -74,13 +74,13 @@ class ParallelWalker final { /** * Obtain the next ReadDirResult. Might block. * - * Parent directory is guarnateed to be provided before child directories. + * Parent directory is guaranteed to be provided before child directories. * After completion, always return nullopt without blocking. */ std::optional nextResult(); /** - * Obtain an occured error. Might block. + * Obtain an occurred error. Might block. * * After completion, always return nullopt without blocking. */ @@ -91,7 +91,7 @@ class ParallelWalker final { * * Existing tasks will still run to completion but new tasks will exit * immediately without spawning tasks for subdirectories. - * context_ will be dropped after completeing all tasks. + * context_ will be dropped after completing all tasks. */ ~ParallelWalker(); diff --git a/watchman/integration/cppclient.cpp b/watchman/integration/cppclient.cpp index bda3093e26f7..a68f14ddd9cf 100644 --- a/watchman/integration/cppclient.cpp +++ b/watchman/integration/cppclient.cpp @@ -171,7 +171,7 @@ int main(int argc, char** argv) { eb, [&](folly::Try&& data) { if (data.hasException()) { - LOG(INFO) << "Expected subcription error caught"; + LOG(INFO) << "Expected subscription error caught"; subErrorCallbackTrigger.setValue(); } }) diff --git a/watchman/integration/eden/test_eden_since.py b/watchman/integration/eden/test_eden_since.py index 4cccb0b1d8a1..e9c39b8335d9 100644 --- a/watchman/integration/eden/test_eden_since.py +++ b/watchman/integration/eden/test_eden_since.py @@ -247,7 +247,7 @@ def test_eden_since_removal(self) -> None: # file/directory is removed, and thus this is reported to Watchman as # an UNKNOWN file, which for removed files/directory will be reported # as a removed file. - self.assertQueryRepsonseEqual( + self.assertQueryResponseEqual( [{"name": "adir", "type": "f"}, {"name": "adir/file", "type": "f"}], first_res["files"], ) @@ -274,7 +274,7 @@ def test_eden_since_across_update(self) -> None: first_res = self.query_adir_change_since(root, first_clock) - self.assertQueryRepsonseEqual( + self.assertQueryResponseEqual( [{"name": "adir", "type": "d"}, {"name": "adir/file", "type": "f"}], first_res["files"], ) @@ -288,7 +288,7 @@ def test_eden_since_across_update(self) -> None: second_res = self.query_adir_change_since(root, second_clock) - self.assertQueryRepsonseEqual( + self.assertQueryResponseEqual( [{"name": "adir", "type": "d"}, {"name": "adir/file", "type": "f"}], second_res["files"], ) @@ -351,7 +351,7 @@ def do_query(clock): res = do_query(clock) self.assertFalse(res["is_fresh_instance"]) - self.assertQueryRepsonseEqual(["hello"], res["files"]) + self.assertQueryResponseEqual(["hello"], res["files"]) def test_eden_since_dotfiles_change(self) -> None: root = self.makeEdenMount( diff --git a/watchman/integration/lib/WatchmanTestCase.py b/watchman/integration/lib/WatchmanTestCase.py index 7e7ee84c0397..b036e647d4e7 100644 --- a/watchman/integration/lib/WatchmanTestCase.py +++ b/watchman/integration/lib/WatchmanTestCase.py @@ -395,7 +395,7 @@ def assertFileList( # pyre-fixme[16]: `WatchmanTestCase` has no attribute `last_file_list`. self.assertFileListsEqual(self.last_file_list, expected_files, message) - def assertQueryRepsonseEqual(self, expected_resp, actual_resp) -> None: + def assertQueryResponseEqual(self, expected_resp, actual_resp) -> None: # converting the dict to a string version of the json is not # exactly the fastest function to use to sort, but it is unambiguous. sorted_expected = sorted( diff --git a/watchman/java/src/com/facebook/watchman/Deserializer.java b/watchman/java/src/com/facebook/watchman/Deserializer.java index d16c19c2a712..479716be92ab 100644 --- a/watchman/java/src/com/facebook/watchman/Deserializer.java +++ b/watchman/java/src/com/facebook/watchman/Deserializer.java @@ -14,7 +14,7 @@ public interface Deserializer { /** - * Reads the next object from the InputSteram, blocking until it becomes available. + * Reads the next object from the InputStream, blocking until it becomes available. * @param stream the stream to read from * @return a deserialized object, read from the stream */ diff --git a/watchman/node/bser/index.js b/watchman/node/bser/index.js index 6420746d9a4f..84550fff63b5 100644 --- a/watchman/node/bser/index.js +++ b/watchman/node/bser/index.js @@ -258,7 +258,7 @@ BunserBuf.prototype.processLater = function() { // Do something with the buffer to advance our state. // If we're running synchronously we'll return either // the value we've decoded or undefined if we don't -// yet have enought data. +// yet have enough data. // If we're running asynchronously, we'll emit the value // when it becomes ready and schedule another invocation // of process on the next tick if we still have data we diff --git a/watchman/python/pywatchman/__init__.py b/watchman/python/pywatchman/__init__.py index a1a8763e26b1..79bf32b89aa4 100644 --- a/watchman/python/pywatchman/__init__.py +++ b/watchman/python/pywatchman/__init__.py @@ -395,7 +395,7 @@ def _get_overlapped_result_ex_impl(pipe, olap, nbytes, millis, alertable): # Event is signaled, overlapped IO operation result should be available. pass elif waitReturnCode == WAIT_IO_COMPLETION: - # WaitForSingleObjectEx returnes because the system added an I/O completion + # WaitForSingleObjectEx returns because the system added an I/O completion # routine or an asynchronous procedure call (APC) to the thread queue. SetLastError(WAIT_IO_COMPLETION) pass diff --git a/watchman/query/eval.cpp b/watchman/query/eval.cpp index f94880153cf9..5a16b2a3ffa0 100644 --- a/watchman/query/eval.cpp +++ b/watchman/query/eval.cpp @@ -317,13 +317,13 @@ QueryResult w_query_execute( } // Populate transition counter at start of query. This allows us to - // determine if SCM operations ocurred concurrent with query execution. + // determine if SCM operations occurred concurrent with query execution. res.stateTransCountAtStartOfQuery = root->stateTransCount.load(); resultClock.scmMergeBaseWith = query->since_spec->scmMergeBaseWith; resultClock.scmMergeBase = scm->mergeBaseWith(resultClock.scmMergeBaseWith, requestId); // Always update the saved state storage type and key, but conditionally - // update the saved state commit id below based on wether the mergebase has + // update the saved state commit id below based on whether the mergebase has // changed. if (query->since_spec->hasSavedStateParams()) { resultClock.savedStateStorageType = diff --git a/watchman/root/Root.h b/watchman/root/Root.h index 775231c758ab..ce933ebe870d 100644 --- a/watchman/root/Root.h +++ b/watchman/root/Root.h @@ -303,7 +303,7 @@ class Root : public RootConfig, public std::enable_shared_from_this { // all outstanding query contexts that are executing against this root. // If is only safe to read the query contexts while the queries.rlock() // is held, and even then it is only really safe to read fields that - // are not changed by the query exection. + // are not changed by the query execution. folly::Synchronized> queries; /** diff --git a/watchman/rust/serde_bser/src/bytestring.rs b/watchman/rust/serde_bser/src/bytestring.rs index 3567f1267073..1fd22e8133fe 100644 --- a/watchman/rust/serde_bser/src/bytestring.rs +++ b/watchman/rust/serde_bser/src/bytestring.rs @@ -24,7 +24,7 @@ use serde::Serialize; /// When it comes to interoperating with Rust code, ByteString is nominally /// equivalent to `OsString`/`PathBuf` and is convertible to and from those values. /// -/// It is worth noting that on Windows sytems the conversion from ByteString to OsString is +/// It is worth noting that on Windows systems the conversion from ByteString to OsString is /// potentially lossy: while convention is that bytestring holds utf8 in the common case in /// watchman, that isn't enforced by its serializer and we may potentially encounter an error /// during conversion. Converting from OsString to ByteString can potentially fail on windows diff --git a/watchman/rust/watchman_client/src/lib.rs b/watchman/rust/watchman_client/src/lib.rs index df902313c6a5..2d7341150b8c 100644 --- a/watchman/rust/watchman_client/src/lib.rs +++ b/watchman/rust/watchman_client/src/lib.rs @@ -372,7 +372,7 @@ pub struct ResolvedRoot { impl ResolvedRoot { /// Returns the name of the watcher that the server is using to /// monitor the path. The watcher is generally system dependent, - /// but some systems offer multipler watchers. + /// but some systems offer multiplier watchers. /// You generally don't care too much about the watcher that is /// in use, but if the watcher is a virtualized filesystem such as /// `eden` then you may wish to use to alternative queries to get the @@ -430,7 +430,7 @@ enum TaskItem { RegisterSubscription(String, UnboundedSender), } -/// Splits BSER mesages out of a stream. Does not attempt to actually decode them. +/// Splits BSER messages out of a stream. Does not attempt to actually decode them. struct BserSplitter; impl Decoder for BserSplitter { @@ -454,7 +454,7 @@ impl Decoder for BserSplitter { return Ok(None); } - // We should have succeded in reading some data here, but we didn't. Return an + // We should have succeeded in reading some data here, but we didn't. Return an // error. return Err(TaskError::Deserialize { source: source.into(), diff --git a/watchman/rust/watchman_client/src/pdu.rs b/watchman/rust/watchman_client/src/pdu.rs index 3a1ae97f89e2..915d493710a2 100644 --- a/watchman/rust/watchman_client/src/pdu.rs +++ b/watchman/rust/watchman_client/src/pdu.rs @@ -831,7 +831,7 @@ pub struct SavedStateClockData { pub enum ContentSha1Hex { /// The 40-hex-digit SHA1 content hash of the file contents Hash(String), - /// The error that occured while trying to determine the hash + /// The error that occurred while trying to determine the hash Error { error: String }, /// Value if the file was deleted. /// Note that this is distinct from the case where watchman believes diff --git a/watchman/scm/Mercurial.cpp b/watchman/scm/Mercurial.cpp index 3dba66aa23fe..172b053a8358 100644 --- a/watchman/scm/Mercurial.cpp +++ b/watchman/scm/Mercurial.cpp @@ -79,7 +79,7 @@ ChildProcess::Options Mercurial::makeHgOptions( const std::optional& requestId) const { ChildProcess::Options opt; // Ensure that the hgrc doesn't mess with the behavior - // of the commands that we're runing. + // of the commands that we're running. opt.environment().set("HGPLAIN", w_string("1")); // Ensure that we do not telemetry log profiling data for the commands we are // running by default. This is to avoid a significant increase in the rate of diff --git a/watchman/stream_win.cpp b/watchman/stream_win.cpp index c468ae0b073f..27b0caa3c2a7 100644 --- a/watchman/stream_win.cpp +++ b/watchman/stream_win.cpp @@ -159,7 +159,7 @@ static BOOL WINAPI get_overlapped_result_ex_impl( // available. break; case WAIT_IO_COMPLETION: - // WaitForSingleObjectEx returnes because the system added an I/O + // WaitForSingleObjectEx returns because the system added an I/O // completion routine or an asynchronous procedure call (APC) to the // thread queue. SetLastError(WAIT_IO_COMPLETION); diff --git a/watchman/test/StringTest.cpp b/watchman/test/StringTest.cpp index 40ed5d219d84..b3c5b7048d77 100644 --- a/watchman/test/StringTest.cpp +++ b/watchman/test/StringTest.cpp @@ -84,7 +84,7 @@ TEST(String, strings) { EXPECT_TRUE(movedFrom.empty()) << "moved-from string should be empty"; EXPECT_TRUE(w_string_piece().empty()) - << "default constructed string piece shouldbe empty"; + << "default constructed string piece should be empty"; EXPECT_TRUE(w_string::build("").empty()) << "empty string is empty"; } diff --git a/watchman/test/async/test_subscribe_async.py b/watchman/test/async/test_subscribe_async.py index 96bbad203361..b2dede522912 100644 --- a/watchman/test/async/test_subscribe_async.py +++ b/watchman/test/async/test_subscribe_async.py @@ -55,7 +55,7 @@ def test_subscribe(self): # Trigger a recrawl and ensure that the subscription isn't lost self.watchman_command("debug-recrawl", root) - # Touch a file to make sure clock increases and subscribtion event. + # Touch a file to make sure clock increases and subscription event. # This prevents test failure on some platforms self.touch_relative(root, "c") diff --git a/watchman/watcher/eden.cpp b/watchman/watcher/eden.cpp index 1352ec161fe9..581e426f1e7f 100644 --- a/watchman/watcher/eden.cpp +++ b/watchman/watcher/eden.cpp @@ -362,7 +362,7 @@ class EdenFileResult : public FileResult { return result; } - // Thrift error occured + // Thrift error occurred case SHA1Result::Type::error: { auto& err = sha1_->get_error(); XCHECK(err.errorCode()); @@ -1034,10 +1034,10 @@ class EdenView final : public QueryableView { void clearWatcherDebugInfo() override {} - using EdenFSSubcription = + using EdenFSSubscription = apache::thrift::ClientBufferedStream::Subscription; - EdenFSSubcription rocketSubscribe( + EdenFSSubscription rocketSubscribe( std::shared_ptr root, SettleCallback& settleCallback, GetJournalPositionCallback& getJournalPositionCallback, @@ -1105,7 +1105,7 @@ class EdenView final : public QueryableView { w_set_thread_name("edensub ", root->root_path.view()); log(DBG, "Started subscription thread\n"); - std::optional subscription; + std::optional subscription; SCOPE_EXIT { if (subscription.has_value()) { subscription->cancel(); @@ -1338,7 +1338,7 @@ class EdenView final : public QueryableView { } /** - * Compute and return all the changes that occured since the last call. + * Compute and return all the changes that occurred since the last call. * * On error, or when thresholdForFreshInstance_ is exceeded, the clock will * be modified to indicate a fresh instance and an empty set of files will be diff --git a/watchman/watcher/portfs.cpp b/watchman/watcher/portfs.cpp index addb6a8a091e..6de042459015 100644 --- a/watchman/watcher/portfs.cpp +++ b/watchman/watcher/portfs.cpp @@ -294,7 +294,7 @@ bool PortFSWatcher::waitNotify(int timeoutms) { return false; } if (pfd[1].revents) { - // An exceptional event (delete) occured on the root so delete it + // An exceptional event (delete) occurred on the root so delete it root_deleted = true; return true; } diff --git a/website/docs/cmd/query.md b/website/docs/cmd/query.md index c228b016311f..d256699efcba 100644 --- a/website/docs/cmd/query.md +++ b/website/docs/cmd/query.md @@ -141,7 +141,7 @@ _Since 4.6._ _Since 4.9._ - `content.sha1hex` - string: the SHA-1 digest of the file's byte content, - encoded as 40 hexidecimal digits (e.g. + encoded as 40 hexadecimal digits (e.g. `"da39a3ee5e6b4b0d3255bfef95601890afd80709"` for an empty file) ### Synchronization timeout (since 2.1) diff --git a/website/docs/cmd/trigger.md b/website/docs/cmd/trigger.md index 25d00ed2562a..7324b093cefa 100644 --- a/website/docs/cmd/trigger.md +++ b/website/docs/cmd/trigger.md @@ -28,7 +28,7 @@ generated watchman will spawn a new child with the files that changed in the meantime. Unless `no-save-state` is in use, triggers are saved and re-established across a -Watchman process restart. If you had triggeres saved prior to upgrading to +Watchman process restart. If you had triggers saved prior to upgrading to Watchman 2.9.7, those triggers will be forgotten as you upgrade past version 2.9.7; you will need to re-register them. diff --git a/website/docs/expr/dirname.md b/website/docs/expr/dirname.md index 86cc2fc47843..582abd5b98c4 100644 --- a/website/docs/expr/dirname.md +++ b/website/docs/expr/dirname.md @@ -36,4 +36,4 @@ If you wanted to match only files that were in a grand-child or deeper: ["dirname", "foo/bar", ["depth", "ge", 2]] `idirname` is the case insensitive version of `dirname`. If the watched root is -detected as a case insensitive fileystem, `dirname` is equivalent to `idirname`. +detected as a case insensitive filesystem, `dirname` is equivalent to `idirname`.