X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-doc.in;fp=ovsdb%2Fovsdb-doc.in;h=26fba3ec11b21a468c11d2e27288502de0771763;hb=c0888adc527ee158e3c586efc09ee777aaddc9ee;hp=7d257c15e2969c2c0888eae826f5ec0321f9b734;hpb=3381a0e8766209ad3cc388a1e56b7778931b3805;p=sliver-openvswitch.git

diff --git a/ovsdb/ovsdb-doc.in b/ovsdb/ovsdb-doc.in
index 7d257c15e..26fba3ec1 100755
--- a/ovsdb/ovsdb-doc.in
+++ b/ovsdb/ovsdb-doc.in
@@ -144,7 +144,8 @@ def blockXmlToNroff(nodes, para='.PP'):
 
 def typeAndConstraintsToNroff(column):
     type = column.type.toEnglish(escapeNroffLiteral)
-    constraints = column.type.constraintsToEnglish(escapeNroffLiteral)
+    constraints = column.type.constraintsToEnglish(escapeNroffLiteral,
+                                                   textToNroff)
     if constraints:
         type += ", " + constraints
     if column.unique:
@@ -185,7 +186,8 @@ def columnGroupToNroff(table, groupXml):
                     type_ = column.type.value
 
                 nameNroff = "%s : %s" % (name, key)
-                typeNroff = "optional %s" % column.type.value.toEnglish()
+                typeNroff = "optional %s" % column.type.value.toEnglish(
+                    escapeNroffLiteral)
                 if (column.type.value.type == ovs.db.types.StringType and
                     type_.type == ovs.db.types.BooleanType):
                     # This is a little more explicit and helpful than
@@ -193,7 +195,7 @@ def columnGroupToNroff(table, groupXml):
                     typeNroff += r", either \fBtrue\fR or \fBfalse\fR"
                 else:
                     if type_.type != column.type.value.type:
-                        type_english = type_.toEnglish()
+                        type_english = type_.toEnglish(escapeNroffLiteral)
                         if type_english[0] in 'aeiou':
                             typeNroff += ", containing an %s" % type_english
                         else: