[mkbundle] Automatically bundle config files and machine.config files (#7002)

* [mkbundle] Automatically bundle config files and machine.config files for the simple/cross compiler scenario, fixes one of the missing issues for #6230

1 files changed, 24 insertions, 5 deletions

diff --git a/man/mkbundle.1 b/man/mkbundle.1
index 7a9e22c205d..1e2b4d5f3f5 100644
--- a/man/mkbundle.1
+++ b/man/mkbundle.1
@@ -111,10 +111,11 @@ directory.
 .SH OPTIONS
 .TP 
 .I "--config FILE"
-Specifies that a machine.config file must be bundled as well.
-Typically this is $prefix/etc/mono/1.0/machine.config or
-$prefix/etc/mono/2.0/machine.config depending on the profile that you
-are using (1.0 or 2.0)
+Specifies that a DLLMAP Mono config file must be bundled as well.   In
+the simple and cross compiler modes, if no config file is specified
+the one for the current target is picked (either the system one in the
+case of the simple mode, or the one that came from the cross
+compilation target for the cross compiling mode).
 .TP
 .I "--config-dir DIR"
 When passed, DIR will be set for the MONO_CFG_DIR environment variable
@@ -202,13 +203,31 @@ Provides mkbundle access to a managed linker to preprocess the assemblies.
 .TP
 .I "--machine-config FILE"
 Uses the given FILE as the machine.config file for the generated
-application.   
+application.  The machine config contains an XML file that is used by
+System.Configuration APIs to configure the .NET stack.  Typically this
+is
+.I $prefix/etc/mono/4.5/machine.config.
+.Sp
+If you want to disable this automatic bundling, you can use the
+.I "--no-machine-config"
+flag. In the simple and cross compiler modes, if no machine.config file is specified
+the one for the current target is picked (either the system one in the
+case of the simple mode, or the one that came from the cross
+compilation target for the cross compiling mode).
+.TP
+.I "--no-config"
+In simple or cross compiling mode, this prevents mkbundle from
+automatically bundling a config file.   
 .TP
 .I  "--nodeps"
 This is the default: \fImkbundle\fP will only include the assemblies that
 were specified on the command line to reduce the size of the resulting
 image created.
 .TP
+.I "--no-machine-config"
+In simple or cross compiling mode, this prevents mkbundle from
+automatically bundling a machine.config file.   
+.TP
 .I "-o filename"
 Places the output on `out'.  If the flag -c is specified, this is the
 C host program.  If not, this contains the resulting executable.