From 193ea342ee3cd1cb376c6c83888c0ab87740429a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20H=C3=B6glund?= <hanshoglund@users.noreply.github.com>
Date: Fri, 3 Jan 2020 00:45:50 +0000
Subject: [PATCH] Update installing-packages.rst
Clarify that it is not necessary to provide `secure` or `root-keys` for the default repository.
---
doc/installing-packages.rst | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/doc/installing-packages.rst b/doc/installing-packages.rst
index 9ec2834191..3040bb2da3 100644
--- a/doc/installing-packages.rst
+++ b/doc/installing-packages.rst
@@ -105,14 +105,18 @@ packages from any of them.
Using secure repositories
^^^^^^^^^^^^^^^^^^^^^^^^^
-For repositories that support the TUF security infrastructure (this
-includes Hackage), you can enable secure access to the repository by
-specifying:
+When interacting with ``hackage.haskell.org``, Cabal always runs in secure mode
+with standard root keys, so it is not necessary to specify ``secure`` or
+``root-keys``. If no repositories are listed, Cabal will default to
+``hackage.haskell.org``.
+
+For non-Hackage repositories that support the TUF security infrastructure you
+can enable secure access to the repository by specifying:
::
- repository hackage.haskell.org
- url: http://hackage.haskell.org/
+ repository packages.example.org
+ url: http://packages.example.org/
secure: True
root-keys: <root-key-IDs>
key-threshold: <key-threshold>
@@ -272,4 +276,4 @@ dependencies in a single step. To do this, run:
To browse the list of available packages, visit the `Hackage`_ web site.
-.. _Hackage: https://hackage.haskell.org/
\ No newline at end of file
+.. _Hackage: https://hackage.haskell.org/
--
GitLab