From b529e15e29acf6dafe360a790a5c38b1263c9e98 Mon Sep 17 00:00:00 2001 From: Paul Backus Date: Thu, 11 Nov 2021 10:32:15 -0500 Subject: [PATCH] Fix 22494 - Search paths for dmd.conf missing from dmd man page (#13280) * Fix Issue 22494 - Search paths for dmd.conf missing from dmd man page * Fix syntax error in dmd.conf man page * Remove duplication from dmd and dmd.conf man pages --- docs/gen_man.d | 9 ++++----- docs/man/man5/dmd.conf.5 | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/gen_man.d b/docs/gen_man.d index e55deb58c2..69f212f3ce 100644 --- a/docs/gen_man.d +++ b/docs/gen_man.d @@ -43,12 +43,11 @@ The actual linking is done by running \fBgcc\fR. This ensures compatibility with modules compiled with \fBgcc\fR. .SH FILES +.TP .I /etc/dmd.conf -dmd will look for the initialization file -.I dmd.conf -in the directory \fI/etc\fR. -If found, environment variable settings in the file will -override any existing settings. +System wide \fBdmd\fR config file. See +.BR dmd.conf(5) +for details. .SH ENVIRONMENT The D compiler dmd uses the following environment variables: diff --git a/docs/man/man5/dmd.conf.5 b/docs/man/man5/dmd.conf.5 index fe5bcaefea..a1f0dc9123 100644 --- a/docs/man/man5/dmd.conf.5 +++ b/docs/man/man5/dmd.conf.5 @@ -1,7 +1,7 @@ .TH DMD.CONF 5 "2006-03-12" "Digital Mars" "Digital Mars D" .SH NAME dmd.conf \- configuration file for -\BR dmd (1) +.BR dmd (1) .SH SYNOPSIS .I /etc/dmd.conf @@ -9,8 +9,18 @@ dmd.conf \- configuration file for .SH DESCRIPTION dmd will look for the initialization file .I dmd.conf -in the directory \fI/etc\fR. If found, environment variable -settings in the file will override any existing settings. +in the following directories: +.IP 1. 3 +The current working directory. +.IP 2. 3 +\fB$HOME\fR +.IP 3. 3 +The directory containing the \fBdmd\fR executable. +.IP 4. 3 +\fI/etc\fR +.PP +If found, environment variable settings in the file will override any +existing settings. .PP This is handy to make dmd independent of programs with