diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh index c2824789ede..d68993f280f 100644 --- a/nix/libstore/globals.hh +++ b/nix/libstore/globals.hh @@ -103,7 +103,7 @@ struct Settings { /* The canonical system name, as returned by config.guess. */ string thisSystem; - /* The maximum time in seconds that a builer can go without + /* The maximum time in seconds that a builder can go without producing any output on stdout/stderr before it is killed. 0 means infinity. */ time_t maxSilentTime; diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh index affa98b179d..b57f1e10842 100644 --- a/nix/libstore/store-api.hh +++ b/nix/libstore/store-api.hh @@ -357,7 +357,7 @@ Path addPermRoot(StoreAPI & store, const Path & storePath, /* Sort a set of paths topologically under the references relation. - If p refers to q, then p preceeds q in this list. */ + If p refers to q, then p precedes q in this list. */ Paths topoSortPaths(StoreAPI & store, const PathSet & paths); diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh index 42cb60ea0d4..3bf2f0be754 100644 --- a/nix/libutil/util.hh +++ b/nix/libutil/util.hh @@ -170,7 +170,7 @@ void writeToStderr(const string & s); inline void (*_writeToStderr) (const unsigned char * buf, size_t count) = 0; -/* Wrappers arount read()/write() that read/write exactly the +/* Wrappers around read()/write() that read/write exactly the requested number of bytes. */ void readFull(int fd, unsigned char * buf, size_t count); void writeFull(int fd, const unsigned char * buf, size_t count);