From 61b78b0aa6efc16dba8b40bf5347a61fda0f6d39 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Sun, 3 Apr 2022 18:30:26 +0200 Subject: [PATCH] Consolidate man pages Move xml2-config.1 into doc directory. Remove outdated libxml.3. --- CMakeLists.txt | 2 +- Makefile.am | 4 +- doc/Makefile.am | 2 +- xml2-config.1 => doc/xml2-config.1 | 0 libxml.3 | 71 ------------------------------ libxml.spec.in | 1 - 6 files changed, 3 insertions(+), 77 deletions(-) rename xml2-config.1 => doc/xml2-config.1 (100%) delete mode 100644 libxml.3 diff --git a/CMakeLists.txt b/CMakeLists.txt index fb384545..a9104ffe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -603,7 +603,7 @@ if(LIBXML2_WITH_PYTHON) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2.py DESTINATION ${LIBXML2_PYTHON_INSTALL_DIR} COMPONENT runtime) endif() -install(FILES libxml.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) +install(FILES doc/xml2-config.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) install(FILES doc/xmlcatalog.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) install(FILES doc/xmllint.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONENT documentation PATTERN Makefile.* EXCLUDE) diff --git a/Makefile.am b/Makefile.am index 71543e41..922938b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,8 +58,6 @@ DEPS = $(top_builddir)/libxml2.la LDADDS = $(top_builddir)/libxml2.la -man_MANS = xml2-config.1 libxml.3 - m4datadir = $(datadir)/aclocal m4data_DATA = libxml.m4 @@ -1250,7 +1248,7 @@ EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ check-relaxng-test-suite.py check-relaxng-test-suite2.py \ check-xsddata-test-suite.py check-xinclude-test-suite.py \ example/Makefile.am example/gjobread.c example/gjobs.xml \ - $(man_MANS) libxml-2.0.pc.in libxml-2.0-uninstalled.pc.in \ + libxml-2.0.pc.in libxml-2.0-uninstalled.pc.in \ libxml2-config.cmake.in autogen.sh \ trionan.c trionan.h triostr.c triostr.h trio.c trio.h \ triop.h triodef.h libxml.h xzlib.h buf.h \ diff --git a/doc/Makefile.am b/doc/Makefile.am index a1814973..5daef3e6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -54,7 +54,7 @@ nobase_dist_doc_DATA = \ xmlcatalog.html \ xmllint.html -dist_man_MANS = xmllint.1 xmlcatalog.1 +dist_man_MANS = xml2-config.1 xmllint.1 xmlcatalog.1 EXTRA_DIST = \ apibuild.py \ diff --git a/xml2-config.1 b/doc/xml2-config.1 similarity index 100% rename from xml2-config.1 rename to doc/xml2-config.1 diff --git a/libxml.3 b/libxml.3 deleted file mode 100644 index b3e9fef0..00000000 --- a/libxml.3 +++ /dev/null @@ -1,71 +0,0 @@ -.TH libxml 3 "12 April 2000" -.SH NAME -libxml \- library used to parse XML files -.SH DESCRIPTION -The -.I libxml -library is used to parse XML files. -Its internal document representation is as close as possible to the -.I DOM -(Document Object Model) interface, -an API for accessing XML or HTML structured documents. -.LP -The -.I libxml -library also has a -.IR SAX -like -interface, -which is designed to be compatible with -.IR expat (1). -NOTE: -.IR SAX , -the Simple API for XML, -is a standard interface for event-based XML parsing, -developed collaboratively by the members of the XML-DEV mailing list, -currently hosted by OASIS. -The -.I expat -library is a XML 1.0 parser written in C, -which aims to be fully conforming. -It is currently not a validating XML processor. -.LP -The -.I libxml -library now includes a nearly complete -.I XPath -implementation. -The -.I XPath -(XML Path Language) is a language for addressing parts of an -XML document, -designed to be used by both -.I XSLT -and -.IR XPointer . -.LP -The -.I libxml -library exports Push and Pull type parser interfaces for both XML and -.IR html . -.SH FILES -.TP 2.2i -.B /depot/lib/libxml_2.0.0/libxml.a -static library -.TP -.B /depot/lib/libxml_2.0.0/libxml.so -shared library -.TP -.B /depot/package/libxml_2.0.0/bin/xmllint -binary application for parsing XML files -.SH AUTHORS -Daniel Veillard (daniel@veillard.com). -Red Hat Inc. -Manual page by Ziying Sherwin (sherwin@nlm.nih.gov), -Lister Hill National Center for Biomedical Communications, -U.S. National Library of Medicine. -.SH SEE ALSO -.IR xmllint (1), -.IR libxslt (3), -.IR libexslt (3), -.IR xsltproc (1) -.\" end of manual page diff --git a/libxml.spec.in b/libxml.spec.in index 73c6fd9e..ea593d0e 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -144,7 +144,6 @@ rm -fr %{buildroot} %doc NEWS README.md Copyright TODO %doc %{_mandir}/man1/xmllint.1* %doc %{_mandir}/man1/xmlcatalog.1* -%doc %{_mandir}/man3/libxml.3* %{_libdir}/lib*.so.* %{_bindir}/xmllint