From dd8b5b2772433fec2d69f1963c1788c085646cfd Mon Sep 17 00:00:00 2001
From: Peter Veenstra <qbix79@users.sourceforge.net>
Date: Sun, 9 May 2010 11:54:44 +0000
Subject: [PATCH] Document -userconf

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3601
---
 docs/dosbox.1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/dosbox.1 b/docs/dosbox.1
index 74fe2cb7..9321fed5 100644
--- a/docs/dosbox.1
+++ b/docs/dosbox.1
@@ -9,6 +9,7 @@ dosbox \- an x86/DOS emulator with sound/graphics
 .B [\-startmapper]
 .B [\-noautoexec]
 .B [\-securemode]
+.B [\-userconf]
 .BI "[\-scaler " scaler ] 
 .BI "[\-forcescaler " scaler ]
 .BI "[\-conf " configfile ]
@@ -63,6 +64,10 @@ at the end of
 (which in turn disables any changes to how the drives are mounted 
 .RB "inside " dosbox )
 .TP
+.B \-userconf
+Load the configuration file located in ~/.dosbox. Can be combined with
+.RB "the " \-conf " option." 
+.TP
 .BI \-scaler " scaler"
 .RI "Uses the graphical scaler specified by " scaler ". See the configuration"
 file for the available scalers