From 1bd8cddc8eef5d46b6ee557704f3404ac2d31d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= Date: Wed, 10 Feb 2016 13:23:13 +0100 Subject: [PATCH] Add new 3.x docs as submodule. --- .gitmodules | 3 +++ docs/README.md | 11 ++++++++--- docs/manuals | 1 + docs/pom.xml | 22 ---------------------- pom.xml | 3 +-- 5 files changed, 13 insertions(+), 27 deletions(-) create mode 160000 docs/manuals delete mode 100644 docs/pom.xml diff --git a/.gitmodules b/.gitmodules index 538199e8b04..c5f57592c26 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ [submodule "web-ui/src/main/resources/catalog/lib/bootstrap-table"] path = web-ui/src/main/resources/catalog/lib/bootstrap-table url = https://github.com/wenzhixin/bootstrap-table.git +[submodule "docs/manuals"] + path = docs/manuals + url = https://github.com/geonetwork/doc.git diff --git a/docs/README.md b/docs/README.md index 31483b3f288..5eb45d9295f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,9 @@ -doc-sources -=========== +Documentation +============= -Documentation sources for geonetwork documentation \ No newline at end of file +This module contains: +* Documentation in RST format +* Change logs +* Copyright template +* Licenses for library +* Utility folder with scripts to generate extra docs \ No newline at end of file diff --git a/docs/manuals b/docs/manuals new file mode 160000 index 00000000000..b91c85e10a8 --- /dev/null +++ b/docs/manuals @@ -0,0 +1 @@ +Subproject commit b91c85e10a8d215aa3b7dd4883a485fb4f0cd9cc diff --git a/docs/pom.xml b/docs/pom.xml deleted file mode 100644 index f2f6f189459..00000000000 --- a/docs/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - - org.geonetwork-opensource - geonetwork - 3.1.0-SNAPSHOT - - - org.geonetwork-opensource - geonetwork-docs - GeoNetwork Documentation module - GeoNetwork documentation in HTML and PDF format. - - - - General Public License (GPL) - http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - - - diff --git a/pom.xml b/pom.xml index fd90a16e102..fa7e95f7ce7 100644 --- a/pom.xml +++ b/pom.xml @@ -1112,11 +1112,10 @@ geoserver - with-doc - docs + docs/manuals