From a42036353ad2a1a8c1b9f1344ad27547786dfd1f Mon Sep 17 00:00:00 2001
From: Joachim Lingner <jl@openoffice.org>
Date: Mon, 7 Jun 2010 17:03:27 +0200
Subject: jl152 #i77196# fixing merge conflicts

---
 offapi/com/sun/star/deployment/XPackageManager.idl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'offapi/com/sun/star/deployment/XPackageManager.idl')

diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index fde1505ffac0..da329bb9367f 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -55,7 +55,7 @@ module com { module sun { module star { module deployment {
     removed from the repository.
     </p>
     <p>
-    All interface methods do neither register or revoke an extension.
+    All interface methods do neither register nor revoke an extension.
     This happens exclusively by <type>XExtensionManager</type>.
     </p>
     <p>
@@ -82,7 +82,8 @@ interface XPackageManager
     */
     interface com::sun::star::util::XModifyBroadcaster;
 
-    /** returns the underlying deployment context.
+    /** returns the underlying deployment context, that is,
+        the name of the repository..
 
         @return
                 underlying deployment context
-- 
cgit