[libvirt] [PATCH 15/24] formatstorage.html.in: Kill useless spaces in <pre/>

Michal Privoznik mprivozn at redhat.com
Mon Nov 14 09:34:01 UTC 2016


The <pre/> section is rendered as-is on the page. That is, if all
the lines are prefixed with 4 spaces the rendered page will also
have them. Problem is if we put a box around such <pre/> because
the content might not fix into it.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatstorage.html.in | 280 ++++++++++++++++++++++-----------------------
 1 file changed, 140 insertions(+), 140 deletions(-)

diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index 56b4928..ed1f0d1 100644
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -31,13 +31,13 @@
     <h3><a name="StoragePoolFirst">General metadata</a></h3>
 
     <pre>
-      <pool type="iscsi">
-        <name>virtimages</name>
-        <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>
-        <allocation>10000000</allocation>
-        <capacity>50000000</capacity>
-        <available>40000000</available>
-        ...</pre>
+<pool type="iscsi">
+  <name>virtimages</name>
+  <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid>
+  <allocation>10000000</allocation>
+  <capacity>50000000</capacity>
+  <available>40000000</available>
+  ...</pre>
 
     <dl>
       <dt><code>name</code></dt>
@@ -75,50 +75,50 @@
     </p>
 
     <pre>
-        ...
-        <source>
-          <host name="iscsi.example.com"/>
-          <device path="iqn.2013-06.com.example:iscsi-pool"/>
-          <auth type='chap' username='myname'>
-            <secret usage='mycluster_myname'/>
-          </auth>
-          <vendor name="Acme"/>
-          <product name="model"/>
-        </source>
-        ...</pre>
+...
+<source>
+  <host name="iscsi.example.com"/>
+  <device path="iqn.2013-06.com.example:iscsi-pool"/>
+  <auth type='chap' username='myname'>
+    <secret usage='mycluster_myname'/>
+  </auth>
+  <vendor name="Acme"/>
+  <product name="model"/>
+</source>
+...</pre>
 
     <pre>
-        ...
-        <source>
-          <device path='/dev/mapper/mpatha' part_separator='no'/>
-          <format type='gpt'/>
-        </source>
-        ...</pre>
+...
+<source>
+  <device path='/dev/mapper/mpatha' part_separator='no'/>
+  <format type='gpt'/>
+</source>
+...</pre>
 
     <pre>
-        ...
-        <source>
-          <adapter type='scsi_host' name='scsi_host1'/>
-        </source>
-        ...</pre>
+...
+<source>
+  <adapter type='scsi_host' name='scsi_host1'/>
+</source>
+...</pre>
 
     <pre>
-        ...
-        <source>
-          <adapter type='scsi_host'>
-            <parentaddr unique_id='1'>
-              <address domain='0x0000' bus='0x00' slot='0x1f' addr='0x2'/>
-            </parentaddr>
-          </adapter>
-        </source>
-        ...</pre>
+...
+<source>
+  <adapter type='scsi_host'>
+    <parentaddr unique_id='1'>
+      <address domain='0x0000' bus='0x00' slot='0x1f' addr='0x2'/>
+    </parentaddr>
+  </adapter>
+</source>
+...</pre>
 
     <pre>
-        ...
-        <source>
-          <adapter type='fc_host' parent='scsi_host5' wwnn='20000000c9831b4b' wwpn='10000000c9831b4b'/>
-        </source>
-        ...</pre>
+...
+<source>
+  <adapter type='fc_host' parent='scsi_host5' wwnn='20000000c9831b4b' wwpn='10000000c9831b4b'/>
+</source>
+...</pre>
 
     <dl>
       <dt><code>device</code></dt>
@@ -387,25 +387,25 @@
     </p>
 
     <pre>
-        ...
-        <target>
-          <path>/dev/disk/by-path</path>
-          <permissions>
-            <owner>107</owner>
-            <group>107</group>
-            <mode>0744</mode>
-            <label>virt_image_t</label>
-          </permissions>
-          <timestamps>
-            <atime>1341933637.273190990</atime>
-            <mtime>1341930622.047245868</mtime>
-            <ctime>1341930622.047245868</ctime>
-          </timestamps>
-          <encryption type='...'>
-            ...
-          </encryption>
-        </target>
-      </pool></pre>
+  ...
+  <target>
+    <path>/dev/disk/by-path</path>
+    <permissions>
+      <owner>107</owner>
+      <group>107</group>
+      <mode>0744</mode>
+      <label>virt_image_t</label>
+    </permissions>
+    <timestamps>
+      <atime>1341933637.273190990</atime>
+      <mtime>1341930622.047245868</mtime>
+      <ctime>1341930622.047245868</ctime>
+    </timestamps>
+    <encryption type='...'>
+      ...
+    </encryption>
+  </target>
+</pool></pre>
 
     <dl>
       <dt><code>path</code></dt>
@@ -494,12 +494,12 @@
     <h3><a name="StorageVolFirst">General metadata</a></h3>
 
     <pre>
