From 2418bae7027706a0cc2a4132edc378f651bed0a1 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 17 Oct 2011 13:28:54 +0200
Subject: Undo basis/brand split: move help/ from basis to brand.

---
 officecfg/registry/data/org/openoffice/Office/Paths.xcu    | 3 +--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index bb0af9be40cf..1bf90f2a303f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -126,8 +126,7 @@
 
         <node oor:name="Help" oor:op="fuse" oor:mandatory="true">
             <node oor:name="InternalPaths">
-                <!-- FIXME where should this go -->
-                <node oor:name="$(instpath)/basis-link/help" oor:op="fuse" />
+                <node oor:name="$(instpath)/help" oor:op="fuse" />
             </node>
         </node>
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index bdd2edfd43fd..74e0c0f409fd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1660,8 +1660,7 @@
 						<author>ABI</author>
 						<desc>Specifies the path to the Office help files.</desc>
 					</info>
-                    <!-- FIXME where should this go -->
-                    <value>$(instpath)/basis-link/help</value>
+                    <value>$(instpath)/help</value>
 				</prop>
 				<prop oor:name="Linguistic" oor:type="xs:string">
 					<info>
-- 
cgit