You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2012/09/29 18:47:25 UTC
[1/2] git commit: fixing up license issues
Updated Branches:
refs/heads/docs c19a1c209 -> 87aca990c
fixing up license issues
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/87aca990
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/87aca990
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/87aca990
Branch: refs/heads/docs
Commit: 87aca990c1eae3267dfca19e57c56434e246b9e3
Parents: 1b76b08
Author: Noah Slater <ns...@apache.org>
Authored: Sat Sep 29 17:47:11 2012 +0100
Committer: Noah Slater <ns...@apache.org>
Committed: Sat Sep 29 17:47:11 2012 +0100
----------------------------------------------------------------------
license.skip | 3 +++
share/doc/Makefile.am | 3 +--
share/doc/demo.mk | 13 ++++++++++++-
share/doc/make.bat | 12 ++++++++++++
4 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/87aca990/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 8ee890f..c3c2f22 100644
--- a/license.skip
+++ b/license.skip
@@ -56,6 +56,9 @@
^m4/*
^share/Makefile
^share/Makefile.in
+^share/doc/Makefile
+^share/doc/Makefile.in
+^share/doc/images/*
^share/server/json2.js
^share/server/mimeparse.js
^share/server/coffee-script.js
http://git-wip-us.apache.org/repos/asf/couchdb/blob/87aca990/share/doc/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/Makefile.am b/share/doc/Makefile.am
index 0a039f5..c0271d4 100644
--- a/share/doc/Makefile.am
+++ b/share/doc/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = \
images/futon-replform.png \
make.bat \
Makefile.am \
- src/_static \
src/api/authn.rst \
src/api/configuration.rst \
src/api/database.rst \
@@ -50,4 +49,4 @@ EXTRA_DIST = \
src/range.rst \
src/release.rst \
src/replication.rst \
- src/ssl.rst
\ No newline at end of file
+ src/ssl.rst
http://git-wip-us.apache.org/repos/asf/couchdb/blob/87aca990/share/doc/demo.mk
----------------------------------------------------------------------
diff --git a/share/doc/demo.mk b/share/doc/demo.mk
index 28a1541..9e79f4b 100644
--- a/share/doc/demo.mk
+++ b/share/doc/demo.mk
@@ -1,5 +1,16 @@
+## 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.
+
# Makefile for Sphinx documentation
-#
# You can set these variables from the command line.
SPHINXOPTS =
http://git-wip-us.apache.org/repos/asf/couchdb/blob/87aca990/share/doc/make.bat
----------------------------------------------------------------------
diff --git a/share/doc/make.bat b/share/doc/make.bat
index 4994199..bf354c9 100644
--- a/share/doc/make.bat
+++ b/share/doc/make.bat
@@ -1,3 +1,15 @@
+:: 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.
+
@ECHO OFF
REM Command file for Sphinx documentation