From 0761e7da39960c4e7125b51b9e29c20bf8bbb706 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 16 Feb 2022 15:51:08 +0100 Subject: [PATCH 01/12] iox-#743 Move 'examples' section and rename it to 'tutorials' Signed-off-by: Simon Hoinkis --- doc/website/.pages | 3 ++- doc/website/{getting-started/examples => tutorials}/.pages | 0 .../{getting-started/examples => tutorials}/callbacks.md | 0 .../{getting-started/examples => tutorials}/callbacks_in_c.md | 0 .../{getting-started/examples => tutorials}/complexdata.md | 0 .../examples => tutorials}/ice_access_control.md | 0 .../{getting-started/examples => tutorials}/icecrystal.md | 0 .../{getting-started/examples => tutorials}/icedelivery.md | 0 .../examples => tutorials}/icedelivery_in_c.md | 0 .../{getting-started/examples => tutorials}/icedocker.md | 0 .../{getting-started/examples => tutorials}/iceensemble.md | 0 .../{getting-started/examples => tutorials}/icehello.md | 0 .../{getting-started/examples => tutorials}/iceoptions.md | 0 doc/website/{getting-started/examples => tutorials}/iceperf.md | 0 doc/website/{getting-started/examples => tutorials}/index.md | 0 .../{getting-started/examples => tutorials}/singleprocess.md | 0 .../{getting-started/examples => tutorials}/user_header.md | 0 doc/website/{getting-started/examples => tutorials}/waitset.md | 0 .../{getting-started/examples => tutorials}/waitset_in_c.md | 0 19 files changed, 2 insertions(+), 1 deletion(-) rename doc/website/{getting-started/examples => tutorials}/.pages (100%) rename doc/website/{getting-started/examples => tutorials}/callbacks.md (100%) rename doc/website/{getting-started/examples => tutorials}/callbacks_in_c.md (100%) rename doc/website/{getting-started/examples => tutorials}/complexdata.md (100%) rename doc/website/{getting-started/examples => tutorials}/ice_access_control.md (100%) rename doc/website/{getting-started/examples => tutorials}/icecrystal.md (100%) rename doc/website/{getting-started/examples => tutorials}/icedelivery.md (100%) rename doc/website/{getting-started/examples => tutorials}/icedelivery_in_c.md (100%) rename doc/website/{getting-started/examples => tutorials}/icedocker.md (100%) rename doc/website/{getting-started/examples => tutorials}/iceensemble.md (100%) rename doc/website/{getting-started/examples => tutorials}/icehello.md (100%) rename doc/website/{getting-started/examples => tutorials}/iceoptions.md (100%) rename doc/website/{getting-started/examples => tutorials}/iceperf.md (100%) rename doc/website/{getting-started/examples => tutorials}/index.md (100%) rename doc/website/{getting-started/examples => tutorials}/singleprocess.md (100%) rename doc/website/{getting-started/examples => tutorials}/user_header.md (100%) rename doc/website/{getting-started/examples => tutorials}/waitset.md (100%) rename doc/website/{getting-started/examples => tutorials}/waitset_in_c.md (100%) diff --git a/doc/website/.pages b/doc/website/.pages index c555be266a..3d52d8d0c1 100644 --- a/doc/website/.pages +++ b/doc/website/.pages @@ -1,6 +1,7 @@ nav: - index.md - getting-started - - API-reference + - tutorials - FAQ.md - advanced + - API-reference diff --git a/doc/website/getting-started/examples/.pages b/doc/website/tutorials/.pages similarity index 100% rename from doc/website/getting-started/examples/.pages rename to doc/website/tutorials/.pages diff --git a/doc/website/getting-started/examples/callbacks.md b/doc/website/tutorials/callbacks.md similarity index 100% rename from doc/website/getting-started/examples/callbacks.md rename to doc/website/tutorials/callbacks.md diff --git a/doc/website/getting-started/examples/callbacks_in_c.md b/doc/website/tutorials/callbacks_in_c.md similarity index 100% rename from doc/website/getting-started/examples/callbacks_in_c.md rename to doc/website/tutorials/callbacks_in_c.md diff --git a/doc/website/getting-started/examples/complexdata.md b/doc/website/tutorials/complexdata.md similarity index 100% rename from doc/website/getting-started/examples/complexdata.md rename to doc/website/tutorials/complexdata.md diff --git a/doc/website/getting-started/examples/ice_access_control.md b/doc/website/tutorials/ice_access_control.md similarity index 100% rename from doc/website/getting-started/examples/ice_access_control.md rename to doc/website/tutorials/ice_access_control.md diff --git a/doc/website/getting-started/examples/icecrystal.md b/doc/website/tutorials/icecrystal.md similarity index 100% rename from doc/website/getting-started/examples/icecrystal.md rename to doc/website/tutorials/icecrystal.md diff --git a/doc/website/getting-started/examples/icedelivery.md b/doc/website/tutorials/icedelivery.md similarity index 100% rename from doc/website/getting-started/examples/icedelivery.md rename to doc/website/tutorials/icedelivery.md diff --git a/doc/website/getting-started/examples/icedelivery_in_c.md b/doc/website/tutorials/icedelivery_in_c.md similarity index 100% rename from doc/website/getting-started/examples/icedelivery_in_c.md rename to doc/website/tutorials/icedelivery_in_c.md diff --git a/doc/website/getting-started/examples/icedocker.md b/doc/website/tutorials/icedocker.md similarity index 100% rename from doc/website/getting-started/examples/icedocker.md rename to doc/website/tutorials/icedocker.md diff --git a/doc/website/getting-started/examples/iceensemble.md b/doc/website/tutorials/iceensemble.md similarity index 100% rename from doc/website/getting-started/examples/iceensemble.md rename to doc/website/tutorials/iceensemble.md diff --git a/doc/website/getting-started/examples/icehello.md b/doc/website/tutorials/icehello.md similarity index 100% rename from doc/website/getting-started/examples/icehello.md rename to doc/website/tutorials/icehello.md diff --git a/doc/website/getting-started/examples/iceoptions.md b/doc/website/tutorials/iceoptions.md similarity index 100% rename from doc/website/getting-started/examples/iceoptions.md rename to doc/website/tutorials/iceoptions.md diff --git a/doc/website/getting-started/examples/iceperf.md b/doc/website/tutorials/iceperf.md similarity index 100% rename from doc/website/getting-started/examples/iceperf.md rename to doc/website/tutorials/iceperf.md diff --git a/doc/website/getting-started/examples/index.md b/doc/website/tutorials/index.md similarity index 100% rename from doc/website/getting-started/examples/index.md rename to doc/website/tutorials/index.md diff --git a/doc/website/getting-started/examples/singleprocess.md b/doc/website/tutorials/singleprocess.md similarity index 100% rename from doc/website/getting-started/examples/singleprocess.md rename to doc/website/tutorials/singleprocess.md diff --git a/doc/website/getting-started/examples/user_header.md b/doc/website/tutorials/user_header.md similarity index 100% rename from doc/website/getting-started/examples/user_header.md rename to doc/website/tutorials/user_header.md diff --git a/doc/website/getting-started/examples/waitset.md b/doc/website/tutorials/waitset.md similarity index 100% rename from doc/website/getting-started/examples/waitset.md rename to doc/website/tutorials/waitset.md diff --git a/doc/website/getting-started/examples/waitset_in_c.md b/doc/website/tutorials/waitset_in_c.md similarity index 100% rename from doc/website/getting-started/examples/waitset_in_c.md rename to doc/website/tutorials/waitset_in_c.md From 0283522bc1a38eaaaa2f4566120a2687f3c1a518 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 16 Feb 2022 16:50:30 +0100 Subject: [PATCH 02/12] iox-#743 Update used tools version and add GIF Signed-off-by: Simon Hoinkis --- doc/website/getting-started/overview.md | 2 +- tools/website/export-docu-to-website.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/website/getting-started/overview.md b/doc/website/getting-started/overview.md index 7c10c0b33c..3c475cd159 100644 --- a/doc/website/getting-started/overview.md +++ b/doc/website/getting-started/overview.md @@ -117,7 +117,7 @@ Afterwards, we can start the applications which immediately connect to the RouDi When the application terminates, the runtime cleans up all resources needed for communication with RouDi. This includes all memory chunks used for the data transmission which may still be held by the application. - +![Overview](https://user-images.githubusercontent.com/8661268/74612998-b962bc80-510a-11ea-97f0-62f41c5d287b.gif) We now briefly define the main entities of an iceoryx system which were partially already used in the example above. diff --git a/tools/website/export-docu-to-website.sh b/tools/website/export-docu-to-website.sh index 8cc1dca89d..50c5d3fc87 100755 --- a/tools/website/export-docu-to-website.sh +++ b/tools/website/export-docu-to-website.sh @@ -17,12 +17,12 @@ # SPDX-License-Identifier: Apache-2.0 # Necessary tools: -# mkdocs-awesome-pages-plugin, v2.5.0 -# mkdocs-material, v7.0.7+insiders.2.5.0 +# mkdocs-awesome-pages-plugin, v2.6.0 +# mkdocs-material, v8.1.3-insiders-4.5.0q # markdown-include, v0.6.0 -# mkdocs, v1.1.2 -# Doxygen, 1.8.17 -# doxybook2, v1.3.1 +# mkdocs, v1.2.3 +# Doxygen, v1.9.1 +# doxybook2, v1.3.3 # mike, v1.0.0 set -e From baaba1b80b5fe2fa757a77ef34801adb0189e873 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 16 Feb 2022 17:11:44 +0100 Subject: [PATCH 03/12] iox-#743 Add concepts, releases notes and design Signed-off-by: Simon Hoinkis --- doc/website/.pages | 3 +++ doc/website/concepts/architecture.md | 1 + doc/website/design/service-discovery.md | 5 +++++ doc/website/release-notes/releases-notes.md | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 doc/website/concepts/architecture.md create mode 100644 doc/website/design/service-discovery.md create mode 100644 doc/website/release-notes/releases-notes.md diff --git a/doc/website/.pages b/doc/website/.pages index 3d52d8d0c1..8c93e6660c 100644 --- a/doc/website/.pages +++ b/doc/website/.pages @@ -1,7 +1,10 @@ nav: - index.md - getting-started + - concepts - tutorials + - design - FAQ.md - advanced + - Release notes - API-reference diff --git a/doc/website/concepts/architecture.md b/doc/website/concepts/architecture.md new file mode 100644 index 0000000000..c7d8fc7341 --- /dev/null +++ b/doc/website/concepts/architecture.md @@ -0,0 +1 @@ +# Eclipse iceoryx architecture diff --git a/doc/website/design/service-discovery.md b/doc/website/design/service-discovery.md new file mode 100644 index 0000000000..7614ea079c --- /dev/null +++ b/doc/website/design/service-discovery.md @@ -0,0 +1,5 @@ +--- +title: Service discovery +--- + +{! ../iceoryx/doc/design/service-discovery.md !} diff --git a/doc/website/release-notes/releases-notes.md b/doc/website/release-notes/releases-notes.md new file mode 100644 index 0000000000..28c59db607 --- /dev/null +++ b/doc/website/release-notes/releases-notes.md @@ -0,0 +1,5 @@ +--- +title: Changelog +--- + +{! ../iceoryx/CHANGELOG.md !} From 0eb2f999437ba6eebadcdb99d21c0eaedbabd5ff Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 16 Feb 2022 17:44:52 +0100 Subject: [PATCH 04/12] iox-#743 Fix MkDocs issues Signed-off-by: Simon Hoinkis --- doc/website/.pages | 2 +- doc/website/getting-started/.pages | 1 - doc/website/release-notes/{releases-notes.md => change-log.md} | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename doc/website/release-notes/{releases-notes.md => change-log.md} (100%) diff --git a/doc/website/.pages b/doc/website/.pages index 8c93e6660c..33b758f7fe 100644 --- a/doc/website/.pages +++ b/doc/website/.pages @@ -6,5 +6,5 @@ nav: - design - FAQ.md - advanced - - Release notes + - release-notes - API-reference diff --git a/doc/website/getting-started/.pages b/doc/website/getting-started/.pages index 6c26ce6be8..76d6ad9dd9 100644 --- a/doc/website/getting-started/.pages +++ b/doc/website/getting-started/.pages @@ -2,4 +2,3 @@ nav: - what-is-iceoryx.md - overview.md - installation.md - - examples diff --git a/doc/website/release-notes/releases-notes.md b/doc/website/release-notes/change-log.md similarity index 100% rename from doc/website/release-notes/releases-notes.md rename to doc/website/release-notes/change-log.md From be4a46355f4a80860b875e4495d6cba0dbcb7425 Mon Sep 17 00:00:00 2001 From: Simon Hoinkis Date: Wed, 16 Feb 2022 18:47:08 +0100 Subject: [PATCH 05/12] iox-#743 Update custom footer to latest MkDocs-Material version Signed-off-by: Simon Hoinkis --- doc/website/overrides/partials/footer.html | 22 ++++++++-------------- doc/website/stylesheets/extra.css | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/doc/website/overrides/partials/footer.html b/doc/website/overrides/partials/footer.html index bb45cf87ed..df5ad7c67d 100644 --- a/doc/website/overrides/partials/footer.html +++ b/doc/website/overrides/partials/footer.html @@ -38,7 +38,7 @@ {% endif %}