This is an automated email from the ASF dual-hosted git repository.
dbarnes pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/geode-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 5cc07e7 GEODE-6213 Redirect http: to https: Add license, delete
separate htacess from the docs subdirectory
5cc07e7 is described below
commit 5cc07e7c484abf8a0f2c6c89fd08bd9c290bb581
Author: Dave Barnes <dbar...@pivotal.io>
AuthorDate: Mon Dec 17 17:21:57 2018 -0800
GEODE-6213 Redirect http: to https: Add license, delete separate htacess
from the docs subdirectory
---
.htaccess | 19 +++++++++++++++++--
docs/.htaccess | 17 -----------------
2 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/.htaccess b/.htaccess
index 0152e4c..c2f2675 100755
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,18 @@
-# Redirect http://geode.apache.org https://geode.apache.org
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+RewriteEngine On
RewriteCond %{HTTPS} !=on
-RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R,L]
\ No newline at end of file
+RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R,L]
diff --git a/docs/.htaccess b/docs/.htaccess
deleted file mode 100644
index 23497fb..0000000
--- a/docs/.htaccess
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-
-RewriteEngine On
-RewriteRule ^guide/latest/(.*)$ /docs/guide/12/$1 [NC,L,PT]
