summaryrefslogtreecommitdiff
path: root/docbook/asciidoc.conf
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2016-08-10 22:54:58 +0200
committerMichael Mann <mmann78@netscape.net>2016-08-13 21:49:48 +0000
commitc7e45607fc70eae886f5cee4b5808112193fe339 (patch)
tree78a32c586e3df4e73d76ae580508a15123fb2f7c /docbook/asciidoc.conf
parent854793d48ed1d1645e44c42a9c1cdfea38f90bf5 (diff)
downloadwireshark-c7e45607fc70eae886f5cee4b5808112193fe339.tar.gz
asciidoc.conf, sort-and-group: remove "and" if we have only one element
--sort-and-group-- One --sort-and-group-- used to be converted into and One Remove the leading and in this case. Change-Id: I3332b316c4fcce164c94e36c3c7b4480947bdf68 Reviewed-on: https://code.wireshark.org/review/17003 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'docbook/asciidoc.conf')
-rw-r--r--docbook/asciidoc.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index 667873935a..1b7ca000eb 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -122,4 +122,4 @@ endif::backend-html4,backend-html5,backend-xhtml11[]
delimiter=^--sort-and-group--$
style=default
filter=sort --ignore-case
-default-style=template="paragraph",filter='sort --ignore-case | sed -e "s/,//g" | sed -e "/^$/d" -e "$ s/^/and /" -e "$ ! s/$/,/"'
+default-style=template="paragraph",filter='sort --ignore-case | sed -e "s/,//g" | sed -e "/^$/d" -e "$ s/^/and /" -e "$ ! s/$/,/" -e "1 s/^and //"'