You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/05/22 19:05:46 UTC
[24/32] git commit: updated refs/heads/fauxton-view-improvements to
8babf7e
docs: cut useless section on file permission error messages
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6c7bfa77
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6c7bfa77
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6c7bfa77
Branch: refs/heads/fauxton-view-improvements
Commit: 6c7bfa77c9ce06eba62f4f1a6488adfe20e5e69a
Parents: 310050a
Author: Dirkjan Ochtman <dj...@apache.org>
Authored: Tue May 21 21:47:37 2013 +0200
Committer: Dirkjan Ochtman <dj...@apache.org>
Committed: Tue May 21 22:00:05 2013 +0200
----------------------------------------------------------------------
share/doc/build/Makefile.am | 3 ---
share/doc/src/errors.rst | 37 -------------------------------------
share/doc/src/index.rst | 1 -
3 files changed, 0 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c7bfa77/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 73de281..e8a7ebc 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -60,7 +60,6 @@ html_files = \
html/_sources/configuring.txt \
html/_sources/contributing.txt \
html/_sources/ddocs.txt \
- html/_sources/errors.txt \
html/_sources/index.txt \
html/_sources/intro.txt \
html/_sources/json-structure.txt \
@@ -104,7 +103,6 @@ html_files = \
html/config_reference.html \
html/configuring.html \
html/ddocs.html \
- html/errors.html \
html/index.html \
html/intro.html \
html/json-structure.html \
@@ -148,7 +146,6 @@ src_files = \
../src/configuring.rst \
../src/contributing.rst \
../src/ddocs.rst \
- ../src/errors.rst \
../src/index.rst \
../src/intro.rst \
../src/json-structure.rst \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c7bfa77/share/doc/src/errors.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/errors.rst b/share/doc/src/errors.rst
deleted file mode 100644
index 431ff91..0000000
--- a/share/doc/src/errors.rst
+++ /dev/null
@@ -1,37 +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.
-
-Error Messages
-==============
-
-The errors reported when CouchDB is unable to read a required file have
-been updated so that explicit information about the files and problem
-can now be identified from the error message. The errors report file
-permission access either when reading or writing to configuration and
-database files.
-
-The error is raised both through the log file and the error message
-returned through the API call as a JSON error message. For example, when
-setting configuration values:
-
-.. code-block:: bash
-
- shell> curl -X PUT http://couchdb:5984/_config/couchdb/delayed_commits \
- -H 'X-Couch-Persist: true' -d '"false"'
- {"error":"file_permission_error","reason":"/etc/couchdb/local.ini"}
-
-Errors will always be reported using the ``file_permission_error`` error
-type.
-
-During startup permissions errors on key files are also reported in the
-log with a descriptive error message and file location so that
-permissions can be fixed before restart.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c7bfa77/share/doc/src/index.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/index.rst b/share/doc/src/index.rst
index 48df77c..91c4e16 100644
--- a/share/doc/src/index.rst
+++ b/share/doc/src/index.rst
@@ -34,7 +34,6 @@ Contents
replication
ddocs
query-servers
- errors
changes
release
api/reference