From d2c3dbc665367ae391ea52828ac1c6007097380a Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 14 Jul 2009 06:38:14 +0000 Subject: If it exist, load a system-wide configuration file /etc/tmux.conf before any user-specified one. --- tmux.1 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index 822a3451..6d808b23 100644 --- a/tmux.1 +++ b/tmux.1 @@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.112 2009-07-12 17:12:06 nicm Exp $ +.\" $Id: tmux.1,v 1.113 2009-07-14 06:38:14 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott .\" @@ -70,7 +70,9 @@ to assume the terminal supports default colours. Specify an alternative configuration file. By default, .Nm -will look for a config file at +loads the system configuration file from +.Pa /etc/tmux.conf , +if present, then looks for a user configuration file at .Pa ~/.tmux.conf . The configuration file is a set of .Nm @@ -1549,11 +1551,13 @@ not be linked to no sessions. Move up a pane. .El .Sh FILES -.Bl -tag -width "~/.tmux.confXXX" -compact +.Bl -tag -width "/etc/tmux.confXXX" -compact .It Pa ~/.tmux.conf Default .Nm configuration file. +.It Pa /etc/tmux.conf +System-wide configuration file. .El .Sh SEE ALSO .Xr pty 4 -- cgit