nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-21 00:01:53 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue1743' into develop

Browse Source
This commit is contained in:
nicolargo 2020-10-10 10:22:50 +02:00
commit 46355bd672
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/config.rst
View File

@ -17,10 +17,10 @@ Location
You can put your own ``glances.conf`` file in the following locations:
==================== =============================================================
``Linux``, ``SunOS`` ~/.config/glances, /etc/glances
``*BSD`` ~/.config/glances, /usr/local/etc/glances
``macOS`` ~/Library/Application Support/glances, /usr/local/etc/glances
``Windows`` %APPDATA%\\glances
``Linux``, ``SunOS`` ~/.config/glances/glances.conf, /etc/glances/glances.conf
``*BSD`` ~/.config/glances/glances.conf, /usr/local/etc/glances/glances.conf
``macOS`` ~/Library/Application Support/glances/glances.conf, /usr/local/etc/glances/glances.conf
``Windows`` %APPDATA%\\glances\glances.conf
==================== =============================================================
- On Windows XP, ``%APPDATA%`` is: ``C:\Documents and Settings\<USERNAME>\Application Data``.

10
docs/man/glances.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "GLANCES" "1" "Sep 12, 2020" "3.1.6_b1" "Glances"
.TH "GLANCES" "1" "Oct 10, 2020" "3.1.6_b1" "Glances"
.SH NAME
glances \- An eye on your system
.
@ -520,25 +520,25 @@ _
T{
\fBLinux\fP, \fBSunOS\fP
T} T{
~/.config/glances, /etc/glances
~/.config/glances/glances.conf, /etc/glances/glances.conf
T}
_
T{
\fB*BSD\fP
T} T{
~/.config/glances, /usr/local/etc/glances
~/.config/glances/glances.conf, /usr/local/etc/glances/glances.conf
T}
_
T{
\fBmacOS\fP
T} T{
~/Library/Application Support/glances, /usr/local/etc/glances
~/Library/Application Support/glances/glances.conf, /usr/local/etc/glances/glances.conf
T}
_
T{
\fBWindows\fP
T} T{
%APPDATA%\eglances
%APPDATA%\eglancesglances.conf
T}
_
.TE