From b7dd6bea32ffe7c207a1ee127ca16d78cfa180ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= <fx.prunayre@gmail.com>
Date: Wed, 8 Jun 2016 14:52:44 +0200
Subject: [PATCH] Group api and doc in one folder.

---
 .gitignore                                                     | 3 ++-
 .../webapp/WEB-INF/config-security/config-security-core.xml    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 73b329cc9a4..a8e8d53946f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,7 @@ datadir_*
 solr/solr-config/solr-*
 web/src/main/webapp/WEB-INF/data/harvester_*
 camel-harvesters/wfsfeature-harvester/logs
-web/src/main/webapp/doc
+web/src/main/webapp/doc/en
+web/src/main/webapp/doc/fr
 web/src/main/webapp/WEB-INF/data/data/backup
 schemas/*/doc/*/*.rst
diff --git a/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml b/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml
index abb09ead85f..31d3a4d15d7 100644
--- a/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml
+++ b/web/src/main/webapp/WEB-INF/config-security/config-security-core.xml
@@ -41,7 +41,6 @@
         <sec:filter-chain pattern="/srv/swagger-resources/**" filters=""/>
         <sec:filter-chain pattern="/srv/v2/**" filters=""/>
         <sec:filter-chain pattern="/doc/**" filters=""/>
-        <sec:filter-chain pattern="/api-doc/**" filters=""/>
         <sec:filter-chain pattern="/proxy**" filters=""/>
         <!-- wroAPI is protected for admin only -->
         <sec:filter-chain pattern="/static/(!wroAPI)" filters=""/>