From 5acaf13d3564f689e5461f29a9cc5958809d5e93 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 22 Mar 2022 21:54:49 +0100
Subject: [PATCH] Rename 'nix store make-content-addressable' to 'nix store
 make-content-addressed'

---
 doc/manual/src/release-notes/rl-next.md                   | 3 +++
 src/nix/main.cc                                           | 2 +-
 ...e-content-addressable.cc => make-content-addressed.cc} | 8 ++++----
 ...e-content-addressable.md => make-content-addressed.md} | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)
 rename src/nix/{make-content-addressable.cc => make-content-addressed.cc} (83%)
 rename src/nix/{make-content-addressable.md => make-content-addressed.md} (94%)

diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md
index c9753f9aa..8fbc605e7 100644
--- a/doc/manual/src/release-notes/rl-next.md
+++ b/doc/manual/src/release-notes/rl-next.md
@@ -1,3 +1,6 @@
 # Release X.Y (202?-??-??)
 
 * Various nix commands can now read expressions from stdin with `--file -`.
+
+* `nix store make-content-addressable` has been renamed to `nix store
+  make-content-addressed`.
diff --git a/src/nix/main.cc b/src/nix/main.cc
index b923f2535..9bc6c15fa 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -117,7 +117,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
         {"hash-path", {"hash", "path"}},
         {"ls-nar", {"nar", "ls"}},
         {"ls-store", {"store", "ls"}},
-        {"make-content-addressable", {"store", "make-content-addressable"}},
+        {"make-content-addressable", {"store", "make-content-addressed"}},
         {"optimise-store", {"store", "optimise"}},
         {"ping-store", {"store", "ping"}},
         {"sign-paths", {"store", "sign"}},
diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressed.cc
similarity index 83%
rename from src/nix/make-content-addressable.cc
rename to src/nix/make-content-addressed.cc
index a8579ea7c..dc0447cb8 100644
--- a/src/nix/make-content-addressable.cc
+++ b/src/nix/make-content-addressed.cc
@@ -6,9 +6,9 @@
 
 using namespace nix;
 
-struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
+struct CmdMakeContentAddressed : StorePathsCommand, MixJSON
 {
-    CmdMakeContentAddressable()
+    CmdMakeContentAddressed()
     {
         realiseMode = Realise::Outputs;
     }
@@ -21,7 +21,7 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
     std::string doc() override
     {
         return
-          #include "make-content-addressable.md"
+          #include "make-content-addressed.md"
           ;
     }
 
@@ -50,4 +50,4 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
     }
 };
 
-static auto rCmdMakeContentAddressable = registerCommand2<CmdMakeContentAddressable>({"store", "make-content-addressable"});
+static auto rCmdMakeContentAddressed = registerCommand2<CmdMakeContentAddressed>({"store", "make-content-addressed"});
diff --git a/src/nix/make-content-addressable.md b/src/nix/make-content-addressed.md
similarity index 94%
rename from src/nix/make-content-addressable.md
rename to src/nix/make-content-addressed.md
index 3dd847edc..215683e6d 100644
--- a/src/nix/make-content-addressable.md
+++ b/src/nix/make-content-addressed.md
@@ -5,7 +5,7 @@ R""(
 * Create a content-addressed representation of the closure of GNU Hello:
 
   ```console
-  # nix store make-content-addressable -r nixpkgs#hello
+  # nix store make-content-addressed nixpkgs#hello
   …
   rewrote '/nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10' to '/nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid63-hello-2.10'
   ```
@@ -29,7 +29,7 @@ R""(
   system closure:
 
   ```console
-  # nix store make-content-addressable -r /run/current-system
+  # nix store make-content-addressed /run/current-system
   ```
 
 # Description