Skip to content

Commit

Permalink
fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
mjoerg committed May 27, 2024
1 parent 7de033d commit e7ea559
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/manual/src/language/operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ The result is a string.
Update [attribute set] *attrset1* with names and values from *attrset2*.

The returned attribute set will have of all the attributes in *attrset1* and *attrset2*.
The returned attribute set will have all of the attributes in *attrset1* and *attrset2*.
If an attribute name is present in both, the attribute value from the latter is taken.

[Update]: #update
Expand Down
4 changes: 2 additions & 2 deletions src/nix/flake-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ R""(

# Examples

* Show what `nixpkgs` resolves to:
* Show what `dwarffs` resolves to:

```console
# nix flake metadata nixpkgs
# nix flake metadata dwarffs
Resolved URL: github:edolstra/dwarffs
Locked URL: github:edolstra/dwarffs/f691e2c991e75edb22836f1dbe632c40324215c5
Description: A filesystem that fetches DWARF debug info from the Internet on demand
Expand Down
2 changes: 1 addition & 1 deletion src/nix/hash.cc
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ struct CmdToBase : Command

void run() override
{
warn("The old format conversion sub commands of `nix hash` where deprecated in favor of `nix hash convert`.");
warn("The old format conversion sub commands of `nix hash` were deprecated in favor of `nix hash convert`.");
for (auto s : args)
logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI));
}
Expand Down

0 comments on commit e7ea559

Please sign in to comment.