Doxygen-related changes and minor code modifications
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 06eb8dd..26021b1 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -225,7 +225,7 @@
 # func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = YES
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
@@ -423,7 +423,7 @@
 # Note: This option applies only to the class list, not to the
 # alphabetical list.
 
-SORT_BY_SCOPE_NAME     = NO
+SORT_BY_SCOPE_NAME     = YES
 
 # The GENERATE_TODOLIST tag can be used to enable (YES) or
 # disable (NO) the todo list. This list is created by putting \todo
@@ -620,7 +620,7 @@
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
 
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = 
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see
@@ -657,7 +657,7 @@
 # If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
-INPUT_FILTER           =
+INPUT_FILTER           = "sed 's/boost::shared_ptr<\(.*\)>/\1*/'"
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis.
@@ -1406,7 +1406,7 @@
 # If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
-TEMPLATE_RELATIONS     = YES
+TEMPLATE_RELATIONS     = NO
 
 # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
 # tags are set to YES then doxygen will generate a graph for each documented
diff --git a/doc/doxygen_boost_dummy.h b/doc/doxygen_boost_dummy.h
index bfa0592..2a01c27 100644
--- a/doc/doxygen_boost_dummy.h
+++ b/doc/doxygen_boost_dummy.h
@@ -1,6 +1,10 @@
 namespace boost { 
-	template<class T> class shared_ptr { T *dummy; }; 
-	template<class T> class weak_ptr { T *dummy; }; 
+  template<class T> class shared_ptr { T *ptr; }; 
+  template<class T> class weak_ptr { T *ptr; }; 
 }
 
-namespace Sync { class DiffStateContainer { boost::shared_ptr<DiffState> dummy; }; }
+namespace Sync {
+  struct DiffStateContainer { DiffState *multi_index_container; };
+  struct LeafContainer { Leaf *multi_index_container; }
+  struct CcnxWrapperPtr { CcnxWrapper *ptr; }
+}