From 06db28d5367a47d48b71e405b85458229160a556 Mon Sep 17 00:00:00 2001
From: Gautier DI FOLCO <gautier.difolco@gmail.com>
Date: Sat, 30 Jul 2022 11:10:24 +0200
Subject: [PATCH 1/3] Give an example for `--enable-nix` flag

---
 doc/nix-integration.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/nix-integration.rst b/doc/nix-integration.rst
index 07491160173..a660fe859b2 100644
--- a/doc/nix-integration.rst
+++ b/doc/nix-integration.rst
@@ -11,10 +11,8 @@ Nix Integration
 Enabling Nix Integration
 ------------------------
 
-To enable Nix integration, simply pass the ``--enable-nix`` global
-option when you call ``cabal``. To use this option everywhere, edit
-your :ref:`global configuration file<config-file-discovery>`
-(default: ``$HOME/.cabal/config``) to include:
+To enable Nix integration, simply pass the ``--enable-nix`` global option when you call ``cabal`` (eg. ``cabal --enable-nix build``).
+To use this option everywhere, edit your :ref:`global configuration file<config-file-discovery>` (default: ``$HOME/.cabal/config``) to include:
 
 .. code-block:: cabal
 

From 5663e82c4dd2d76ae2d343cb1a24de29962c11d2 Mon Sep 17 00:00:00 2001
From: Gautier DI FOLCO <gautier.difolco@gmail.com>
Date: Sat, 30 Jul 2022 15:22:15 +0200
Subject: [PATCH 2/3] fixup! Give an example for `--enable-nix` flag

---
 doc/nix-integration.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/nix-integration.rst b/doc/nix-integration.rst
index a660fe859b2..8ee119074aa 100644
--- a/doc/nix-integration.rst
+++ b/doc/nix-integration.rst
@@ -11,7 +11,7 @@ Nix Integration
 Enabling Nix Integration
 ------------------------
 
-To enable Nix integration, simply pass the ``--enable-nix`` global option when you call ``cabal`` (eg. ``cabal --enable-nix build``).
+To enable Nix integration, simply pass the ``--enable-nix`` global option when you call ``cabal`` (eg. ``cabal --enable-nix v1-build``).
 To use this option everywhere, edit your :ref:`global configuration file<config-file-discovery>` (default: ``$HOME/.cabal/config``) to include:
 
 .. code-block:: cabal
@@ -20,14 +20,14 @@ To use this option everywhere, edit your :ref:`global configuration file<config-
 
 If the package (which must be locally unpacked) provides a ``shell.nix`` or ``default.nix`` file, this flag will cause ``cabal`` to run most commands through ``nix-shell``. If both expressions are present, ``shell.nix`` is preferred. The following commands are affected:
 
-- ``cabal configure``
-- ``cabal build``
-- ``cabal repl``
-- ``cabal install`` (only if installing into a sandbox)
-- ``cabal haddock``
-- ``cabal freeze``
-- ``cabal gen-bounds``
-- ``cabal run``
+- ``cabal v1-configure``
+- ``cabal v1-build``
+- ``cabal v1-repl``
+- ``cabal v1-install`` (only if installing into a sandbox)
+- ``cabal v1-haddock``
+- ``cabal v1-freeze``
+- ``cabal v1-gen-bounds``
+- ``cabal v1-run``
 
 If the package does not provide an expression, ``cabal`` runs normally.
 

From 115888da796f7236cf05d7d4f08bf0b1237c9f9e Mon Sep 17 00:00:00 2001
From: Gautier DI FOLCO <gautier.difolco@gmail.com>
Date: Sun, 31 Jul 2022 00:34:13 +0200
Subject: [PATCH 3/3] fixup! Give an example for `--enable-nix` flag

---
 doc/nix-integration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/nix-integration.rst b/doc/nix-integration.rst
index 8ee119074aa..24b2a6de87b 100644
--- a/doc/nix-integration.rst
+++ b/doc/nix-integration.rst
@@ -29,7 +29,7 @@ If the package (which must be locally unpacked) provides a ``shell.nix`` or ``de
 - ``cabal v1-gen-bounds``
 - ``cabal v1-run``
 
-If the package does not provide an expression, ``cabal`` runs normally.
+If the package does not provide a Nix expression, ``cabal`` runs normally.
 
 Creating Nix Expressions
 ------------------------