Man page updates

svn path=/trunk/mono/; revision=64111

diff --git a/man/mono-config.5 b/man/mono-config.5
index 1229a104b21cb6debc2083272f85d4b8b3ae204c..44fc04b619d92c61b63c06ff2e6d372f6f3fd825 100644 (file)
--- a/man/mono-config.5
+++ b/man/mono-config.5
@@ -14,7 +14,8 @@ installation prefix /etc/mono/config file, the ~/.mono/config or from
 the file pointed by the MONO_CONFIG environment variable.
 .PP
 For each assembly loaded a config file with the name:
-/path/to/the/assembly.exe.config is loaded, too.
+/path/to/the/assembly.exe.config is loaded as well as the
+~/.mono/assemblies/ASSEMBLY/ASSEMBLY.EXT.config file. 
 .PP
 This file controls the behavior of the runtime.
 .PP
@@ -23,6 +24,10 @@ contained inside a
 .B<configuration> 
 section (It actually uses GMarkup
 to parse the file).
+.PP
+This page describes the Unix-specific and Mono-specific extensions to
+the configuration file;   For complete details, see the
+http://www.mono-project.com/Config web page.
 .SH <dllmap> directive
 You use the dllmap directive to map shared libraries referenced by
 P/Invoke in your assemblies to a different shared library.

diff --git a/man/mono.1 b/man/mono.1
index c2cd866e2ff2ac8554130faf6c039496dc0ac06e..1106ff4044b82e69318d533ab3a52973556928b5 100644 (file)
--- a/man/mono.1
+++ b/man/mono.1
@@ -600,11 +600,11 @@ on unix and "%APPDATA%\mono\eventlog" on Windows.
 .TP
 .I "win32"
 .Sp
-.B *Windows Only*
+.B 
 Uses the native win32 API to write events and registers event logs and
-event sources in the registry.
+event sources in the registry.   This is only available on Windows. 
 .Sp
-On unix, the directory permission for individual event log and event source
+On Unix, the directory permission for individual event log and event source
 directories is set to 777 (with +t bit) allowing everyone to read and write
 event log entries while only allowing entries to be deleted by the user(s)
 that created them.
@@ -614,7 +614,7 @@ that created them.
 Silently discards any events.
 .ne
 .PP
-The default is "null" on unix (and versions of Windows before NT), and 
+The default is "null" on Unix (and versions of Windows before NT), and 
 "win32" on Windows NT (and higher).
 .RE
 .TP
@@ -755,41 +755,60 @@ On Unix assemblies are loaded from the installation lib directory.  If you set
 `prefix' to /usr, the assemblies will be located in /usr/lib.  On
 Windows, the assemblies are loaded from the directory where mono and
 mint live.
-.PP
-~/.mono/aot-cache
-.PP
+.TP
+.B ~/.mono/aot-cache
+.Sp
 The directory for the ahead-of-time compiler demand creation
 assemblies are located. 
-.PP
-/etc/mono/config, ~/.mono/config
-.PP
+.TP
+.B /etc/mono/config, ~/.mono/config
+.Sp
 Mono runtime configuration file.  See the mono-config(5) manual page
 for more information.
-.PP
-~/.config/.mono/certs, /usr/share/.mono/certs
-.PP
+.TP
+.B ~/.config/.mono/certs, /usr/share/.mono/certs
+.Sp
 Contains Mono certificate stores for users / machine. See the certmgr(1) 
 manual page for more information on managing certificate stores and
 the mozroots(1) page for information on how to import the Mozilla root
 certificates into the Mono certificate store. 
-.PP
-~/.config/.mono/keypairs, /usr/share/.mono/keypairs
-.PP
+.TP
+.B ~/.mono/assemblies/ASSEMBLY/ASSEMBLY.config
+.Sp
+Files in this directory allow a user to customize the configuration
+for a given system assembly, the format is the one described in the
+mono-config(5) page. 
+.TP
+.B ~/.config/.mono/keypairs, /usr/share/.mono/keypairs
+.Sp
 Contains Mono cryptographic keypairs for users / machine. They can be 
 accessed by using a CspParameters object with DSACryptoServiceProvider
 and RSACryptoServiceProvider classes.
-.PP
-~/.config/.isolatedstorage, ~/.local/share/.isolatedstorage, /usr/share/.isolatedstorage
-.PP
+.TP
+.B ~/.config/.isolatedstorage, ~/.local/share/.isolatedstorage, /usr/share/.isolatedstorage
+.Sp
 Contains Mono isolated storage for non-roaming users, roaming users and 
 local machine. Isolated storage can be accessed using the classes from 
 the System.IO.IsolatedStorage namespace.
+.TP
+.B <assembly>.config
+.Sp
+Configuration information for individual assemblies is loaded by the
+runtime from side-by-side files with the .config files, see the
+http://www.mono-project.com/Config for more information.
+.TP
+.B Web.config, web.config
+.Sp
+ASP.NET applications are configured through these files, the
+configuration is done on a per-directory basis.  For more information
+on this subject see the http://www.mono-project.com/Config_system.web
+page. 
 .SH MAILING LISTS
 Mailing lists are listed at the
 http://www.mono-project.com/Mailing_Lists
 .SH WEB SITE
 http://www.mono-project.com
 .SH SEE ALSO
-.BR certmgr(1), mcs(1), mint(1), monodis(1), mono-config(5), mozroots(1).
+.BR certmgr(1), mcs(1), mint(1), monodis(1), mono-config(5), mozroots(1), xsp(1).
 .PP
 For ASP.NET-related documentation, see the xsp(1) manual page