diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 7106690b82b..aedc85f3069 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -181,10 +181,10 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install
 
 <listitem>
   <para>
-    The <literal>locate</literal> service no longer indexes the nix store
+    The <literal>locate</literal> service no longer indexes the Nix store
     by default, preventing packages with potentially numerous versions from
-    cluttering the output. Indexing the store can be activated with
-    <literal>services.locate.includeStore = true;</literal>.
+    cluttering the output. Indexing the store can be activated by setting
+    <literal>services.locate.includeStore = true</literal>.
   </para>
 </listitem>
 
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index bf05c460729..e85e390acb6 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -35,7 +35,7 @@ in {
         type = types.listOf types.str;
         default = [ ];
         description = ''
-          Extra flags to append to <command>updatedb</command>.
+          Extra flags to pass to <command>updatedb</command>.
         '';
       };
 
@@ -60,7 +60,7 @@ in {
         type = types.bool;
         default = false;
         description = ''
-          Whether to include /nix/store in the locate database.
+          Whether to include <filename>/nix/store<filename> in the locate database.
         '';
       };
 
@@ -78,9 +78,9 @@ in {
           ''
             mkdir -m 0755 -p $(dirname ${toString cfg.output})
             exec updatedb \
-            --localuser=${cfg.localuser} \
-	    ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
-            --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
+              --localuser=${cfg.localuser} \
+              ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
+              --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
           '';
         serviceConfig.Nice = 19;
         serviceConfig.IOSchedulingClass = "idle";