[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=10509f66ae9086e97fe9a305599140280cd27d44
Submitter: Martin Kaiser (wireshark@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

10509f6 by Martin Kaiser (wireshark@xxxxxxxxx):

    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@xxxxxxxxx>
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit c7e45607fc70eae886f5cee4b5808112193fe339)
    Reviewed-on: https://code.wireshark.org/review/17045
    (cherry picked from commit 434451f29082411f08204b47e782e8ed43e839bb)
    Reviewed-on: https://code.wireshark.org/review/17046
    

Actions performed:

    from  34d4ba9   Added XML proper decoding for XML CDATASection
    adds  10509f6   asciidoc.conf, sort-and-group: remove "and" if we have only one element


Summary of changes:
 docbook/asciidoc.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)