--- a/components/apr-util/apr-util-13-doc.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/apr-util/apr-util-13-doc.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,102 +18,99 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr/apr-util/1.3/manual/(.+)$ -> set action.hash %<\1> >
 <transform file path=usr/apr-util/1.3/manual/search/(.+)$ -> set action.hash %<\1> >
 <transform file path=usr/apr-util/1.3/manual/.* -> default facet.doc.html all>
-
 set name=pkg.fmri \
     value=pkg:/library/apr-util-13/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Apache Portable Runtime Utility (APR-util) 1.3 documentation"
-set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 documentation"
+set name=com.oracle.info.description \
+    value="the Apache Portable Runtime Utility (APR-util) 1.3 documentation"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=LSARC/2008/541
+set name=org.opensolaris.arc-caseid value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/apr-util
-dir path=usr/apr-util/1.3
-dir path=usr/apr-util/1.3/manual
-dir path=usr/apr-util/1.3/manual/search
+dir  path=usr
+dir  path=usr/apr-util
+dir  path=usr/apr-util/1.3
+dir  path=usr/apr-util/1.3/manual
+file path=usr/apr-util/1.3/manual/abts_8h_source.html
 file path=usr/apr-util/1.3/manual/abts__tests_8h_source.html
-file path=usr/apr-util/1.3/manual/abts_8h_source.html
 file path=usr/apr-util/1.3/manual/acconfig_8h_source.html
 file path=usr/apr-util/1.3/manual/annotated.html
+file path=usr/apr-util/1.3/manual/apr__anylock_8h.html
 file path=usr/apr-util/1.3/manual/apr__anylock_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__anylock_8h.html
-file path=usr/apr-util/1.3/manual/apr__base64_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__base64_8h.html
-file path=usr/apr-util/1.3/manual/apr__buckets_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__base64_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__buckets_8h.html
+file path=usr/apr-util/1.3/manual/apr__buckets_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__date_8h.html
 file path=usr/apr-util/1.3/manual/apr__date_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__date_8h.html
+file path=usr/apr-util/1.3/manual/apr__dbd_8h.html
+file path=usr/apr-util/1.3/manual/apr__dbd_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__dbd__internal_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__dbd__odbc__v2_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__dbd_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__dbd_8h.html
+file path=usr/apr-util/1.3/manual/apr__dbm_8h.html
+file path=usr/apr-util/1.3/manual/apr__dbm_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__dbm__private_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__dbm_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__dbm_8h.html
+file path=usr/apr-util/1.3/manual/apr__hooks_8h.html
 file path=usr/apr-util/1.3/manual/apr__hooks_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__hooks_8h.html
-file path=usr/apr-util/1.3/manual/apr__ldap__init_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__ldap_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__ldap__init_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap__init_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__ldap__option_8h.html
 file path=usr/apr-util/1.3/manual/apr__ldap__option_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__ldap__option_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap__rebind_8h.html
 file path=usr/apr-util/1.3/manual/apr__ldap__rebind_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__ldap__rebind_8h.html
+file path=usr/apr-util/1.3/manual/apr__ldap__url_8h.html
 file path=usr/apr-util/1.3/manual/apr__ldap__url_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__ldap__url_8h.html
-file path=usr/apr-util/1.3/manual/apr__ldap_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__ldap_8h.html
+file path=usr/apr-util/1.3/manual/apr__md4_8h.html
 file path=usr/apr-util/1.3/manual/apr__md4_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__md4_8h.html
+file path=usr/apr-util/1.3/manual/apr__md5_8h.html
 file path=usr/apr-util/1.3/manual/apr__md5_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__md5_8h.html
+file path=usr/apr-util/1.3/manual/apr__memcache_8h.html
 file path=usr/apr-util/1.3/manual/apr__memcache_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__memcache_8h.html
-file path=usr/apr-util/1.3/manual/apr__optional__hooks_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__optional_8h.html
+file path=usr/apr-util/1.3/manual/apr__optional_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__optional__hooks_8h.html
-file path=usr/apr-util/1.3/manual/apr__optional_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__optional_8h.html
+file path=usr/apr-util/1.3/manual/apr__optional__hooks_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__queue_8h.html
 file path=usr/apr-util/1.3/manual/apr__queue_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__queue_8h.html
