Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61D0C10CF0 for ; Tue, 7 Jan 2014 19:49:30 +0000 (UTC) Received: (qmail 71572 invoked by uid 500); 7 Jan 2014 19:49:30 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 71509 invoked by uid 500); 7 Jan 2014 19:49:29 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 71488 invoked by uid 99); 7 Jan 2014 19:49:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jan 2014 19:49:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1113139E7B; Tue, 7 Jan 2014 19:49:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benoitc@apache.org To: commits@couchdb.apache.org Date: Tue, 07 Jan 2014 19:49:30 -0000 Message-Id: <0205a478af05416eb4f6c1da1c433de4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: updated refs/heads/1994-merge-rcouch to c1521cb fix path to futon Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ee937a6c Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ee937a6c Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ee937a6c Branch: refs/heads/1994-merge-rcouch Commit: ee937a6cf72d3311b836457b3a53e5416d966c55 Parents: 5037e16 Author: Benoit Chesneau Authored: Tue Jan 7 20:13:19 2014 +0100 Committer: Benoit Chesneau Committed: Tue Jan 7 20:13:19 2014 +0100 ---------------------------------------------------------------------- rel/files/couch.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee937a6c/rel/files/couch.ini ---------------------------------------------------------------------- diff --git a/rel/files/couch.ini b/rel/files/couch.ini index 2e13484..b1bb4c9 100644 --- a/rel/files/couch.ini +++ b/rel/files/couch.ini @@ -145,9 +145,9 @@ compaction_daemon={couch_compaction_daemon, start_link, []} [httpd_global_handlers] / = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>} -favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "%localdatadir%/www"} +favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{platform_share_dir}}/www"} -_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "%localdatadir%/www"} +_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{platform_share_dir}}/www"} _all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req} _active_tasks = {couch_httpd_misc_handlers, handle_task_status_req} _config = {couch_httpd_misc_handlers, handle_config_req}