611cdc86b3606fa261184f88d5e72e82 aumix-xaumix.patch
[packages/aumix-gtk.git] / aumix-home_etc.patch
CommitLineData
17f61b4c 1diff -Nru aumix-2.6/doc/aumix.1 aumix-2.6.new/doc/aumix.1
2--- aumix-2.6/doc/aumix.1 Fri Apr 14 06:47:08 2000
3+++ aumix-2.6.new/doc/aumix.1 Fri Apr 14 06:46:17 2000
04b3e07f 4@@ -115,15 +115,19 @@
7476d76d 5 go into interactive mode after doing things non-interactively.
6 .It Fl L
ac9fa1ac 7 load settings from
8-.Pa $HOME/.aumixrc ,
9-or
10+.Pa $CONFIG_DIR/aumixrc ,
11+.Pa $HOME/.aumixrc
12+(depreciated), or
13 .Pa /etc/aumixrc
14 if the former is inaccessible
04b3e07f 15 .It Fl q
7476d76d 16 query all devices and print their settings
17 .It Fl S
ac9fa1ac 18 save settings to
ac9fa1ac 19+.Pa $CONFIG_DIR/aumixrc
20+or
04b3e07f 21 .Pa $HOME/.aumixrc
ac9fa1ac 22+(depreciated)
7476d76d 23 .El
17f61b4c 24 .Sh EXAMPLES
ac9fa1ac 25 The command
17f61b4c 26@@ -189,7 +193,10 @@
7476d76d 27 show a description of the functions of keys
ac9fa1ac 28 .It L or l
29 load settings from
30-.Pa $HOME/.aumixrc ,
31+.Pa $CONFIG_DIR/aumixrc ,
32+or
33+.Pa $HOME/.aumixrc
34+(depreciated),
35 falling back to
36 .Pa /etc/aumixrc
37 .It M or m
17f61b4c 38@@ -257,8 +264,11 @@
ac9fa1ac 39 Saved settings for the mixer are kept in the
40 .Pa /etc/aumixrc
41 and
42-.Pa $HOME/.aumixrc
43-files, but can be kept anywhere if specified explicitly.
44+.Pa $CONFIG_DIR/aumixrc
45+files, (
46+.Pa $HOME/.aumixrc
47+is now obsolete, though it still works),
48+but can be kept anywhere if specified explicitly.
49 Color schemes are normally kept in the directory given
50 by
51 .Ev DATADIRNAME
17f61b4c 52diff -Nru aumix-2.6/po/aumix.pot aumix-2.6.new/po/aumix.pot
53--- aumix-2.6/po/aumix.pot Fri Apr 14 06:47:08 2000
54+++ aumix-2.6.new/po/aumix.pot Fri Apr 14 06:46:17 2000
55@@ -180,7 +180,7 @@
04b3e07f 56 "other options:\n"
57 " d: adjust a device besides /dev/mixer\n"
58 " f: specify file for saving and loading settings (defaults to\n"
ebc3eb8e 59-" ~/.aumixrc or /etc/aumixrc)\n"
60+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
04b3e07f 61 " C: specify color scheme\n"
62 " h: this helpful message\n"
63 msgstr ""
17f61b4c 64diff -Nru aumix-2.6/po/de.po aumix-2.6.new/po/de.po
65--- aumix-2.6/po/de.po Fri Apr 14 06:47:08 2000
66+++ aumix-2.6.new/po/de.po Fri Apr 14 06:48:27 2000
67@@ -188,7 +188,7 @@
04b3e07f 68 "other options:\n"
69 " d: adjust a device besides /dev/mixer\n"
70 " f: specify file for saving and loading settings (defaults to\n"
ebc3eb8e 71-" ~/.aumixrc or /etc/aumixrc)\n"
17f61b4c 72+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc) or /etc/aumixrc)\n"
04b3e07f 73 " C: specify color scheme\n"
74 " h: this helpful message\n"
75 msgstr ""
17f61b4c 76@@ -206,7 +206,7 @@
04b3e07f 77 "Weitere Optionen:\n"
78