dcavalca / rpms / dnf

Forked from rpms/dnf 2 years ago
Clone

Blame SOURCES/0022-doc-Improve-proxy-configuration-option-documentation.patch

44fffb
From 8f05ee29b7398fa6d18c7113a533f1d8726239df Mon Sep 17 00:00:00 2001
44fffb
From: Jaroslav Rohel <jrohel@redhat.com>
44fffb
Date: Tue, 12 Apr 2022 12:25:05 +0200
70e049
Subject: [PATCH] [doc] Improve "proxy" configuration option documentation
70e049
 (RhBug:2072332)
44fffb
44fffb
---
44fffb
 doc/conf_ref.rst | 4 ++--
44fffb
 1 file changed, 2 insertions(+), 2 deletions(-)
44fffb
44fffb
diff --git a/doc/conf_ref.rst b/doc/conf_ref.rst
44fffb
index 75bcdf75..885a4560 100644
44fffb
--- a/doc/conf_ref.rst
44fffb
+++ b/doc/conf_ref.rst
44fffb
@@ -833,10 +833,10 @@ configuration.
44fffb
 ``proxy``
44fffb
     :ref:`string <string-label>`
44fffb
 
44fffb
-    URL of a proxy server to connect through. Set to an empty string to disable the proxy setting inherited from the main section and use direct connection instead. The expected format of this option is ``<scheme>://<ip-or-hostname>[:port]``.
44fffb
+    URL of a proxy server to connect through. Set to an empty string in the repository configuration to disable proxy setting inherited from the main section. The expected format of this option is ``<scheme>://<ip-or-hostname>[:port]``.
44fffb
     (For backward compatibility, '_none_' can be used instead of the empty string.)
44fffb
 
44fffb
-    Note: The curl environment variables (such as ``http_proxy``) are effective if this option is unset. See the ``curl`` man page for details.
44fffb
+    Note: The curl environment variables (such as ``http_proxy``) are effective if this option is unset (or '_none_' is set in the repository configuration). See the ``curl`` man page for details.
44fffb
 
44fffb
 ``proxy_username``
44fffb
     :ref:`string <string-label>`
44fffb
-- 
70e049
2.35.1
44fffb