Merge pull request #4380 from alexanderkyte/conflicting_attrs

[mono.git] / man / monolinker.1

diff --git a/man/monolinker.1 b/man/monolinker.1
index b25efb2277b08bf3f11c7ecd4acbf847f128b0d4..1ec7bcce818492dc70311db2465e85143b0809e2 100644 (file)
--- a/man/monolinker.1
+++ b/man/monolinker.1
@@ -111,6 +111,7 @@ Here is an example that shows all the possibilities of this format:
                <type fullname="Gazonk">
                        <method signature="System.Void .ctor(System.String)" />
                        <field signature="System.String _blah" />
                <type fullname="Gazonk">
                        <method signature="System.Void .ctor(System.String)" />
                        <field signature="System.String _blah" />

+                       <field name="someFieldName" />

                </type>
        </assembly>
 </linker>
                </type>
        </assembly>
 </linker>


@@ -142,7 +143,7 @@ is necessary for this assembly to run.
 use a .info xml file as a source for the linker.
 .Sp
 An info file is a file produced by the tool mono-api-info. The linker will use it to
 use a .info xml file as a source for the linker.
 .Sp
 An info file is a file produced by the tool mono-api-info. The linker will use it to

-generate an assembly that contains only what the public API defined in he info file
+generate an assembly that contains only what the public API defined in the info file

 needs.
 .TP
 .I "-s [StepBefore:]StepFullName,StepAssembly[:StepAfter]"
 needs.
 .TP
 .I "-s [StepBefore:]StepFullName,StepAssembly[:StepAfter]"


@@ -195,16 +196,19 @@ This command will add the FooStep before the MarkStep:
 .fi
 .Sp
 This command will add the FooStep before the MarkStep
 .fi
 .Sp
 This command will add the FooStep before the MarkStep

+.TP
+.I "-m CustomParam ParamValue"
+Specify a parameter for a custom step.

 .SH COPYRIGHT
 Copyright (C) 2007 Novell, Inc (http://www.novell.com)
 .SH BUGS
 .SH COPYRIGHT
 Copyright (C) 2007 Novell, Inc (http://www.novell.com)
 .SH BUGS

-Bugs report are welcome at http://bugzilla.ximian.com
+Bugs report are welcome at http://bugzilla.xamarin.com

 .PP
 Product Mono Tools, Component linker.
 .SH MAILING LISTS
 .PP
 Product Mono Tools, Component linker.
 .SH MAILING LISTS

-Mailing lists are listed at http://www.mono-project.com/Mailing_Lists
+Mailing lists are listed at http://www.mono-project.com/community/help/mailing-lists/

 .SH WEB SITE
 .SH WEB SITE

-http://www.mono-project.com/Linker
+http://www.mono-project.com/docs/tools+libraries/tools/linker/

 .SH AUTHORS
 The linker has been written by Jb Evain, and have been partially founded by
 the Google Summer of Code.
 .SH AUTHORS
 The linker has been written by Jb Evain, and have been partially founded by
 the Google Summer of Code.