From fc9a965c3ae80688cc2889aefa183cf1aa6d55c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Bj=C3=B6rklund?= <mbj4668@gmail.com>
Date: Thu, 23 May 2024 13:56:47 +0200
Subject: [PATCH] Updates for 2.6.1 release

---
 CHANGELOG.md         | 11 +++++++++++
 CONTRIBUTORS         |  1 +
 man/man1/json2xml.1  | 18 ++++++++++++++++--
 man/man1/pyang.1     | 23 +++++++++++++++++++----
 man/man1/yang2dsdl.1 | 20 +++++++++++++++++---
 pyang/__init__.py    |  4 ++--
 6 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88dfa155..219d7289 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+* 2.6.1 - 2024-05-23
+```
+       fix IEEE module name prefix expectation
+         thanks to Siddharth Sharma
+
+       #884 - tree module header not printed
+       #886 - crash on deviation of config
+       #887 - replace call to sys.exit with return
+       #907 - --check-update now checks for changes in ordered-by
+```
+
 * 2.6.0 - 2023-11-03
 ```
        lots of improvements to the UML plugin
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1871c0dc..0d2b9e2f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -36,6 +36,7 @@ Erik Rask
 Michael Richardson
 Ralph Schmieder
 Juergen Schoenwaelder
+Siddharth Sharma
 Romanos Skiadas
 Stefan Vallin
 Norbert Varkonyi
diff --git a/man/man1/json2xml.1 b/man/man1/json2xml.1
index 463c7c1f..7ef49539 100644
--- a/man/man1/json2xml.1
+++ b/man/man1/json2xml.1
@@ -1,6 +1,20 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 3.1.3
 .\"
-.TH "JSON2XML" "1" "2023-11-03" "json2xml-2.6.0" "User Manual"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "JSON2XML" "1" "2024-05-23" "json2xml-2.6.1" "User Manual"
 .hy
 .SH NAME
 .PP
diff --git a/man/man1/pyang.1 b/man/man1/pyang.1
index 606b96f3..cb2313f6 100644
--- a/man/man1/pyang.1
+++ b/man/man1/pyang.1
@@ -1,6 +1,20 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 3.1.3
 .\"
-.TH "PYANG" "1" "2023-11-03" "pyang-2.6.0" "User Manual"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "PYANG" "1" "2024-05-23" "pyang-2.6.1" "User Manual"
 .hy
 .SH NAME
 .PP
@@ -348,7 +362,7 @@ current directory
 .IP "3." 3
 \f[B]$HOME\f[R]/yang/modules
 .IP "4." 3
-\f[B]\f[BI]Y\f[B]\f[BI]A\f[B]\f[BI]N\f[B]\f[BI]G\f[B]_\f[BI]I\f[B]\f[BI]N\f[B]\f[BI]S\f[B]\f[BI]T\f[B]\f[BI]A\f[B]\f[BI]L\f[B]\f[BI]L\f[B]\[u2005]*\[u2005]\[u2005]*\[u2005]/\f[BI]y\f[B]\f[BI]a\f[B]\f[BI]n\f[B]\f[BI]g\f[B]/\f[BI]m\f[B]\f[BI]o\f[B]\f[BI]d\f[B]\f[BI]u\f[B]\f[BI]l\f[B]\f[BI]e\f[B]\f[BI]s\f[B]\f[BI]O\f[B]\f[BI]R\f[B]\f[BI]i\f[B]\f[BI]f\f[B]\[u2005]*\[u2005]*YANG_INSTALL\f[R]
+\f[B]\f[BI]Y\f[B]\f[BI]A\f[B]\f[BI]N\f[B]\f[BI]G\f[B]_\f[BI]I\f[B]\f[BI]N\f[B]\f[BI]S\f[B]\f[BI]T\f[B]\f[BI]A\f[B]\f[BI]L\f[B]\f[BI]L\f[B] *  * /\f[BI]y\f[B]\f[BI]a\f[B]\f[BI]n\f[B]\f[BI]g\f[B]/\f[BI]m\f[B]\f[BI]o\f[B]\f[BI]d\f[B]\f[BI]u\f[B]\f[BI]l\f[B]\f[BI]e\f[B]\f[BI]s\f[B]\f[BI]O\f[B]\f[BI]R\f[B]\f[BI]i\f[B]\f[BI]f\f[B] * *YANG_INSTALL\f[R]
 is unset <the default installation directory>/yang/modules (on Unix
 systems: /usr/share/yang/modules)
 .RE
@@ -1074,7 +1088,8 @@ Output the qualified XPath i.e.,
 .TP
 \f[B]--flatten-qualified-module-and-prefix-path\f[R]
 Output an XPath with both module and prefix i.e.,
-/module1:prefix1:root/\&... This is NOT a colloquial syntax of XPath.
+/module1:prefix1:root/\&...
+This is NOT a colloquial syntax of XPath.
 Emitted separately.
 .TP
 \f[B]--flatten-deviated\f[R]
diff --git a/man/man1/yang2dsdl.1 b/man/man1/yang2dsdl.1
index ee2c65a7..d0d77fbd 100644
--- a/man/man1/yang2dsdl.1
+++ b/man/man1/yang2dsdl.1
@@ -1,6 +1,20 @@
-.\" Automatically generated by Pandoc 2.9.2.1
+.\" Automatically generated by Pandoc 3.1.3
 .\"
-.TH "YANG2DSDL" "1" "2023-11-03" "yang2dsdl-2.6.0" "User Manual"
+.\" Define V font for inline verbatim, using C font in formats
+.\" that render this, and otherwise B font.
+.ie "\f[CB]x\f[]"x" \{\
+. ftr V B
+. ftr VI BI
+. ftr VB B
+. ftr VBI BI
+.\}
+.el \{\
+. ftr V CR
+. ftr VI CI
+. ftr VB CB
+. ftr VBI CBI
+.\}
+.TH "YANG2DSDL" "1" "2024-05-23" "yang2dsdl-2.6.1" "User Manual"
 .hy
 .SH NAME
 .PP
@@ -141,7 +155,7 @@ RELAX NG validators and/or XSLT1 processors supporting EXSLT.
 \f[B]-b\f[R] \f[I]basename\f[R]
 Specifies the basename of files in which the output schemas are stored.
 The default is the concatenation of the names of all input YANG modules
-connected with the underscore character \[dq]_\[dq].
+connected with the underscore character \[lq]_\[lq].
 This option is mandatory if \f[B]-s\f[R] is used.
 .TP
 \f[B]-d\f[R] \f[I]dir\f[R]
diff --git a/pyang/__init__.py b/pyang/__init__.py
index 74254465..0a9ebe0c 100644
--- a/pyang/__init__.py
+++ b/pyang/__init__.py
@@ -1,4 +1,4 @@
 """The pyang library for parsing, validating, and converting YANG modules"""
 
-__version__ = '2.6.0'
-__date__ = '2023-11-03'
+__version__ = '2.6.1'
+__date__ = '2024-05-23'