Merge branch 'master.upstream' into staging.upstream

2015-08-03 16:26:13 -07:00 · 2015-08-03 16:26:13 -07:00 · a9dae2f967
commit a9dae2f967
parent 49adfe2ff9 736552b7e5
1 changed files with 1 additions and 1 deletions
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@ -60,7 +60,7 @@ in {
        type = types.bool;
        default = false;
        description = ''
-          Whether to include <filename>/nix/store<filename> in the locate database.
+          Whether to include <filename>/nix/store</filename> in the locate database.
        '';
      };