Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (04a3faf6e630bf36a60518d5b56a08f717950a59)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (04a3faf6e630bf36a60518d5b56a08f717950a59)
  • Date: Wed, 14 Nov 2007 13:31:29 -0600

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 1 +
usr/share/man/man8/alter.8 | 2 +-
usr/share/man/man8/cast.8 | 2 +-
usr/share/man/man8/cleanse.8 | 2 +-
usr/share/man/man8/confmeld.8 | 41
+++++++++++++++++++++++++++++++++++++++++
usr/share/man/man8/dispel.8 | 2 +-
usr/share/man/man8/sorcery.8 | 2 +-
7 files changed, 47 insertions(+), 5 deletions(-)

New commits:
commit 04a3faf6e630bf36a60518d5b56a08f717950a59
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

confmeld.8: added basic manual page, part of #13618

diff --git a/ChangeLog b/ChangeLog
index 443d571..a24ed8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
* api2: improved the message when castfs fails the sanity check
* libstate, libtrack, url_http, url_git, url_git_http: fixed comments
* confmeld: added parameter parsing and enabled the display of help
+ * confmeld.8, *.8: added basic manual page (part of #13618) and
references

2007-10-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: fixed some more quoting regressions since stable. Should
diff --git a/usr/share/man/man8/alter.8 b/usr/share/man/man8/alter.8
index 428934c..6370a92 100644
--- a/usr/share/man/man8/alter.8
+++ b/usr/share/man/man8/alter.8
@@ -114,7 +114,7 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
.SH "REPORTING BUGS"
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
-cast(8), cleanse(8), dispel(8), gaze(1), grimoire(5),
+cast(8), confmeld(8), cleanse(8), dispel(8), gaze(1), grimoire(5),
scribbler(8), scribe(8), sorcery(8), sorcery_config(8), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/cast.8 b/usr/share/man/man8/cast.8
index aa5b074..8489fa0 100644
--- a/usr/share/man/man8/cast.8
+++ b/usr/share/man/man8/cast.8
@@ -110,7 +110,7 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
.SH "REPORTING BUGS"
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
-alter(8), cleanse(8), dispel(8), gaze(1), grimoire(5), scribbler(8),
+alter(8), cleanse(8), confmeld(8), dispel(8), gaze(1), grimoire(5),
scribbler(8),
scribe(8), sorcery(8), sorcery_config(5), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/cleanse.8 b/usr/share/man/man8/cleanse.8
index 0e47abe..8f7bc73 100644
--- a/usr/share/man/man8/cleanse.8
+++ b/usr/share/man/man8/cleanse.8
@@ -117,6 +117,6 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
.SH "REPORTING BUGS"
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
-dispel(8), gaze(1), grimoire(5), invoke(8), sorcery(8), scribe(8),
summon(8), scribbler (8)
+confmeld(8), dispel(8), gaze(1), grimoire(5), invoke(8), sorcery(8),
scribe(8), summon(8), scribbler (8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/confmeld.8 b/usr/share/man/man8/confmeld.8
new file mode 100644
index 0000000..630f0ca
--- /dev/null
+++ b/usr/share/man/man8/confmeld.8
@@ -0,0 +1,41 @@
+.TH SUMMON 8 "November 2007" "Source Mage GNU Linux" "System Administration"
+.SH NAME
+confmeld \- merges staged configuration files into the system
+.SH SYNOPSIS
+.B confmeld
+[options]
+.SH "EXAMPLE"
+To merge everything type:
+.IP
+.B confmeld
+.SH "DESCRIPTION"
+.B confmeld
+is part of the
+.B sorcery
+source-code package management suite. It is a command-line tool
+for the semiautomatical merging of staged configuration files. Spells will
not
+install newer versions during cast, but stage them in
+.I /var/state/sorcery/staged_configs\fR.\fP
+
+At the end, confmeld will resolve the simple upgrade cases and ask
+for the rest. The user will have the choice to either leave the old file
intact
+or install the new one over. Two similar choices will additionally backup the
+respective file.
+
+To facilitate the decision, confmeld can also show the difference between
the
+two files (an unified diff).
+
+.SH "OPTIONS"
+.SS "-h, --help"
+outputs short help
+.SH "AUTHOR"
+Original version by Jaka Kranjc.
+.PP
+Maintained by the Source Mage GNU Linux Team (http://www.sourcemage.org)
+.SH "REPORTING BUGS"
+Report bugs to bugzilla <http://bugs.sourcemage.org>
+.SH "SEE ALSO"
+alter(8), cast(8), cleanse(8), dispel(8), gaze(1), grimoire(5),
+scribbler(8), scribe(8), sorcery_config(8), sorcery(8)
+.SH "WARRANTY"
+This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/dispel.8 b/usr/share/man/man8/dispel.8
index 19667d2..1cdd4fa 100644
--- a/usr/share/man/man8/dispel.8
+++ b/usr/share/man/man8/dispel.8
@@ -150,7 +150,7 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
.SH "REPORTING BUGS"
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
-alter(8), cast(8), cleanse(8), gaze(1), grimoire(5), scribbler(8), scribe(8),
+alter(8), cast(8), confmeld(8), cleanse(8), gaze(1), grimoire(5),
scribbler(8), scribe(8),
sorcery(8), sorcery_config(5), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY
diff --git a/usr/share/man/man8/sorcery.8 b/usr/share/man/man8/sorcery.8
index 5b21a65..03cd4cb 100644
--- a/usr/share/man/man8/sorcery.8
+++ b/usr/share/man/man8/sorcery.8
@@ -137,7 +137,7 @@ Maintained by the Source Mage GNU Linux Team
(http://www.sourcemage.org)
.SH "REPORTING BUGS"
Report bugs to bugzilla <http://bugs.sourcemage.org>
.SH "SEE ALSO"
-alter(8), cast(8), cleanse(8), dispel(8), gaze(1), grimoire(5), scribbler(8),
+alter(8), cast(8), cleanse(8), confmeld(8), dispel(8), gaze(1), grimoire(5),
scribbler(8),
scribe(8), sorcery_config(8), summon(8)
.SH "WARRANTY"
This is free software with ABSOLUTELY NO WARRANTY



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (04a3faf6e630bf36a60518d5b56a08f717950a59), Jaka Kranjc, 11/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page