[kdesrc-build] /: Document new behaviour of git-desired-protocol

[Johan Ouwerkerk]

Git commit 66e5e69208792ccf00fcd8d396d290a01b24c70c by Johan Ouwerkerk.
Committed on 03/05/2020 at 15:03.
Pushed by mpyne into branch 'master'.

Document new behaviour of git-desired-protocol

M  +6    -4    doc/index.docbook
M  +1    -1    kdesrc-build-setup

https://invent.kde.org/kde/kdesrc-build/commit/66e5e69208792ccf00fcd8d396d290a01b24c70c

diff --git a/doc/index.docbook b/doc/index.docbook
index 8c6e9d5..082cb1e 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -2154,14 +2154,14 @@ This option was removed in version 1.10
 linkend="kde-projects-module-sets">&kde; project</link> repository.</para>
 
 <para>What this option actually does is configure which network protocol to
-prefer when updating source code for these modules. Normally the very-efficient
+prefer when pushing source code for these modules. Normally the very-efficient
 <literal>git</literal> protocol is used, but this may be blocked in some
 networks (e.g. corporate intranets, public Wi-Fi). An alternative protocol
-which is much better supported is the <literal>HTTP</literal> protocol used for
+which is much better supported is the <literal>https</literal> protocol used for
 Internet web sites.</para>
 
 <para>If you are using one of these constrained networks you can set this
-option to <userinput>http</userinput> to prefer <literal>HTTP</literal>
+option to <userinput>http</userinput> to prefer <literal>https</literal>
 communications instead.</para>
 
 <tip><para>You may also need the <link
@@ -2171,7 +2171,9 @@ needed for network traffic.</para></tip>
 <para>In any other situation you should not set this option as the default
 protocol is most efficient.</para>
 
-<para>This option was added in &kdesrc-build; 1.16.</para>
+<para>This option was added in &kdesrc-build; 1.16. Prior to 20.06 this option
+was used to configure the fetch URL instead of the push URL. As of 20.06
+<literal>https</literal> is always used when updating KDE projects.</para>
 </entry>
 </row>
 
diff --git a/kdesrc-build-setup b/kdesrc-build-setup
index 54229e3..c72d17e 100755
--- a/kdesrc-build-setup
+++ b/kdesrc-build-setup
@@ -401,7 +401,7 @@ if ($proxy) {
     # Note that any git:// repositories you use will need to be
     # manually converted to https:// URLs if your network does not allow
     # git:// protcol.
-    git-desired-protocol https    # http is also valid
+    git-desired-protocol https
 EOF
 }