diff options
Diffstat (limited to 'src/site')
| -rw-r--r-- | src/site/asciidoc/apex-publications.adoc | 3 | ||||
| -rw-r--r-- | src/site/asciidoc/user-manual/install/um-install-resteditor.adoc | 14 | ||||
| -rw-r--r-- | src/site/asciidoc/user-manual/install/um-install-wars.adoc (renamed from src/site/asciidoc/user-manual/install/um-install-monitoring.adoc) | 2 | ||||
| -rw-r--r-- | src/site/site.xml | 3 | ||||
| -rw-r--r-- | src/site/xdoc/index.xml | 5 |
5 files changed, 8 insertions, 19 deletions
diff --git a/src/site/asciidoc/apex-publications.adoc b/src/site/asciidoc/apex-publications.adoc index dbf5ce8eb..6c030aeb4 100644 --- a/src/site/asciidoc/apex-publications.adoc +++ b/src/site/asciidoc/apex-publications.adoc @@ -25,6 +25,8 @@ include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-20 include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018a.adoc[leveloffset=+1] +include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018d.adoc[leveloffset=+1] + include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018c.adoc[leveloffset=+1] @@ -43,3 +45,4 @@ include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/5g-20 include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018b.adoc[leveloffset=+1] +include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018e.adoc[leveloffset=+1] diff --git a/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc b/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc deleted file mode 100644 index 1d2741ab5..000000000 --- a/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc +++ /dev/null @@ -1,14 +0,0 @@ -// -// ============LICENSE_START======================================================= -// Copyright (C) 2016-2018 Ericsson. All rights reserved. -// ================================================================================ -// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE -// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode -// -// SPDX-License-Identifier: CC-BY-4.0 -// ============LICENSE_END========================================================= -// -// @author Sven van der Meer (sven.van.der.meer@ericsson.com) -// - -include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install-resteditor.adoc[] diff --git a/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc b/src/site/asciidoc/user-manual/install/um-install-wars.adoc index 79889ec97..1640bc957 100644 --- a/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc +++ b/src/site/asciidoc/user-manual/install/um-install-wars.adoc @@ -11,4 +11,4 @@ // @author Sven van der Meer (sven.van.der.meer@ericsson.com) // -include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install-monitoring.adoc[] +include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install-wars.adoc[] diff --git a/src/site/site.xml b/src/site/site.xml index 20d77ae4e..11ae2c15a 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -36,8 +36,7 @@ <item href="user-manual/install/um-install-layout.html" name="Final Layout" /> <item href="user-manual/install/um-install-configure.html" name="System Configuration" /> <item href="user-manual/install/um-install-verify.html" name="Verify Installation" /> - <item href="user-manual/install/um-install-monitoring.html" name="Install Monitoring" /> - <item href="user-manual/install/um-install-resteditor.html" name="Install REST Editor" /> + <item href="user-manual/install/um-install-wars.html" name="Install WARs" /> <item href="user-manual/install/um-install-docker.html" name="APEX in Docker" /> </item> diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index fe215c5dc..a18539b3c 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -140,7 +140,7 @@ <li><a href="modules/examples/examples-pcvs/index.html">examples-pcvs</a> - An example policy for managing customers and link failures showing video streaming for a simple VPN scenario</li> <li><a href="modules/examples/examples-onap-vcpe/index.html">examples-onap-vcpe</a> - An example policy for managing vCPE's in ONAP</li> <li><a href="modules/examples/examples-periodic/index.html">examples-periodic</a> - An example periodic policy</li> - <li><a href="modules/examples/examples-servlet/index.html">examples-aadm</a> - An APEX Servlet Example</li> + <li><a href="modules/examples/examples-servlet/index.html">examples-servlet</a> - An APEX Servlet Example</li> <li><a href="modules/examples/examples-adaptive/index.html">examples-adaptive</a> - A simple adaptive policy</li> <li><a href="modules/examples/examples-aadm/index.html">examples-aadm</a> - A policy realizing a complex scenario for Autonomic Anomaly Detection and Mitigation (AADM)</li> </ul> @@ -307,9 +307,10 @@ </td> </tr> <tr> - <td><a href="https://github.com/Ericsson/apex/issues">APEX Issue Management (Github)</a></td> + <td><a href="https://jira.onap.org/projects/POLICY/issues">APEX Issue Management (ONAP, JIRA)</a></td> <td> Issues with the APEX software and integrated documentation are managed here. + This link requires a Linux Foundation ID. </td> </tr> </table> |