couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [21/32] git commit: updated refs/heads/1781-reorganize-and-improve-docs to 11fd32a
Date Fri, 14 Jun 2013 08:25:18 GMT
Merge compaction-daemon.rst into compaction.rst


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5a60ee7b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5a60ee7b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5a60ee7b

Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: 5a60ee7bb06591a15a8a0398cd1b117723e5488e
Parents: 231d064
Author: Alexander Shorin <kxepal@apache.org>
Authored: Wed Jun 12 16:03:44 2013 +0400
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Wed Jun 12 16:06:30 2013 +0400

----------------------------------------------------------------------
 share/doc/build/Makefile.am                |  3 --
 share/doc/src/config/compaction-daemon.rst | 47 -------------------------
 share/doc/src/config/compaction.rst        | 34 ++++++++++++++++++
 share/doc/src/config/index.rst             |  1 -
 4 files changed, 34 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a60ee7b/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 807aaed..b8a6cd4 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -56,7 +56,6 @@ html_files = \
     html/_sources/config/admins.txt \
     html/_sources/config/attachments.txt \
     html/_sources/config/compaction.txt \
-    html/_sources/config/compaction-daemon.txt \
     html/_sources/config/cors.txt \
     html/_sources/config/couch-httpd-auth.txt \
     html/_sources/config/couchdb.txt \
@@ -121,7 +120,6 @@ html_files = \
     html/config/admins.html \
     html/config/attachments.html \
     html/config/compaction.html \
-    html/config/compaction-daemon.html \
     html/config/cors.html \
     html/config/couch-httpd-auth.html \
     html/config/couchdb.html \
@@ -184,7 +182,6 @@ src_files = \
     ../src/config/admins.rst \
     ../src/config/attachments.rst \
     ../src/config/compaction.rst \
-    ../src/config/compaction-daemon.rst \
     ../src/config/cors.rst \
     ../src/config/couch-httpd-auth.rst \
     ../src/config/couchdb.rst \

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a60ee7b/share/doc/src/config/compaction-daemon.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/compaction-daemon.rst b/share/doc/src/config/compaction-daemon.rst
deleted file mode 100644
index 67f05ab..0000000
--- a/share/doc/src/config/compaction-daemon.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-.. Licensed under the Apache License, Version 2.0 (the "License")you may not
-.. use this file except in compliance with the License. You may obtain a copy of
-.. the License at
-..
-..   http://www.apache.org/licenses/LICENSE-2.0
-..
-.. Unless required by applicable law or agreed to in writing, software
-.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-.. License for the specific language governing permissions and limitations under
-.. the License.
-
-.. highlight:: ini
-
-.. _config/compaction_daemon:
-
-``[compaction_daemon]`` :: Configuration of Compaction Daemon
-=============================================================
-
-These options are under ``[compaction_daemon]`` section and belong to
-:ref:`compaction daemon <config/daemons/compaction_daemon>`.
-
-
-.. _config/compaction_daemon/check_interval:
-
-``check_interval``
-------------------
-
-The delay, in seconds, between each check for which database and view indexes
-need to be compacted::
-
-  [compaction_daemon]
-  check_interval = 300
-
-
-.. _config/compaction_daemon/min_file_size:
-
-``min_file_size``
------------------
-
-If a database or view index file is smaller then this value (in bytes),
-compaction will not happen. Very small files always have a very high
-fragmentation therefore it's not worth to compact them::
-
-  [compaction_daemon]
-  min_file_size = 131072
-

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a60ee7b/share/doc/src/config/compaction.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/compaction.rst b/share/doc/src/config/compaction.rst
index af377db..f609e0e 100644
--- a/share/doc/src/config/compaction.rst
+++ b/share/doc/src/config/compaction.rst
@@ -101,3 +101,37 @@ Examples:
    compacted in parallel.
 
 
+.. _config/compaction_daemon:
+
+``[compaction_daemon]`` :: Configuration of Compaction Daemon
+=============================================================
+
+These options are under ``[compaction_daemon]`` section and belong to
+:ref:`compaction daemon <config/daemons/compaction_daemon>`.
+
+
+.. _config/compaction_daemon/check_interval:
+
+``check_interval``
+------------------
+
+The delay, in seconds, between each check for which database and view indexes
+need to be compacted::
+
+  [compaction_daemon]
+  check_interval = 300
+
+
+.. _config/compaction_daemon/min_file_size:
+
+``min_file_size``
+-----------------
+
+If a database or view index file is smaller then this value (in bytes),
+compaction will not happen. Very small files always have a very high
+fragmentation therefore it's not worth to compact them::
+
+  [compaction_daemon]
+  min_file_size = 131072
+
+

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a60ee7b/share/doc/src/config/index.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/index.rst b/share/doc/src/config/index.rst
index cc4106f..45701fe 100644
--- a/share/doc/src/config/index.rst
+++ b/share/doc/src/config/index.rst
@@ -50,7 +50,6 @@ Content:
    admins
    attachments
    compaction
-   compaction-daemon
    cors
    couch-httpd-auth
    couchdb


Mime
View raw message