You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2013/06/14 10:25:02 UTC
[05/32] git commit: updated
refs/heads/1781-reorganize-and-improve-docs to 11fd32a
Describe vendor config section.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7c8fe09f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7c8fe09f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7c8fe09f
Branch: refs/heads/1781-reorganize-and-improve-docs
Commit: 7c8fe09f7a49f4e1829acc2e3e3d6d9f3268f85b
Parents: 5082c24
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon Jun 10 20:44:11 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Jun 11 18:54:13 2013 +0400
----------------------------------------------------------------------
share/doc/build/Makefile.am | 3 +++
share/doc/src/config/index.rst | 1 +
share/doc/src/config/vendor.rst | 28 ++++++++++++++++++++++++++++
3 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c8fe09f/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index f768216..ca9c8a6 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -61,6 +61,7 @@ html_files = \
html/_sources/config/os-daemons.txt \
html/_sources/config/ssl.txt \
html/_sources/config/update-notification.txt \
+ html/_sources/config/vendor.txt \
html/_sources/config/vhosts.txt \
html/_sources/config/proxying.txt \
html/_sources/api-basics.txt \
@@ -113,6 +114,7 @@ html_files = \
html/config/os-daemons.html \
html/config/ssl.html \
html/config/update-notification.html \
+ html/config/vendor.html \
html/config/vhosts.html \
html/config/proxying.html \
html/api-basics.html \
@@ -163,6 +165,7 @@ src_files = \
../src/config/os-daemons.rst \
../src/config/ssl.rst \
../src/config/update-notification.rst \
+ ../src/config/vendor.rst \
../src/config/vhosts.rst \
../src/config/proxying.rst \
../src/api-basics.rst \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c8fe09f/share/doc/src/config/index.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/index.rst b/share/doc/src/config/index.rst
index 0d6fcb4..a052d62 100644
--- a/share/doc/src/config/index.rst
+++ b/share/doc/src/config/index.rst
@@ -54,6 +54,7 @@ Content:
os-daemons
ssl
update-notification
+ vendor
vhosts
proxying
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c8fe09f/share/doc/src/config/vendor.rst
----------------------------------------------------------------------
diff --git a/share/doc/src/config/vendor.rst b/share/doc/src/config/vendor.rst
new file mode 100644
index 0000000..cf970e4
--- /dev/null
+++ b/share/doc/src/config/vendor.rst
@@ -0,0 +1,28 @@
+.. 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/vendor:
+
+``[vendor]`` :: Vendor information
+==================================
+
+.. versionadded:: 1.3
+
+For CouchDB distributors there is option to explicitly define this information
+in welcome message::
+
+ [vendor]
+ name = The Apache Software Foundation
+ version = 1.3.0
+