46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From d03688c61e7609b22770f5fa6228431edfc45945 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <d03688c61e7609b22770f5fa6228431edfc45945@dist-git>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 30 Mar 2020 17:21:43 +0200
|
|
Subject: [PATCH] docs: formatdomain: Mention missing protocols
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
http, https, ftp, ftps, and tftp were not mentioned in the
|
|
documentation. Note that 'ssh' is still omitted as it's used only
|
|
internally.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit b24281c93405d6e3efb6edb3e7abff31628966b8)
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1804750
|
|
Message-Id: <ed3aac8a1ddcf415808dc9104ce7638344c09523.1585581552.git.pkrempa@redhat.com>
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
---
|
|
docs/formatdomain.html.in | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
|
|
index 2b8f9eabc2..143db21d4d 100644
|
|
--- a/docs/formatdomain.html.in
|
|
+++ b/docs/formatdomain.html.in
|
|
@@ -3086,10 +3086,11 @@
|
|
<dd>
|
|
The <code>protocol</code> attribute specifies the protocol to
|
|
access to the requested image. Possible values are "nbd",
|
|
- "iscsi", "rbd", "sheepdog", "gluster" or "vxhs".
|
|
+ "iscsi", "rbd", "sheepdog", "gluster", "vxhs", "http", "https",
|
|
+ "ftp", ftps", or "tftp".
|
|
|
|
- <p>If the <code>protocol</code> attribute is "rbd", "sheepdog",
|
|
- "gluster", or "vxhs", an additional attribute <code>name</code>
|
|
+ <p>For any <code>protocol</code> other than <code>nbd</code>
|
|
+ an additional attribute <code>name</code>
|
|
is mandatory to specify which volume/image will be used.
|
|
</p>
|
|
|
|
--
|
|
2.26.0
|
|
|