Merge pull request OSInside#392 from SUSE/doc_string_oem_systemsize

Update schema docstring for oem-systemsize
eduardoj · Jun 21, 2017 · 442caae · 442caae
2 parents fb15cb5 + d9160d4
commit 442caae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/doc/source/development/schema.rst b/doc/source/development/schema.rst
@@ -895,7 +895,7 @@ Parents:
 oem-systemsize
 ::::::::::::::
 
-For oemboot driven images: Set the size of the system (root) partition in MB
+For oemboot driven images: Set the size of the system (root) partition or LVM partition in MB. If not provided the partition will grow to the maximum available free space on the disk
 
 Parents:
    These elements contain ``oem-systemsize``: :ref:`k.image.preferences.type.oemconfig`

diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc
@@ -1002,14 +1002,9 @@ div {
 div {
     k.oem-systemsize.attlist = empty
     k.oem-systemsize =
-        ## For oemboot driven images: Set the size of the system
-        ## (root) partition in MB
-        [
-        db:para [
-            "For oemboot driven images: Set the size of the system\x{a}"~
-            "(root) partition in MB."
-        ]
-        ]
+        ## For oemboot driven images: Set the size of the system (root)
+        ## partition or LVM partition in MB. If not provided the partition
+        ## will grow to the maximum available free space on the disk
         element oem-systemsize {
             k.oem-systemsize.attlist,
             xsd:nonNegativeInteger

diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng
@@ -1242,10 +1242,9 @@ partition in MB. No swapspace with oem-swap set to false.</db:para>
     </define>
     <define name="k.oem-systemsize">
       <element name="oem-systemsize">
-        <a:documentation>For oemboot driven images: Set the size of the system
-(root) partition in MB</a:documentation>
-        <db:para>For oemboot driven images: Set the size of the system
-(root) partition in MB.</db:para>
+        <a:documentation>For oemboot driven images: Set the size of the system (root)
+partition or LVM partition in MB. If not provided the partition
+will grow to the maximum available free space on the disk</a:documentation>
         <ref name="k.oem-systemsize.attlist"/>
         <data type="nonNegativeInteger"/>
       </element>