* Monodoc/ecma-provider.cs: Don't return 'null' from GetPublicUrl(),

	  but instead provide a decent URL even if the url isn't to a single
	  member, but instead to show all members, e.g. T:System.String/*.
	* Monodoc/provider.cs: Obsolete Node.URL.  It's too variable for sane
	  use; use Node.PublicUrl.

svn path=/trunk/mcs/; revision=142649

diff --git a/mcs/tools/monodoc/ChangeLog b/mcs/tools/monodoc/ChangeLog
index cb1034c2c6015439cf9798e88778f4b52cf49a8d..e90d919e8a0359b3413b56c33ed2745c6f4b2a87 100644 (file)
--- a/mcs/tools/monodoc/ChangeLog
+++ b/mcs/tools/monodoc/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-25  Jonathan Pryor  <jpryor@novell.com>
+
+       * Monodoc/ecma-provider.cs: Don't return 'null' from GetPublicUrl(),
+         but instead provide a decent URL even if the url isn't to a single
+         member, but instead to show all members, e.g. T:System.String/*.
+       * Monodoc/provider.cs: Obsolete Node.URL.  It's too variable for sane
+         use; use Node.PublicUrl.
+
 2009-09-09  Jonathan Pryor  <jpryor@novell.com>
 
        * Mono.Documentation/ManifestResourceResolver.cs: Allow it to lookup

diff --git a/mcs/tools/monodoc/Monodoc/ecma-provider.cs b/mcs/tools/monodoc/Monodoc/ecma-provider.cs
index 4041340ed69d3f059b3f24ca448cc0488bedbfa2..c82cf64142617525c3e2fe46f4d128663b5eeb9a 100644 (file)
--- a/mcs/tools/monodoc/Monodoc/ecma-provider.cs
+++ b/mcs/tools/monodoc/Monodoc/ecma-provider.cs
@@ -630,7 +630,7 @@ public class EcmaHelpSource : HelpSource {
                                return EcmaDoc.GetCref (d.DocumentElement);
                        XmlElement e = GetDocElement (d, rest);
                        if (e == null)
-                               return url;
+                               return EcmaDoc.GetCref (d.DocumentElement) + "/" + rest;
                        return EcmaDoc.GetCref (e);
                }
                catch (Exception e) {

diff --git a/mcs/tools/monodoc/Monodoc/provider.cs b/mcs/tools/monodoc/Monodoc/provider.cs
index 91ee1d0cdb128917293dcf0a30f72c0482aa20ec..763d435af60ad41b5b048df2687424825a822ebb 100644 (file)
--- a/mcs/tools/monodoc/Monodoc/provider.cs
+++ b/mcs/tools/monodoc/Monodoc/provider.cs
@@ -350,6 +350,7 @@ public class Node : IComparable {
                        nodes.Sort ();
        }
 
+       [Obsolete("Use PublicUrl")]
        public string URL {
                get {
                        if (position < 0)