]>
Commit | Line | Data |
---|---|---|
1377ecb4 | 1 | diff -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 | |
30f1aa31 | 4 | @@ -115,15 +115,19 @@ |
83878164 | 5 | go into interactive mode after doing things non-interactively. |
6 | .It Fl L | |
2683f0a4 | 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 | |
30f1aa31 | 15 | .It Fl q |
83878164 | 16 | query all devices and print their settings |
17 | .It Fl S | |
2683f0a4 | 18 | save settings to |
2683f0a4 | 19 | +.Pa $CONFIG_DIR/aumixrc |
20 | +or | |
30f1aa31 | 21 | .Pa $HOME/.aumixrc |
2683f0a4 | 22 | +(depreciated) |
83878164 | 23 | .El |
1377ecb4 | 24 | .Sh EXAMPLES |
2683f0a4 | 25 | The command |
1377ecb4 | 26 | @@ -189,7 +193,10 @@ |
83878164 | 27 | show a description of the functions of keys |
2683f0a4 | 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 | |
1377ecb4 | 38 | @@ -257,8 +264,11 @@ |
2683f0a4 | 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 | |
1377ecb4 | 52 | diff -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 @@ | |
30f1aa31 | 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" | |
730a58c8 | 59 | -" ~/.aumixrc or /etc/aumixrc)\n" |
60 | +" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n" | |
30f1aa31 | 61 | " C: specify color scheme\n" |
62 | " h: this helpful message\n" | |
63 | msgstr "" | |
1377ecb4 | 64 | diff -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 @@ | |
30f1aa31 | 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" | |
730a58c8 | 71 | -" ~/.aumixrc or /etc/aumixrc)\n" |
1377ecb4 | 72 | +" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc) or /etc/aumixrc)\n" |
30f1aa31 | 73 | " C: specify color scheme\n" |
74 | " h: this helpful message\n" | |
75 | msgstr "" | |
1377ecb4 | 76 | @@ -206,7 +206,7 @@ |
30f1aa31 | 77 | "Weitere Optionen:\n" |
78 |