From 8327e733966cc4a93dfaadd1a761ca1088078baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 15 Dec 2018 23:50:24 +0100 Subject: daemon: Use unbranded phrases in comments and messages. * nix/libstore/build.cc, nix/libstore/globals.cc, nix/libstore/gc.cc, nix/libstore/local-store.cc, nix/libstore/optimise-store.cc, nix/libstore/store-api.cc, nix/libutil/archive.cc, nix/nix-daemon/nix-daemon.cc: Replace "Nix store" by "store", and "Nix daemon" by "build daemon". --- nix/libstore/store-api.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nix/libstore/store-api.cc') diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc index 9e07c67e97..709d17ea21 100644 --- a/nix/libstore/store-api.cc +++ b/nix/libstore/store-api.cc @@ -32,14 +32,14 @@ bool isStorePath(const Path & path) void assertStorePath(const Path & path) { if (!isStorePath(path)) - throw Error(format("path `%1%' is not in the Nix store") % path); + throw Error(format("path `%1%' is not in the store") % path); } Path toStorePath(const Path & path) { if (!isInStore(path)) - throw Error(format("path `%1%' is not in the Nix store") % path); + throw Error(format("path `%1%' is not in the store") % path); Path::size_type slash = path.find('/', settings.nixStore.size() + 1); if (slash == Path::npos) return path; @@ -80,7 +80,7 @@ void checkStoreName(const string & name) where - = the location of the Nix store, usually /nix/store + = the location of the store, usually /gnu/store = a human readable name for the path, typically obtained from the name attribute of the derivation, or the name of the -- cgit v1.2.3