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 5D7CDDEEC for ; Wed, 13 Mar 2013 20:58:31 +0000 (UTC) Received: (qmail 33665 invoked by uid 500); 13 Mar 2013 20:58:31 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 33634 invoked by uid 500); 13 Mar 2013 20:58:31 -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 33625 invoked by uid 99); 13 Mar 2013 20:58:31 -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 Mar 2013 20:58:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CBD0216128; Wed, 13 Mar 2013 20:58:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randall@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: add pbkdf2 iterations config to docs Message-Id: <20130313205830.CBD0216128@tyr.zones.apache.org> Date: Wed, 13 Mar 2013 20:58:30 +0000 (UTC) Updated Branches: refs/heads/master 2cc063040 -> 7c0beca00 add pbkdf2 iterations config to docs Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7c0beca0 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7c0beca0 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7c0beca0 Branch: refs/heads/master Commit: 7c0beca002a9c2fce33d187065a24073921ea997 Parents: 2cc0630 Author: Randall Leeds Authored: Wed Mar 13 13:57:27 2013 -0700 Committer: Randall Leeds Committed: Wed Mar 13 13:57:27 2013 -0700 ---------------------------------------------------------------------- share/doc/src/config_reference.rst | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c0beca0/share/doc/src/config_reference.rst ---------------------------------------------------------------------- diff --git a/share/doc/src/config_reference.rst b/share/doc/src/config_reference.rst index 7ae761a..d73d14b 100644 --- a/share/doc/src/config_reference.rst +++ b/share/doc/src/config_reference.rst @@ -149,6 +149,8 @@ couch_httpd_auth Configuration Options +--------------------------------------+---------------------------------------+ | timeout | timeout | +--------------------------------------+---------------------------------------+ +| iterations | Password key derivation iterations | ++--------------------------------------+---------------------------------------+ httpd Configuration Options ---------------------------