From 7fe758deff1fd4db0ee4e0b4f67e0cacb02e9191 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 10 Dec 2018 10:19:44 +0100 Subject: [PATCH] DATAREST-1317 - Simplify reference documentation setup. Adapt includes paths to generated asciidoctor sources directory. --- src/main/asciidoc/etags-and-other-conditionals.adoc | 2 +- src/main/asciidoc/index.adoc | 11 ++--------- src/main/asciidoc/integration.adoc | 2 +- src/main/asciidoc/security.adoc | 2 +- src/main/asciidoc/tools.adoc | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/asciidoc/etags-and-other-conditionals.adoc b/src/main/asciidoc/etags-and-other-conditionals.adoc index dbfcef41a..6215fa2b3 100644 --- a/src/main/asciidoc/etags-and-other-conditionals.adoc +++ b/src/main/asciidoc/etags-and-other-conditionals.adoc @@ -1,6 +1,6 @@ [[conditional]] = Conditional Operations with Headers -:spring-data-rest-root: ../../.. +:spring-data-rest-root: ../../../.. This section shows how Spring Data REST uses standard HTTP headers to enhance performance, conditionalize operations, and contribute to a more sophisticated frontend. diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index ff37b3524..c2df4d215 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -3,22 +3,15 @@ Jon Brisbin, Oliver Gierke, Greg Turnquist, Jay Bryant :revnumber: {version} :revdate: {localdate} -:linkcss: -:doctype: book -:docinfo: shared -:toc: -:toc-placement!: -:source-highlighter: prettify -:icons: font -:imagesdir: images ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]] -:spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc +:spring-data-commons-docs: ../../../../../spring-data-commons/src/main/asciidoc (C) 2012-2018 Original authors NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically. include::preface.adoc[] + include::{spring-data-commons-docs}/dependencies.adoc[leveloffset=+1] [[reference]] diff --git a/src/main/asciidoc/integration.adoc b/src/main/asciidoc/integration.adoc index 6c3a57f24..e031007b7 100644 --- a/src/main/asciidoc/integration.adoc +++ b/src/main/asciidoc/integration.adoc @@ -1,6 +1,6 @@ [[integration]] = Integration -:spring-data-rest-root: ../../.. +:spring-data-rest-root: ../../../.. This section details various ways to integrate with Spring Data REST components, whether from a Spring application that is using Spring Data REST or from other means. diff --git a/src/main/asciidoc/security.adoc b/src/main/asciidoc/security.adoc index 5b28a490f..32d855025 100644 --- a/src/main/asciidoc/security.adoc +++ b/src/main/asciidoc/security.adoc @@ -1,6 +1,6 @@ [[security]] = Security -:spring-data-rest-root: ../../.. +:spring-data-rest-root: ../../../.. :spring-security-docs: http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle Spring Data REST works quite well with Spring Security. This section shows examples of how to secure your Spring Data REST services with method-level security. diff --git a/src/main/asciidoc/tools.adoc b/src/main/asciidoc/tools.adoc index 4757043d5..1d36d0164 100644 --- a/src/main/asciidoc/tools.adoc +++ b/src/main/asciidoc/tools.adoc @@ -1,6 +1,6 @@ [[tools]] = Tools -:spring-data-rest-root: ../../.. +:spring-data-rest-root: ../../../.. == The HAL Browser