From 40f35212c71e8926b0dfe7463af959f00c56cd82 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 29 Sep 2018 01:41:58 +0200 Subject: Revert "osmo-config-merge: Add manual page" This reverts commit 6dd00d876e2b947e070f776f90fbb8305a237d21. Unfortunately, it seems older a2x versions don't support "-D" for manpage generation: All the osmocom master builds started to fail with: make[2]: Entering directory '/build/deps/libosmocore/man' a2x --doctype manpage --format manpage -D . osmo-config-merge.adoc a2x: WARNING: --destination-dir option is only applicable to HTML based outputs a2x: ERROR: "xmllint" --nonet --noout --valid "/build/deps/libosmocore/man/osmo-config-merge.xml" returned non-zero exit status 127 Makefile:545: recipe for target 'osmo-config-merge.8' failed Change-Id: I0f45362d3e978c328d962a5c0d883eade27b875c --- man/osmo-config-merge.adoc | 64 ---------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 man/osmo-config-merge.adoc (limited to 'man/osmo-config-merge.adoc') diff --git a/man/osmo-config-merge.adoc b/man/osmo-config-merge.adoc deleted file mode 100644 index 205fb502..00000000 --- a/man/osmo-config-merge.adoc +++ /dev/null @@ -1,64 +0,0 @@ -osmo-config-merge(8) -===================== - -NAME ----- -osmo-config-merge - Merge osmocom config snippets into an existing config - -SYNOPSIS --------- -[verse] -*osmo-config-merge* [--debug] - -DESCRIPTION ------------ -This utility allows you to merge an incremental config "patch" -into an osmocom-style config file. - -The patch file follows the same syntax as the original config file. - -It works by appending the leaf nodes of the patch file to the respective -nodes of the input config file. - -This process allows configuration file changes/updates to be performed -in a more stable/reliable way than by means of (unified) diff files, -as they break every time the context lines break. - -osmo-config-merge doesn't suffer from this problem, as it understands -the tree-like nature of VTY config files. - -The resulting config is printed to stdout. - -NOTE: This only works with configuration files that have proper -indenting, i.e. every level in the hierarchy must be indented excatly -one character, not multiple. - -OPTIONS -------- -*--debug*:: - Show debugging output when parsing the config tree. Needs to be the last argument. - -EXAMPLE USAGE -------------- -[verse] -$ osmo-config-merge osmo-msc.cfg.base osmo-msc_change_network.cfg > osmo-msc.cfg - -EXIT STATUS ------------ -Exit status is 0 if the command was successful, and 1 in case of a -wrong/missing argument. If the tool detects an error in the patch file the -exit status is 2. - -SEE ALSO --------- -The official Osmocom documentation including the VTY config refernce can be -found at: http://ftp.osmocom.org/docs/latest/ - -The Osmocom wiki is located at: http://projects.osmocom.org/ - - -AUTHORS -------- -osmo-config-merge was written by Harald Welte. - -The man page was written by Daniel Willmann. -- cgit v1.2.3