Merge pull request #4816 from BrzVlad/fix-remoting-exception

[mono.git] / man / mono.1

diff --git a/man/mono.1 b/man/mono.1
index 352c10b6ce69e613eb66bca17a4e1d2ffaffd284..b23581535c583425416b8a9dc3fdf8ae78451a89 100644 (file)
--- a/man/mono.1
+++ b/man/mono.1
@@ -155,11 +155,11 @@ runtime.
 .TP
 .I full
 .Sp
-This creates binaries which can be used with the --full-aot option. This feature is experimental.
+This creates binaries which can be used with the --full-aot option.
 .TP
 .I hybrid
 .Sp
-This creates binaries which can be used with the --hybrid-aot option. This feature is experimental.
+This creates binaries which can be used with the --hybrid-aot option.
 .TP
 .I llvm
 AOT will be performed with the LLVM backend instead of the Mono backend where possible. This will be slower to compile but most likely result in a performance improvement.
@@ -311,6 +311,26 @@ Instructs the AOT compiler to emit (or not emit) debug symbol information.
 For more information about AOT, see: http://www.mono-project.com/docs/advanced/aot/
 .RE
 .TP
+\fB--aot-path=PATH\fR
+List of additional directories to search for AOT images.
+.TP
+\fB--apply-bindings=FILE\fR
+Apply the assembly bindings from the specified configuration file when running
+the AOT compiler.  This is useful when compiling an auxiliary assembly that is
+referenced by a main assembly that provides a configuration file.  For example,
+if app.exe uses lib.dll then in order to make the assembly bindings from
+app.exe.config available when compiling lib.dll ahead of time, use:
+.nf
+       mono --apply-bindings=app.exe.config --aot lib.dll
+.fi
+.TP
+\fB--assembly-loader=MODE\fR
+If mode is \fBstrict\fR, Mono will check that the public key token, culture and version
+of a candidate assembly matches the requested strong name.  If mode is \fBlegacy\fR, as
+long as the name matches, the candidate will be allowed. \fBstrict\fR is the behavior
+consistent with .NET Framework but may break some existing mono-based applications.
+The default is \fBlegacy\fR.
+.TP
 \fB--attach=[options]\fR
 Currently the only option supported by this command line argument is
 \fBdisable\fR which disables the attach functionality.
@@ -321,9 +341,6 @@ The default files are /etc/mono/config and ~/.mono/config or the file
 specified in the MONO_CONFIG environment variable, if set.  See the
 mono-config(5) man page for details on the format of this file.
 .TP
-\fB--aot-path=PATH\fR
-List of additional directories to search for AOT images.
-.TP
 \fB--debugger-agent=[options]\fR 
 This instructs the Mono runtime to
 start a debugging agent inside the Mono runtime and connect it to a
@@ -382,7 +399,7 @@ the heap as much as possible at the expense of slowing down garbage
 collection a bit.
 .TP
 \fB--full-aot\fR
-This is an experimental flag that instructs the Mono runtime to not
+This flag instructs the Mono runtime to not
 generate any code at runtime and depend exclusively on the code
 generated from using mono --aot=full previously.  This is useful for
 platforms that do not permit dynamic code generation, or if you need
@@ -418,7 +435,7 @@ will switch to '/bin/mono64' iff '/bin/mono' is a 32-bit build).
 Displays usage instructions.
 .TP
 \fB--hybrid-aot\fR
-This is an experimental flag that allows the Mono runtime to run assemblies
+This flag allows the Mono runtime to run assemblies
 that have been stripped of IL, for example using mono-cil-strip. For this to
 work, the assembly must have been AOT compiled with --aot=hybrid.