[packages/aumix-gtk.git] / aumix-home_etc.patch

--- aumix-2.1/doc/aumix.1	Mon Jan 31 23:30:12 2000
+++ aumix-2.1.pius/doc/aumix.1	Tue Feb  8 02:09:41 2000
@@ -115,15 +115,19 @@
 go into interactive mode after doing things non-interactively.
 .It Fl L
 load settings from
-.Pa $HOME/.aumixrc ,
-or
+.Pa $CONFIG_DIR/aumixrc ,
+.Pa $HOME/.aumixrc
+(depreciated), or
 .Pa /etc/aumixrc
 if the former is inaccessible
 .It Fl q
 query all devices and print their settings
 .It Fl S
 save settings to
+.Pa $CONFIG_DIR/aumixrc
+or
 .Pa $HOME/.aumixrc
+(depreciated)
 .El
 .Sh EXAMPLE
 The command
@@ -179,7 +183,10 @@
 show a description of the functions of keys
 .It L or l
 load settings from
-.Pa $HOME/.aumixrc ,
+.Pa $CONFIG_DIR/aumixrc ,
+or
+.Pa $HOME/.aumixrc
+(depreciated),
 falling back to
 .Pa /etc/aumixrc
 .It M or m
@@ -247,8 +254,11 @@
 Saved settings for the mixer are kept in the
 .Pa /etc/aumixrc
 and
-.Pa $HOME/.aumixrc
-files, but can be kept anywhere if specified explicitly.
+.Pa $CONFIG_DIR/aumixrc
+files, (
+.Pa $HOME/.aumixrc 
+is now obsolete, though it still works), 
+but can be kept anywhere if specified explicitly.
 Color schemes are normally kept in the directory given
 by
 .Ev DATADIRNAME
--- aumix-2.1/po/aumix.pot	Mon Jan 31 23:30:12 2000
+++ aumix-2.1.pius/po/aumix.pot	Tue Feb  8 02:09:41 2000
@@ -175,7 +175,7 @@
 "other options:\n"
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
-"      ~ /.aumixrc or /etc/aumixrc)\n"
+"      $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
 "  C:  specify color scheme\n"
 "  h:  this helpful message\n"
 msgstr ""
--- aumix-2.1/po/de.po	Sun Nov 28 07:35:18 1999
+++ aumix-2.1.pius/po/de.po	Tue Feb  8 02:09:41 2000
@@ -81,7 +81,7 @@
 "other options:\n"
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
-"      ~ /.aumixrc or /etc/aumixrc)\n"
+"      $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
 "  C:  specify color scheme\n"
 "  h:  this helpful message\n"
 msgstr ""
@@ -99,7 +99,7 @@
 "Weitere Optionen:\n"
Commit	Line	Data
	1	--- aumix-2.1/doc/aumix.1 Mon Jan 31 23:30:12 2000
	2	+++ aumix-2.1.pius/doc/aumix.1 Tue Feb 8 02:09:41 2000
	3	@@ -115,15 +115,19 @@
	4	go into interactive mode after doing things non-interactively.
	5	.It Fl L
	6	load settings from
	7	-.Pa $HOME/.aumixrc ,
	8	-or
	9	+.Pa $CONFIG_DIR/aumixrc ,
	10	+.Pa $HOME/.aumixrc
	11	+(depreciated), or
	12	.Pa /etc/aumixrc
	13	if the former is inaccessible
	14	.It Fl q
	15	query all devices and print their settings
	16	.It Fl S
	17	save settings to
	18	+.Pa $CONFIG_DIR/aumixrc
	19	+or
	20	.Pa $HOME/.aumixrc
	21	+(depreciated)
	22	.El
	23	.Sh EXAMPLE
	24	The command
	25	@@ -179,7 +183,10 @@
	26	show a description of the functions of keys
	27	.It L or l
	28	load settings from
	29	-.Pa $HOME/.aumixrc ,
	30	+.Pa $CONFIG_DIR/aumixrc ,
	31	+or
	32	+.Pa $HOME/.aumixrc
	33	+(depreciated),
	34	falling back to
	35	.Pa /etc/aumixrc
	36	.It M or m
	37	@@ -247,8 +254,11 @@
	38	Saved settings for the mixer are kept in the
	39	.Pa /etc/aumixrc
	40	and
	41	-.Pa $HOME/.aumixrc
	42	-files, but can be kept anywhere if specified explicitly.
	43	+.Pa $CONFIG_DIR/aumixrc
	44	+files, (
	45	+.Pa $HOME/.aumixrc
	46	+is now obsolete, though it still works),
	47	+but can be kept anywhere if specified explicitly.
	48	Color schemes are normally kept in the directory given
	49	by
	50	.Ev DATADIRNAME
	51	--- aumix-2.1/po/aumix.pot Mon Jan 31 23:30:12 2000
	52	+++ aumix-2.1.pius/po/aumix.pot Tue Feb 8 02:09:41 2000
	53	@@ -175,7 +175,7 @@
	54	"other options:\n"
	55	" d: adjust a device besides /dev/mixer\n"
	56	" f: specify file for saving and loading settings (defaults to\n"
	57	-" ~ /.aumixrc or /etc/aumixrc)\n"
	58	+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
	59	" C: specify color scheme\n"
	60	" h: this helpful message\n"
	61	msgstr ""
	62	--- aumix-2.1/po/de.po Sun Nov 28 07:35:18 1999
	63	+++ aumix-2.1.pius/po/de.po Tue Feb 8 02:09:41 2000
	64	@@ -81,7 +81,7 @@
	65	"other options:\n"
	66	" d: adjust a device besides /dev/mixer\n"
	67	" f: specify file for saving and loading settings (defaults to\n"
	68	-" ~ /.aumixrc or /etc/aumixrc)\n"
	69	+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
	70	" C: specify color scheme\n"
	71	" h: this helpful message\n"
	72	msgstr ""
	73	@@ -99,7 +99,7 @@
	74	"Weitere Optionen:\n"
	75