New upstream version 1.44.0 upstream/1.44.0

1 files changed, 7 insertions, 10 deletions

diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
index 88b87a72..b8f29d3b 100755
--- a/tools/generate-docs-nm-settings-docs-gir.py
+++ b/tools/generate-docs-nm-settings-docs-gir.py
@@ -203,7 +203,6 @@ def settings_sort_key(x):
 
 def create_desc_docbook(desc_docbook, description):
     lines = re.split("\n", description)
-    in_par = True
 
     paragraph = ET.SubElement(
         desc_docbook,
@@ -211,10 +210,11 @@ def create_desc_docbook(desc_docbook, description):
     )
 
     for l in lines:
-        if l and in_par:
-            paragraph.text = l
-        else:
+        if not l:
+            # A blank line. This starts a new paragraph
             paragraph = ET.SubElement(desc_docbook, "para")
+            continue
+        paragraph.text = l
 
 
 def main(gir_path_str, output_path_str):
@@ -328,12 +328,9 @@ def main(gir_path_str, output_path_str):
                     },
                 ).text = deprecated_desc
 
-                deprecated_docbook = ET.SubElement(
-                    property_element,
-                    "deprecated-docbook",
-                )
-
-                create_desc_docbook(deprecated_docbook, deprecated_desc)
+                # The text should only be one line. Otherwise, our simple "<deprecated>" element
+                # cannot be rendered nicely.
+                assert re.split("\n", deprecated_desc) == [deprecated_desc]
 
     docs_gir.write(
         output_path_str,