Index: /saga/trunk/saga/saga/metric.hpp
===================================================================
--- /saga/trunk/saga/saga/metric.hpp (revision 3232)
+++ /saga/trunk/saga/saga/metric.hpp (revision 3482)
@@ -133,4 +133,8 @@
       *
       */
+     // FIXME: the spec does not say anything about a target object parameter.
+     // In fact, a metric should be usable on multiple objects.  For example, an
+     // application may want to add the same metrics to several steerable
+     // job instances.
      metric (saga::object target, 
              std::string name, std::string desc, std::string mode, 
Index: /saga/trunk/adaptors/default/url/local_url.cpp
===================================================================
--- /saga/trunk/adaptors/default/url/local_url.cpp (revision 3470)
+++ /saga/trunk/adaptors/default/url/local_url.cpp (revision 3482)
@@ -80,2 +80,3 @@
 ///////////////////////////////////////////////////////////////////////////////
 }
+
Index: /saga/trunk/make/saga.adaptor.mk
===================================================================
--- /saga/trunk/make/saga.adaptor.mk (revision 2775)
+++ /saga/trunk/make/saga.adaptor.mk (revision 3482)
@@ -48,9 +48,5 @@
 
 
-ifdef SAGA_ROOT
-  TMP_MAKE_INCLUDES = $(foreach preq,$(TMP_PACKAGE_REQS),$(SAGA_ROOT)/make/saga.$(preq).i.mk)
-else
-  TMP_MAKE_INCLUDES = $(foreach preq,$(TMP_PACKAGE_REQS),$(SAGA_ROOT)/make/saga.$(preq).mk)
-endif
+TMP_MAKE_INCLUDES = $(foreach preq,$(TMP_PACKAGE_REQS),$(SAGA_MAKE_INCLUDE_ROOT)/saga.$(preq).i.mk)
 
 TMP_MAKE_INCLUDES  += $(foreach ereq,$(TMP_EXTERNAL_REQS),$(SAGA_CONFDIR)/saga.config.$(ereq).c.mk)
@@ -61,4 +57,7 @@
   endif
 endif
+
+# include for generating adaptor docs
+include $(SAGA_MAKE_INCLUDE_ROOT)/saga.doc.mk