- updated for 2.6.

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

diff -Nru aumix-2.6/doc/aumix.1 aumix-2.6.new/doc/aumix.1
--- aumix-2.6/doc/aumix.1	Fri Apr 14 06:47:08 2000
+++ aumix-2.6.new/doc/aumix.1	Fri Apr 14 06:46:17 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 EXAMPLES
 The command
@@ -189,7 +193,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
@@ -257,8 +264,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
diff -Nru aumix-2.6/po/aumix.pot aumix-2.6.new/po/aumix.pot
--- aumix-2.6/po/aumix.pot	Fri Apr 14 06:47:08 2000
+++ aumix-2.6.new/po/aumix.pot	Fri Apr 14 06:46:17 2000
@@ -180,7 +180,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 ""
diff -Nru aumix-2.6/po/de.po aumix-2.6.new/po/de.po
--- aumix-2.6/po/de.po	Fri Apr 14 06:47:08 2000
+++ aumix-2.6.new/po/de.po	Fri Apr 14 06:48:27 2000
@@ -188,7 +188,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) or /etc/aumixrc)\n"
 "  C:  specify color scheme\n"
 "  h:  this helpful message\n"
 msgstr ""
@@ -206,7 +206,7 @@
 "Weitere Optionen:\n"