-      <volume type='file'>
-        <name>sparse.img</name>
-        <key>/var/lib/xen/images/sparse.img</key>
-        <allocation>0</allocation>
-        <capacity unit="T">1</capacity>
-        ...</pre>
+<volume type='file'>
+  <name>sparse.img</name>
+  <key>/var/lib/xen/images/sparse.img</key>
+  <allocation>0</allocation>
+  <capacity unit="T">1</capacity>
+  ...</pre>
 
     <dl>
       <dt><code>name</code></dt>
@@ -575,22 +575,22 @@
     </p>
 
     <pre>
-        ...
-        <target>
-          <path>/var/lib/virt/images/sparse.img</path>
-          <format type='qcow2'/>
-          <permissions>
-            <owner>107</owner>
-            <group>107</group>
-            <mode>0744</mode>
-            <label>virt_image_t</label>
-          </permissions>
-          <compat>1.1</compat>
-          <nocow/>
-          <features>
-            <lazy_refcounts/>
-          </features>
-        </target></pre>
+...
+<target>
+  <path>/var/lib/virt/images/sparse.img</path>
+  <format type='qcow2'/>
+  <permissions>
+    <owner>107</owner>
+    <group>107</group>
+    <mode>0744</mode>
+    <label>virt_image_t</label>
+  </permissions>
+  <compat>1.1</compat>
+  <nocow/>
+  <features>
+    <lazy_refcounts/>
+  </features>
+</target></pre>
 
     <dl>
       <dt><code>path</code></dt>
@@ -665,18 +665,18 @@
     </p>
 
     <pre>
-        ...
-        <backingStore>
-          <path>/var/lib/virt/images/master.img</path>
-          <format type='raw'/>
-          <permissions>
-            <owner>107</owner>
-            <group>107</group>
-            <mode>0744</mode>
-            <label>virt_image_t</label>
-          </permissions>
-        </backingStore>
-      </volume></pre>
+  ...
+  <backingStore>
+    <path>/var/lib/virt/images/master.img</path>
+    <format type='raw'/>
+    <permissions>
+      <owner>107</owner>
+      <group>107</group>
+      <mode>0744</mode>
+      <label>virt_image_t</label>
+    </permissions>
+  </backingStore>
+</volume></pre>
 
     <dl>
       <dt><code>path</code></dt>
@@ -711,62 +711,62 @@
     <h3><a name="exampleFile">File based storage pool</a></h3>
 
     <pre>
-      <pool type="dir">
-        <name>virtimages</name>
-        <target>
-          <path>/var/lib/virt/images</path>
-        </target>
-      </pool></pre>
+<pool type="dir">
+  <name>virtimages</name>
+  <target>
+    <path>/var/lib/virt/images</path>
+  </target>
+</pool></pre>
 
     <h3><a name="exampleISCSI">iSCSI based storage pool</a></h3>
 
     <pre>
-      <pool type="iscsi">
-        <name>virtimages</name>
-        <source>
-          <host name="iscsi.example.com"/>
-          <device path="iqn.2013-06.com.example:iscsi-pool"/>
-          <auth type='chap' username='myuser'>
-            <secret usage='libvirtiscsi'/>
-          </auth>
-        </source>
-        <target>
-          <path>/dev/disk/by-path</path>
-        </target>
-      </pool></pre>
+<pool type="iscsi">
+  <name>virtimages</name>
+  <source>
+    <host name="iscsi.example.com"/>
+    <device path="iqn.2013-06.com.example:iscsi-pool"/>
+    <auth type='chap' username='myuser'>
+      <secret usage='libvirtiscsi'/>
+    </auth>
+  </source>
+  <target>
+    <path>/dev/disk/by-path</path>
+  </target>
+</pool></pre>
 
     <h3><a name="exampleVol">Storage volume</a></h3>
 
     <pre>
-      <volume>
-        <name>sparse.img</name>
-        <allocation>0</allocation>
-        <capacity unit="T">1</capacity>
-        <target>
-          <path>/var/lib/virt/images/sparse.img</path>
-          <permissions>
-            <owner>107</owner>
-            <group>107</group>
-            <mode>0744</mode>
-            <label>virt_image_t</label>
-          </permissions>
-        </target>
-      </volume></pre>
+<volume>
+  <name>sparse.img</name>
+  <allocation>0</allocation>
+  <capacity unit="T">1</capacity>
+  <target>
+    <path>/var/lib/virt/images/sparse.img</path>
+    <permissions>
+      <owner>107</owner>
+      <group>107</group>
+      <mode>0744</mode>
+      <label>virt_image_t</label>
+    </permissions>
+  </target>
+</volume></pre>
 
     <h3><a name="exampleLuks">Storage volume using LUKS</a></h3>
 
     <pre>
-      <volume>
-        <name>MyLuks.img</name>
-        <capacity unit="G">5</capacity>
-        <target>
-          <path>/var/lib/virt/images/MyLuks.img</path>
-          <format type='raw'/>
-          <encryption format='luks'>
-            <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/>
-          </encryption>
-        </target>
-      </volume>
+<volume>
+  <name>MyLuks.img</name>
+  <capacity unit="G">5</capacity>
+  <target>
+    <path>/var/lib/virt/images/MyLuks.img</path>
+    <format type='raw'/>
+    <encryption format='luks'>
+      <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/>
+    </encryption>
+  </target>
+</volume>
     </pre>
   </body>
 </html>
-- 
2.8.4




More information about the libvir-list mailing list