Return-Path: 
 <commits-return-18684-apmail-karaf-commits-archive=karaf.apache.org@karaf.apache.org>
X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org
Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D7BD311DC4
	for <apmail-karaf-commits-archive@minotaur.apache.org>;
 Wed, 13 Aug 2014 20:20:11 +0000 (UTC)
Received: (qmail 41349 invoked by uid 500); 13 Aug 2014 20:20:11 -0000
Delivered-To: apmail-karaf-commits-archive@karaf.apache.org
Received: (qmail 41330 invoked by uid 500); 13 Aug 2014 20:20:10 -0000
Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@karaf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@karaf.apache.org>
List-Post: <mailto:commits@karaf.apache.org>
List-Id: <commits.karaf.apache.org>
Reply-To: dev@karaf.apache.org
Delivered-To: mailing list commits@karaf.apache.org
Received: (qmail 41320 invoked by uid 99); 13 Aug 2014 20:20:10 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2014 20:20:10 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id AB9AB9A5FE9; Wed, 13 Aug 2014 20:20:10 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: anierbeck@apache.org
To: commits@karaf.apache.org
Date: Wed, 13 Aug 2014 20:20:10 -0000
Message-Id: <25708616fa954a2f8da5efc00c932b0a@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/6] git commit: [KARAF-3167] - Document the configfile override
 behaviour

Repository: karaf
Updated Branches:
  refs/heads/karaf-2.3.x ba29f28ca -> 743e8cde8
  refs/heads/karaf-2.x f9302db1b -> 104ed8a9b
  refs/heads/master 9e42abd36 -> 4a53ed809


[KARAF-3167] - Document the configfile override behaviour

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/257acf79
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/257acf79
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/257acf79

Branch: refs/heads/master
Commit: 257acf7970f71388bfd675daee15326dcd2ec592
Parents: 4cc7fe8
Author: anierbeck <anierbeck@achims-mbp-15.fritz.box>
Authored: Wed Aug 13 21:59:52 2014 +0200
Committer: anierbeck <anierbeck@achims-mbp-15.fritz.box>
Committed: Wed Aug 13 22:02:42 2014 +0200

----------------------------------------------------------------------
 manual/src/main/webapp/users-guide/provisioning.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/257acf79/manual/src/main/webapp/users-guide/provisioning.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/provisioning.conf b/manual/src/main/webapp/users-guide/provisioning.conf
index 6090e09..78f9897 100644
--- a/manual/src/main/webapp/users-guide/provisioning.conf
+++ b/manual/src/main/webapp/users-guide/provisioning.conf
@@ -201,12 +201,14 @@ h2. Feature configuration files
 Instead of using the {{<config/>}} element, a feature can specify {{<configfile/>}} elements.
 
 {code:lang=xml}
-<configfile finalname="/etc/myfile.cfg">URL</configfile>
+<configfile finalname="/etc/myfile.cfg" override="false">URL</configfile>
 {code}
 
 Instead of directly manipulating the Apache Karaf configuration layer (as when using the {{<config/>}} element), the
 {{<configfile/>}} element takes directly a file specified by a URL, and copy the file in the location specified by the
-{{finalname}} attribute. The location is relative from the {{KARAF_BASE}} variable.
+{{finalname}} attribute. The location is relative from the {{KARAF_BASE}} variable. If the file is already present at
+the desired location it is kept and the deployment of the configuration file is skipped, as a already existing file might
+contain customization. This behaviour can be overriden by {{override}} set to true. 
 
 The file URL is any URL supported by Apache Karaf (see the [Artifacts repositories and URLs|urls] of the user guide for details).