-file path=usr/apr-util/1.3/manual/apr__reslist_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__reslist_8h.html
+file path=usr/apr-util/1.3/manual/apr__reslist_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__rmm_8h.html
 file path=usr/apr-util/1.3/manual/apr__rmm_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__rmm_8h.html
+file path=usr/apr-util/1.3/manual/apr__sdbm_8h.html
 file path=usr/apr-util/1.3/manual/apr__sdbm_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__sdbm_8h.html
-file path=usr/apr-util/1.3/manual/apr__sha1_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__sha1_8h.html
+file path=usr/apr-util/1.3/manual/apr__sha1_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__strmatch_8h.html
 file path=usr/apr-util/1.3/manual/apr__strmatch_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__strmatch_8h.html
+file path=usr/apr-util/1.3/manual/apr__thread__pool_8h.html
 file path=usr/apr-util/1.3/manual/apr__thread__pool_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__thread__pool_8h.html
-file path=usr/apr-util/1.3/manual/apr__uri_8h_source.html
 file path=usr/apr-util/1.3/manual/apr__uri_8h.html
+file path=usr/apr-util/1.3/manual/apr__uri_8h_source.html
+file path=usr/apr-util/1.3/manual/apr__uuid_8h.html
 file path=usr/apr-util/1.3/manual/apr__uuid_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__uuid_8h.html
+file path=usr/apr-util/1.3/manual/apr__xlate_8h.html
 file path=usr/apr-util/1.3/manual/apr__xlate_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__xlate_8h.html
+file path=usr/apr-util/1.3/manual/apr__xml_8h.html
 file path=usr/apr-util/1.3/manual/apr__xml_8h_source.html
-file path=usr/apr-util/1.3/manual/apr__xml_8h.html
+file path=usr/apr-util/1.3/manual/apu_8h_source.html
 file path=usr/apr-util/1.3/manual/apu__config_8h_source.html
 file path=usr/apr-util/1.3/manual/apu__internal_8h_source.html
 file path=usr/apr-util/1.3/manual/apu__select__dbm_8h_source.html
+file path=usr/apr-util/1.3/manual/apu__version_8h.html
 file path=usr/apr-util/1.3/manual/apu__version_8h_source.html
-file path=usr/apr-util/1.3/manual/apu__version_8h.html
+file path=usr/apr-util/1.3/manual/apu__want_8h.html
 file path=usr/apr-util/1.3/manual/apu__want_8h_source.html
-file path=usr/apr-util/1.3/manual/apu__want_8h.html
-file path=usr/apr-util/1.3/manual/apu_8h_source.html
 file path=usr/apr-util/1.3/manual/ascii_8h_source.html
 file path=usr/apr-util/1.3/manual/asciitab_8h_source.html
 file path=usr/apr-util/1.3/manual/bc_s.png
@@ -123,25 +120,26 @@
 file path=usr/apr-util/1.3/manual/doxygen.css
 file path=usr/apr-util/1.3/manual/doxygen.png
 file path=usr/apr-util/1.3/manual/files.html
+file path=usr/apr-util/1.3/manual/functions.html
 file path=usr/apr-util/1.3/manual/functions_enum.html
 file path=usr/apr-util/1.3/manual/functions_eval.html
 file path=usr/apr-util/1.3/manual/functions_func.html
 file path=usr/apr-util/1.3/manual/functions_vars.html
-file path=usr/apr-util/1.3/manual/functions.html
+file path=usr/apr-util/1.3/manual/globals.html
 file path=usr/apr-util/1.3/manual/globals_defs.html
 file path=usr/apr-util/1.3/manual/globals_enum.html
 file path=usr/apr-util/1.3/manual/globals_eval.html
 file path=usr/apr-util/1.3/manual/globals_func.html
 file path=usr/apr-util/1.3/manual/globals_type.html
 file path=usr/apr-util/1.3/manual/globals_vars.html
-file path=usr/apr-util/1.3/manual/globals.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___m_d5.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___u_u_i_d.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___base64.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___bucket___brigades.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___d_b_d.html
+file path=usr/apr-util/1.3/manual/group___a_p_r___util___d_b_m.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___d_b_m___s_d_b_m.html
-file path=usr/apr-util/1.3/manual/group___a_p_r___util___d_b_m.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___date.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___f_i_f_o.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___hook.html
@@ -156,7 +154,6 @@
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___t_p.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___u_r_i.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___util___x_m_l.html
-file path=usr/apr-util/1.3/manual/group___a_p_r___util.html
 file path=usr/apr-util/1.3/manual/group___a_p_r___x_l_a_t_e.html
 file path=usr/apr-util/1.3/manual/iasciitab_8h_source.html
 file path=usr/apr-util/1.3/manual/index.html
