diff options
author | Peter Wu <peter@lekensteyn.nl> | 2017-03-03 12:31:14 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-03-03 19:29:44 +0000 |
commit | c79b5e0eb74a5ef5e91697618a87b4c591ccf3cc (patch) | |
tree | d8d6af19f574216e9a91752f001a16e9a7cbce18 /doc | |
parent | bc94ffcb0c754591e3dbac368f90e7f91d4a64bb (diff) |
Update documentation with reference to $XDG_CONFIG_HOME
Since v2.1.0rc0-184-gb0b53fa593, $XDG_CONFIG_HOME/wireshark (instead of
$HOME/.wireshark) is used, clarify this in the WSUG and manuals.
Change-Id: I74a6f9b86bd8d54ee326ca83d7536e091d6da08a
Reviewed-on: https://code.wireshark.org/review/20364
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/rawshark.pod | 4 | ||||
-rw-r--r-- | doc/tshark.pod | 4 | ||||
-rw-r--r-- | doc/wireshark.pod.template | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/rawshark.pod b/doc/rawshark.pod index 9119839591..66a66f8feb 100644 --- a/doc/rawshark.pod +++ b/doc/rawshark.pod @@ -312,7 +312,9 @@ systems, and in the main installation directory (for example, F<C:\Program Files\Wireshark\preferences>) on Windows systems. The personal preferences file is looked for in -F<$HOME/.wireshark/preferences> on +F<$XDG_CONFIG_HOME/wireshark/preferences> +(or, if F<$XDG_CONFIG_HOME/wireshark> does not exist while F<$HOME/.wireshark> +is present, F<$HOME/.wireshark/preferences>) on UNIX-compatible systems and F<%APPDATA%\Wireshark\preferences> (or, if %APPDATA% isn't defined, F<%USERPROFILE%\Application Data\Wireshark\preferences>) on Windows systems. diff --git a/doc/tshark.pod b/doc/tshark.pod index 8f1b77d158..5cb8ae94ae 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -1664,7 +1664,9 @@ systems, and in the main installation directory (for example, F<C:\Program Files\Wireshark\preferences>) on Windows systems. The personal preferences file is looked for in -F<$HOME/.wireshark/preferences> on +F<$XDG_CONFIG_HOME/wireshark/preferences> +(or, if F<$XDG_CONFIG_HOME/wireshark> does not exist while F<$HOME/.wireshark> +is present, F<$HOME/.wireshark/preferences>) on UNIX-compatible systems and F<%APPDATA%\Wireshark\preferences> (or, if %APPDATA% isn't defined, F<%USERPROFILE%\Application Data\Wireshark\preferences>) on Windows systems. diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template index dc28ef8dad..a8ec549ccf 100644 --- a/doc/wireshark.pod.template +++ b/doc/wireshark.pod.template @@ -2586,7 +2586,10 @@ example, F</usr/local/share/wireshark/preferences>) on UNIX-compatible systems, and in the main installation directory (for example, F<C:\Program Files\Wireshark\preferences>) on Windows systems. -The personal preferences file is looked for in F<$HOME/.wireshark/preferences> on +The personal preferences file is looked for in +F<$XDG_CONFIG_HOME/wireshark/preferences> +(or, if F<$XDG_CONFIG_HOME/wireshark> does not exist while F<$HOME/.wireshark> +is present, F<$HOME/.wireshark/preferences>) on UNIX-compatible systems and F<%APPDATA%\Wireshark\preferences> (or, if %APPDATA% isn't defined, F<%USERPROFILE%\Application Data\Wireshark\preferences>) on Windows systems. |