From cac5f3a3612a7ae28c95d5e3526b1c74670c8711 Mon Sep 17 00:00:00 2001
From: Lucas Moura <lucas.moura@canonical.com>
Date: Wed, 24 Jul 2024 13:18:35 -0300
Subject: [PATCH] docs: update proxies to use http

On howtoguide for configuring proxies, we are using by default
the http prefix for http proxies and https prefix for the https
proxies. We are now changing the default to use http on both
http and https, but adding a note that users might need
to use the https prefix depending on their proxy setup.

Fixes: #2881
---
 custom_wordlist.txt                    |  1 +
 docs/howtoguides/configure_proxies.rst | 16 +++++++++++-----
 wordlist.txt                           |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/custom_wordlist.txt b/custom_wordlist.txt
index 53b3fa5269..5bf8dd7f6b 100644
--- a/custom_wordlist.txt
+++ b/custom_wordlist.txt
@@ -55,6 +55,7 @@ honor
 honored
 hostname
 html
+http
 https
 init
 internetless
diff --git a/docs/howtoguides/configure_proxies.rst b/docs/howtoguides/configure_proxies.rst
index 3d4eee930e..8541f64cbe 100644
--- a/docs/howtoguides/configure_proxies.rst
+++ b/docs/howtoguides/configure_proxies.rst
@@ -10,6 +10,12 @@ addition, the Ubuntu Pro Client will automatically set up proxies for all
 programs required for enabling Ubuntu Pro services. This includes APT, snaps,
 and Livepatch.
 
+.. note::
+
+    Throughout this guide, we will set the HTTPS proxy with an http prefix.
+    However, depending on your proxy setup, you might need to configure the
+    Pro HTTPS proxy with a https prefix.
+
 HTTP/HTTPS proxies
 ==================
 
@@ -18,7 +24,7 @@ To configure standard HTTP and/or HTTPS proxies, run the following commands:
 .. code-block:: bash
 
    $ sudo pro config set http_proxy=http://host:port
-   $ sudo pro config set https_proxy=https://host:port
+   $ sudo pro config set https_proxy=http://host:port
 
 After running the above commands, Ubuntu Pro Client will:
 
@@ -50,7 +56,7 @@ your global APT proxy configuration, run the following commands:
 .. code-block:: bash
 
    $ sudo pro config set global_apt_http_proxy=http://host:port
-   $ sudo pro config set global_apt_https_proxy=https://host:port
+   $ sudo pro config set global_apt_https_proxy=http://host:port
 
 After running the above commands, Ubuntu Pro Client will:
 
@@ -87,7 +93,7 @@ following commands instead:
 .. code-block:: bash
 
    $ sudo pro config set ua_apt_http_proxy=http://host:port
-   $ sudo pro config set ua_apt_https_proxy=https://host:port
+   $ sudo pro config set ua_apt_https_proxy=http://host:port
 
 Authenticate your proxy server
 ==============================
@@ -115,9 +121,9 @@ proxies set:
 .. code-block:: text
 
    http_proxy             http://proxy
-   https_proxy            https://proxy
+   https_proxy            http://proxy
    global_apt_http_proxy  http://aptproxy
-   global_apt_https_proxy https://aptproxy
+   global_apt_https_proxy http://aptproxy
 
 Or it may look like this if there are no proxies set:
 
diff --git a/wordlist.txt b/wordlist.txt
index 778524bd4e..c6399847d8 100644
--- a/wordlist.txt
+++ b/wordlist.txt
@@ -41,3 +41,5 @@ ua
 UI
 VM
 YAML
+http
+https