@@ -176,6 +173,7 @@
 file path=usr/apr-util/1.3/manual/sdbm__pair_8h_source.html
 file path=usr/apr-util/1.3/manual/sdbm__private_8h_source.html
 file path=usr/apr-util/1.3/manual/sdbm__tune_8h_source.html
+dir  path=usr/apr-util/1.3/manual/search
 file path=usr/apr-util/1.3/manual/search/all_61.html
 file path=usr/apr-util/1.3/manual/search/all_61.js
 file path=usr/apr-util/1.3/manual/search/all_62.html
@@ -247,11 +245,11 @@
 file path=usr/apr-util/1.3/manual/search/namespaces_61.html
 file path=usr/apr-util/1.3/manual/search/namespaces_61.js
 file path=usr/apr-util/1.3/manual/search/nomatches.html
+file path=usr/apr-util/1.3/manual/search/search.css
+file path=usr/apr-util/1.3/manual/search/search.js
 file path=usr/apr-util/1.3/manual/search/search_l.png
 file path=usr/apr-util/1.3/manual/search/search_m.png
 file path=usr/apr-util/1.3/manual/search/search_r.png
-file path=usr/apr-util/1.3/manual/search/search.css
-file path=usr/apr-util/1.3/manual/search/search.js
 file path=usr/apr-util/1.3/manual/search/typedefs_61.html
 file path=usr/apr-util/1.3/manual/search/typedefs_61.js
 file path=usr/apr-util/1.3/manual/search/variables_61.html
@@ -301,6 +299,7 @@
 file path=usr/apr-util/1.3/manual/structabts__case.html
 file path=usr/apr-util/1.3/manual/structabts__suite.html
 file path=usr/apr-util/1.3/manual/structapr__anylock__t.html
+file path=usr/apr-util/1.3/manual/structapr__bucket.html
 file path=usr/apr-util/1.3/manual/structapr__bucket__brigade.html
 file path=usr/apr-util/1.3/manual/structapr__bucket__file.html
 file path=usr/apr-util/1.3/manual/structapr__bucket__heap.html
@@ -308,7 +307,6 @@
 file path=usr/apr-util/1.3/manual/structapr__bucket__pool.html
 file path=usr/apr-util/1.3/manual/structapr__bucket__refcount.html
 file path=usr/apr-util/1.3/manual/structapr__bucket__type__t.html
-file path=usr/apr-util/1.3/manual/structapr__bucket.html
 file path=usr/apr-util/1.3/manual/structapr__datum__t.html
 file path=usr/apr-util/1.3/manual/structapr__dbd__driver__t.html
 file path=usr/apr-util/1.3/manual/structapr__dbm__t.html
@@ -326,8 +324,8 @@
 file path=usr/apr-util/1.3/manual/structapr__sdbm__t.html
 file path=usr/apr-util/1.3/manual/structapr__sha1__ctx__t.html
 file path=usr/apr-util/1.3/manual/structapr__strmatch__pattern.html
+file path=usr/apr-util/1.3/manual/structapr__text.html
 file path=usr/apr-util/1.3/manual/structapr__text__header.html
-file path=usr/apr-util/1.3/manual/structapr__text.html
 file path=usr/apr-util/1.3/manual/structapr__uri__t.html
 file path=usr/apr-util/1.3/manual/structapr__uuid__t.html
 file path=usr/apr-util/1.3/manual/structapr__xml__attr.html
@@ -351,7 +349,6 @@
 file path=usr/apr-util/1.3/manual/utf8tab_8h_source.html
 file path=usr/apr-util/1.3/manual/winconfig_8h_source.html
 file path=usr/apr-util/1.3/manual/xmlrole_8h_source.html
+file path=usr/apr-util/1.3/manual/xmltok_8h_source.html
 file path=usr/apr-util/1.3/manual/xmltok__impl_8h_source.html
-file path=usr/apr-util/1.3/manual/xmltok_8h_source.html
-
 license apr-util.license license="Apache v2.0"