You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ba...@apache.org on 2021/04/04 13:14:05 UTC

[incubator-hop-docs] branch asf-site updated: Hop 2643 metadata type documentation (#65)

This is an automated email from the ASF dual-hosted git repository.

bartmaer pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-hop-docs.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 65e6357  Hop 2643 metadata type documentation (#65)
65e6357 is described below

commit 65e6357e49b60ef420a2438f28ed09202def3c3c
Author: Bart Maertens <ba...@know.bi>
AuthorDate: Sun Apr 4 15:14:00 2021 +0200

    Hop 2643 metadata type documentation (#65)
    
    * HOP-2711 - extended plugin context, plugin type list
    
    * update hop-tools list
    
    * added hop-conf subfolder, moved hop-conf usage for vfs implementations to usages instead of repeated content
    
    * fixed invalid xref link
    
    * HOP-2709 metadata types documentation
---
 .../ROOT/assets/images/icons/Cassandra_logo.svg    | 269 +++++++++++++++++++++
 .../images/icons/MongoDB_Leaf_FullColor_RGB.svg    |  12 +
 .../modules/ROOT/assets/images/icons/NEO4J.svg     | 129 ++++++++++
 .../ROOT/assets/images/icons/Test_tube_icon.svg    |  23 ++
 .../modules/ROOT/assets/images/icons/database.svg  |  25 ++
 .../modules/ROOT/assets/images/icons/dataset.svg   |  18 ++
 .../modules/ROOT/assets/images/icons/folder.svg    |  17 ++
 .../ROOT/assets/images/icons/partition_schema.svg  |  19 ++
 .../ROOT/assets/images/icons/pipeline-log.svg      |  49 ++++
 .../assets/images/icons/pipeline_run_config.svg    |  18 ++
 .../modules/ROOT/assets/images/icons/probe.svg     |  13 +
 .../modules/ROOT/assets/images/icons/server.svg    |  40 +++
 .../modules/ROOT/assets/images/icons/splunk.svg    |  35 +++
 .../modules/ROOT/assets/images/icons/test.svg      |  19 ++
 .../ROOT/assets/images/icons/workflow-log.svg      |  41 ++++
 .../assets/images/icons/workflow_run_config.svg    |  15 ++
 hop-user-manual/modules/ROOT/nav.adoc              |  17 +-
 .../{ => hop-conf}/hop-conf-cloud-aws-s3.adoc      |   0
 .../hop-conf-cloud-azure-blob-storage.adoc         |   0
 .../hop-conf-cloud-google-cloud-storage.adoc       |   0
 .../hop-conf-cloud-google-drive.adoc               |   0
 .../{ => hop-conf}/hop-conf-projects.adoc          |   0
 .../{ => hop-conf}/hop-conf-run-hpl-hwf.adoc       |   0
 .../pages/hop-tools/{ => hop-conf}/hop-conf.adoc   |   0
 .../modules/ROOT/pages/hop-tools/index.adoc        |  13 +
 .../pages/metadata-types/beam-file-definition.adoc |  40 +++
 .../cassandra/cassandra-connection.adoc            |  18 +-
 .../ROOT/pages/metadata-types/data-set.adoc        |  30 +++
 .../pages/metadata-types/database-connection.adoc  |   0
 .../ROOT/pages/metadata-types/hop-server.adoc      |  33 +++
 .../modules/ROOT/pages/metadata-types/index.adoc   |  34 +++
 .../ROOT/pages/metadata-types/metadata-types.adoc  |   0
 .../pages/metadata-types/mongodb-connection.adoc   |  50 ++++
 .../pages/metadata-types/neo4j-graphmodel.adoc     |  26 --
 .../metadata-types/neo4j/neo4j-connection.adoc     |   6 +-
 .../metadata-types/neo4j/neo4j-graphmodel.adoc     |  25 +-
 .../pages/metadata-types/partition-schema.adoc     |  36 +++
 .../ROOT/pages/metadata-types/pipeline-log.adoc    |  35 +++
 .../ROOT/pages/metadata-types/pipeline-probe.adoc  |  31 +++
 .../pages/metadata-types/pipeline-run-config.adoc  |  38 +++
 .../pages/metadata-types/pipeline-unit-test.adoc   |  33 +++
 .../pages/metadata-types/rdbms-connection.adoc     |  85 +++++++
 .../pages/metadata-types/splunk-connection.adoc    |  31 +++
 .../ROOT/pages/metadata-types/web-service.adoc     |  32 +++
 .../ROOT/pages/metadata-types/workflow-log.adoc    |  35 +++
 .../pages/metadata-types/workflow-run-config.adoc  |  34 +++
 .../modules/ROOT/pages/plugins/plugins.adoc        |  30 ++-
 .../modules/ROOT/pages/projects/advanced.adoc      |   2 +-
 .../ROOT/pages/vfs/azure-blob-storage-vfs.adoc     |  12 +-
 .../ROOT/pages/vfs/google-cloud-storage-vfs.adoc   |   6 +-
 .../modules/ROOT/pages/vfs/google-drive-vfs.adoc   |   9 +-
 51 files changed, 1420 insertions(+), 63 deletions(-)

diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/Cassandra_logo.svg b/hop-user-manual/modules/ROOT/assets/images/icons/Cassandra_logo.svg
new file mode 100644
index 0000000..95e3303
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/Cassandra_logo.svg
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    version="1.1"
+    width="279.18411"
+    height="187.47701"
+    id="svg2816"
+    xml:space="preserve"><title
+     id="title3537">Apache Cassandra</title>
+  <metadata
+      id="metadata2822"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+      rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title>Apache Cassandra</dc:title><cc:license
+      rdf:resource="Apache License"/><dc:creator><cc:Agent><dc:title>Apache Software Foundation</dc:title></cc:Agent></dc:creator><dc:source>https://svn.apache.org/repos/asf/cassandra/logo/cassandra.svg</dc:source></cc:Work></rdf:RDF></metadata>
+  <defs
+      id="defs2820"><clipPath
+       id="clipPath2832"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2834" /></clipPath>
+    <clipPath
+        id="clipPath2844"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2846" /></clipPath>
+    <clipPath
+        id="clipPath2852"><path
+         d="m 96.0078,715.93 88.2902,0 0,-62.176 -88.2902,0 0,62.176 z"
+         id="path2854" /></clipPath>
+    <clipPath
+        id="clipPath2868"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2870" /></clipPath>
+    <clipPath
+        id="clipPath2880"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2882" /></clipPath>
+    <clipPath
+        id="clipPath2908"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2910" /></clipPath>
+    <clipPath
+        id="clipPath2936"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2938" /></clipPath>
+    <clipPath
+        id="clipPath2944"><path
+         d="m 121.202,708.378 45.899,0 0,-45.859 -45.899,0 0,45.859 z"
+         id="path2946" /></clipPath>
+    <clipPath
+        id="clipPath2960"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2962" /></clipPath>
+    <clipPath
+        id="clipPath2968"><path
+         d="m 40.4033,726.188 212.4017,0 0,-61.818 -212.4017,0 0,61.818 z"
+         id="path2970" /></clipPath>
+    <clipPath
+        id="clipPath2988"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path2990" /></clipPath>
+    <clipPath
+        id="clipPath2996"><path
+         d="m 39.5195,688.644 199.3805,0 0,-73.818 -199.3805,0 0,73.818 z"
+         id="path2998" /></clipPath>
+    <clipPath
+        id="clipPath3016"><path
+         d="M 0,792 612,792 612,0 0,0 0,792 z"
+         id="path3018" /></clipPath></defs>
+  <g
+      transform="translate(-62.668647,-74.06425)"
+      id="layer1"
+      style="display:inline"><g
+   transform="matrix(1.25,0,0,-1.25,19.117647,990)"
+   id="g3012"><g
+     clip-path="url(#clipPath3016)"
+     id="g3014"><g
+       transform="translate(61.4912,609.1372)"
+       id="g3020"><path
+         d="M 0,0 C 1.824,0 3.552,-0.432 4.417,-1.296 4.561,-2.641 3.36,-4.801 2.592,-4.801 1.68,-4.465 0.816,-4.272 -0.24,-4.272 c -4.368,0 -6.529,-4.513 -6.529,-8.977 0,-2.784 0.96,-4.465 3.169,-4.465 2.352,0 4.752,1.584 6.096,2.784 0.336,-0.239 0.768,-1.008 0.768,-1.872 0,-0.96 -0.288,-1.872 -1.152,-2.736 -1.536,-1.536 -4.128,-2.832 -7.873,-2.832 -4.32,0 -7.296,2.448 -7.296,8.161 C -13.057,-6.721 -8.113,0 -0.048,0 L 0,0 z"
+         id="path3022"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(75.6021,591.6636)"
+      id="g3024"><path
+         d="m 0,0 c 2.352,0 6.625,4.129 7.825,12.001 0.048,0.48 0.096,0.624 0.192,1.104 -0.528,0.192 -1.248,0.336 -1.969,0.336 -1.776,0 -3.6,-0.528 -5.232,-2.736 -1.68,-2.352 -2.4,-5.28 -2.4,-7.633 C -1.584,1.057 -1.008,0 -0.048,0 L 0,0 z m -7.729,2.16 c 0,2.832 0.96,7.777 4.561,11.377 3.072,3.168 6.816,3.937 10.225,3.937 2.256,0 5.328,-0.72 7.248,-1.105 -0.48,-2.112 -1.632,-10.08 -2.16,-14.688 -0.24,-1.969 -0.336,-4.705 -0.24,-5.713 -1.584,-0.672 -4.56,-0.864 -5.377,-0.864 -0.431,0 -0.5 [...]
+         id="path3026"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(101.8579,609.1372)"
+      id="g3028"><path
+         d="m 0,0 c 1.968,0 3.84,-0.72 4.705,-1.632 -0.048,-1.345 -1.104,-3.6 -2.785,-2.976 -0.72,0.24 -1.44,0.431 -2.4,0.431 -1.296,0 -2.4,-0.576 -2.4,-1.775 0,-0.912 0.672,-1.585 3.888,-3.841 2.305,-1.68 3.217,-3.168 3.217,-5.28 0,-3.505 -3.313,-7.297 -9.073,-7.297 -2.352,0 -4.417,0.912 -5.089,1.872 -0.864,1.44 -0.192,4.272 0.769,3.793 1.248,-0.624 3.312,-1.297 4.992,-1.297 1.584,0 2.592,0.721 2.592,1.681 0,0.815 -0.72,1.536 -3.648,3.6 -2.449,1.824 -3.217,3.504 -3.217,5.424 0,3.984 3.4 [...]
+         id="path3030"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(118.417,609.1372)"
+      id="g3032"><path
+         d="m 0,0 c 1.969,0 3.841,-0.72 4.705,-1.632 -0.048,-1.345 -1.103,-3.6 -2.784,-2.976 -0.72,0.24 -1.441,0.431 -2.4,0.431 -1.296,0 -2.4,-0.576 -2.4,-1.775 0,-0.912 0.672,-1.585 3.888,-3.841 2.304,-1.68 3.216,-3.168 3.216,-5.28 0,-3.505 -3.313,-7.297 -9.073,-7.297 -2.352,0 -4.416,0.912 -5.088,1.872 -0.864,1.44 -0.192,4.272 0.768,3.793 1.248,-0.624 3.312,-1.297 4.992,-1.297 1.584,0 2.592,0.721 2.592,1.681 0,0.815 -0.72,1.536 -3.648,3.6 -2.448,1.824 -3.216,3.504 -3.216,5.424 0,3.984 3 [...]
+         id="path3034"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(133.5361,591.6636)"
+      id="g3036"><path
+         d="m 0,0 c 2.353,0 6.625,4.129 7.825,12.001 0.048,0.48 0.097,0.624 0.193,1.104 -0.529,0.192 -1.248,0.336 -1.969,0.336 -1.776,0 -3.6,-0.528 -5.233,-2.736 -1.679,-2.352 -2.4,-5.28 -2.4,-7.633 C -1.584,1.057 -1.008,0 -0.047,0 L 0,0 z m -7.729,2.16 c 0,2.832 0.961,7.777 4.561,11.377 3.072,3.168 6.816,3.937 10.225,3.937 2.256,0 5.329,-0.72 7.249,-1.105 -0.48,-2.112 -1.632,-10.08 -2.16,-14.688 -0.241,-1.969 -0.336,-4.705 -0.241,-5.713 -1.584,-0.672 -4.559,-0.864 -5.376,-0.864 -0.431,0 [...]
+         id="path3038"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(158.688,602.897)"
+      id="g3040"><path
+         d="m 0,0 c 2.209,3.552 5.088,6.24 9.121,6.24 3.408,0 4.512,-3.168 3.889,-7.68 -0.336,-2.113 -0.912,-5.137 -1.297,-7.921 -0.336,-2.353 -0.576,-4.464 -0.527,-5.905 -1.248,-0.624 -4.897,-0.864 -5.713,-0.864 -0.336,0 -0.385,2.641 0.048,5.425 0.383,2.304 1.2,6.48 1.584,8.881 0.241,1.391 0.192,3.072 -1.152,3.072 -1.777,0 -6,-2.833 -8.113,-14.449 -0.145,-0.96 -0.528,-1.536 -1.057,-1.872 -0.719,-0.433 -2.256,-0.817 -5.375,-0.865 0.576,2.928 1.488,8.929 2.16,13.345 0.623,4.032 0.864,6.62 [...]
+         id="path3042"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(183.0728,591.7114)"
+      id="g3044"><path
+         d="m 0,0 c 2.111,0 6.385,3.937 7.584,10.897 0.049,0.384 0.193,1.104 0.289,1.537 -0.625,0.576 -1.441,0.96 -2.736,0.96 -4.85,0 -7.01,-5.809 -7.01,-9.986 C -1.873,1.152 -1.104,0 -0.049,0 L 0,0 z m -3.168,-4.944 c -3.072,0 -4.992,2.736 -4.992,7.44 0,7.777 4.847,14.93 13.008,14.93 1.441,0 2.736,-0.384 3.552,-0.864 0.432,2.208 1.44,9.025 1.489,11.041 1.343,0.24 4.224,0.671 5.519,0.671 0.53,0 0.674,-0.527 0.481,-1.727 C 14.736,19.346 12.674,5.521 12.289,2.448 12,-0.144 11.953,-2.688 12 [...]
+         id="path3046"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(208.0317,602.2241)"
+      id="g3048"><path
+         d="M 0,0 C 2.545,5.665 5.568,6.913 7.537,6.913 8.162,6.913 9.121,6.529 9.553,6.049 9.746,4.465 8.498,1.297 7.393,0.097 6.816,0.385 6.098,0.673 5.281,0.673 c -1.633,0 -4.849,-2.545 -6.865,-13.489 -0.145,-0.913 -0.432,-1.297 -0.959,-1.537 -0.816,-0.48 -4.033,-0.864 -5.568,-0.912 0.718,3.937 1.966,11.953 2.447,16.658 0.144,1.2 0.191,3.408 0.096,4.272 0.912,0.432 4.513,1.248 5.328,1.248 0.433,0 0.769,-2.641 0.095,-6.913 L 0,0 z"
+         id="path3050"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(224.9751,591.6636)"
+      id="g3052"><path
+         d="m 0,0 c 2.354,0 6.625,4.129 7.826,12.001 0.047,0.48 0.096,0.624 0.192,1.104 -0.528,0.192 -1.248,0.336 -1.969,0.336 -1.776,0 -3.6,-0.528 -5.233,-2.736 -1.679,-2.352 -2.4,-5.28 -2.4,-7.633 C -1.584,1.057 -1.008,0 -0.047,0 L 0,0 z m -7.729,2.16 c 0,2.832 0.961,7.777 4.561,11.377 3.072,3.168 6.816,3.937 10.225,3.937 2.256,0 5.328,-0.72 7.25,-1.105 -0.481,-2.112 -1.633,-10.08 -2.161,-14.688 -0.24,-1.969 -0.337,-4.705 -0.24,-5.713 -1.584,-0.672 -4.56,-0.864 -5.377,-0.864 -0.431,0 - [...]
+         id="path3054"
+         style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g>
+</g>
+  <g
+      transform="translate(-62.668647,-74.06425)"
+      id="layer2"
+      style="display:inline"><g
+       transform="matrix(1.25,0,0,-1.25,19.117647,990)"
+       id="g4555"><g
+         id="g2828"><g
+           clip-path="url(#clipPath2832)"
+           id="g2830"><g
+             transform="translate(210.8784,690.4834)"
+             id="g2836"><path
+               d="m 0,0 c 1.584,-18.452 -27.455,-36.014 -64.859,-39.223 -37.404,-3.209 -69.01,9.151 -70.592,27.602 -1.584,18.455 27.455,36.016 64.859,39.225 C -33.188,30.812 -1.582,18.455 0,0"
+               id="path2838"
+               style="fill:#bbe6fb;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g><g
+      id="g2840"><g
+           clip-path="url(#clipPath2844)"
+           id="g2842"><g
+             id="g2848"><g
+               id="g2850" /><g
+      id="g2856"><g
+                 clip-path="url(#clipPath2852)"
+                 id="g2858"
+                 style="opacity:0.35000604"><g
+                   transform="translate(141.3843,715.9233)"
+                   id="g2860"><path
+                     d="m 0,0 c -14.268,0.232 -30.964,-5.433 -43.387,-10.738 -1.293,-3.726 -1.989,-7.689 -1.989,-11.797 0,-21.888 19.764,-39.634 44.145,-39.634 24.381,0 44.145,17.746 44.145,39.634 0,6.927 -1.984,13.435 -5.463,19.101 C 27.512,-1.889 13.842,-0.225 0,0"
+                     id="path2862"
+                     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g></g></g><g
+      id="g2864"><g
+           clip-path="url(#clipPath2868)"
+           id="g2866"><g
+             transform="translate(140.1528,715.9277)"
+             id="g2872"><path
+               d="m 0,0 c -7.899,0.482 -21.514,-3.639 -32.867,-7.75 -1.725,-4.071 -2.683,-8.526 -2.683,-13.201 0,-19.178 17.388,-34.725 35.782,-34.725 18.273,0 34.44,15.572 35.782,34.725 0.436,6.237 -1.711,12.114 -4.692,17.181 C 19.552,-1.697 7.061,-0.431 0,0"
+               id="path2874"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g><g
+      id="g2876"><g
+           clip-path="url(#clipPath2880)"
+           id="g2878"><g
+             transform="translate(119.8818,697.4946)"
+             id="g2884"><path
+               d="M 0,0 C 0.969,2.146 2.437,3.197 3.859,4.996 3.701,5.422 3.355,6.815 3.355,7.298 c 0,2.156 1.749,3.906 3.906,3.906 0.509,0 0.995,-0.101 1.44,-0.278 6.465,4.927 14.976,7.075 23.529,5.163 0.781,-0.176 1.547,-0.389 2.299,-0.623 C 26.076,16.638 16.548,13.644 10.067,8.413 10.265,7.946 10.814,6.611 10.814,6.074 10.814,3.917 9.418,3.392 7.261,3.392 6.771,3.392 6.303,3.486 5.87,3.651 4.406,1.685 2.612,-2.06 1.734,-4.401 c 3.584,-3.206 6.822,-4.368 11.042,-5.945 -0.011,0.201 0.14 [...]
+               id="path2886"
+               style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(168.4907,700.4282)"
+      id="g2888"><path
+               d="m 0,0 c 0.719,-0.648 1.111,-1.217 1.42,-1.771 0.951,-1.71 -0.957,-3.275 -2.914,-3.275 -0.199,0 -0.391,0.027 -0.582,0.059 -2.205,-3.446 -6.067,-7.865 -9.498,-10.089 5.261,-0.862 10.222,-2.969 14.17,-6.225 2.875,5.151 5.08,12.589 5.08,18.907 0,4.809 -2.123,8.334 -5.328,10.92 C 2.18,5.95 0.805,2.347 0,0"
+               id="path2890"
+               style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(125.7842,667.8032)"
+      id="g2892"><path
+               d="M 0,0 C 1.753,4.841 6.065,8.592 10.144,11.892 9.547,12.709 8.652,14.732 8.279,15.69 3.304,17.203 -1.098,20.035 -4.512,23.784 -4.537,23.675 -4.568,23.569 -4.594,23.46 -5.237,20.579 -5.355,17.692 -5.035,14.876 -2.653,14.432 -0.85,12.345 -0.85,9.834 -0.85,8.345 -2.155,6.187 -3.168,5.248 -2.067,2.872 -1.316,1.726 0,0"
+               id="path2894"
+               style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(125.4756,663.7393)"
+      id="g2896"><path
+               d="m 0,0 c -2.091,2.079 -3.537,6.226 -4.894,8.83 -0.254,-0.039 -0.514,-0.066 -0.78,-0.066 -2.836,0 -5.807,2.38 -5.135,5.134 0.372,1.524 1.424,2.521 3.137,3.353 -0.39,3.157 -0.496,7.695 0.237,10.977 0.21,0.939 0.655,1.379 0.95,2.273 -3.129,4.579 -5.151,10.589 -5.151,16.552 0,0.218 0.011,0.433 0.016,0.649 -5.288,-2.652 -9.253,-6.83 -9.253,-13.407 0,-14.548 8.379,-28.819 20.846,-34.413 C -0.018,-0.079 -0.01,-0.039 0,0"
+               id="path2898"
+               style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(156.1313,683.8511)"
+      id="g2900"><path
+               d="m 0,0 c -1.611,-4.582 -5.967,-7.873 -11.1,-7.873 -2.746,0 -5.265,0.947 -7.267,2.521 -4.127,-3.214 -7.871,-8.86 -9.774,-13.758 0.854,-0.919 1.449,-1.675 2.407,-2.49 2.887,-0.752 6.863,0 9.988,0 12.57,0 23.703,5.592 30.086,15.398 C 10.096,-3.263 5.09,-0.466 0,0"
+               id="path2902"
+               style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g><g
+      id="g2904"><g
+           clip-path="url(#clipPath2908)"
+           id="g2906"><g
+             transform="translate(119.5596,695.7944)"
+             id="g2912"><path
+               d="m 0,0 c 0.969,2.146 2.184,4.132 3.605,5.931 -0.158,0.425 -0.25,0.884 -0.25,1.367 0,2.156 1.749,3.906 3.906,3.906 0.509,0 0.995,-0.101 1.44,-0.278 6.465,4.927 14.976,7.075 23.529,5.163 0.781,-0.176 1.547,-0.389 2.299,-0.623 -8.453,1.172 -17.187,-1.419 -23.668,-6.651 0.198,-0.466 0.306,-0.98 0.306,-1.517 0,-2.157 -1.749,-3.906 -3.906,-3.906 -0.49,0 -0.958,0.094 -1.391,0.259 -1.464,-1.966 -2.661,-4.138 -3.539,-6.48 3.078,-3.317 6.856,-5.94 11.075,-7.517 -0.01,0.201 -0.031, [...]
+               id="path2914"
+               style="fill:#1287b1;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(169.0396,699.8481)"
+      id="g2916"><path
+               d="m 0,0 c 0.719,-0.648 1.18,-1.577 1.18,-2.621 0,-1.957 -1.588,-3.545 -3.545,-3.545 -0.199,0 -0.391,0.027 -0.582,0.059 -2.205,-3.446 -5.127,-6.384 -8.559,-8.608 5.072,-0.793 9.846,-2.945 13.793,-6.201 2.875,5.151 4.518,11.084 4.518,17.402 0,4.809 -2.123,8.334 -5.328,10.92 C 1.309,4.83 0.805,2.347 0,0"
+               id="path2918"
+               style="fill:#1287b1;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(126.3252,666.6401)"
+      id="g2920"><path
+               d="M 0,0 C 1.753,4.841 4.799,9.185 8.878,12.484 8.281,13.302 7.789,14.195 7.416,15.153 2.44,16.666 -1.961,19.498 -5.375,23.247 -5.4,23.138 -5.432,23.032 -5.457,22.923 -6.101,20.042 -6.219,17.155 -5.898,14.339 -3.517,13.895 -1.713,11.808 -1.713,9.297 -1.713,7.808 -2.352,6.469 -3.365,5.53 -2.446,3.582 -1.316,1.726 0,0"
+               id="path2922"
+               style="fill:#1287b1;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(125.4619,663.7983)"
+      id="g2924"><path
+               d="m 0,0 c -2.091,2.079 -3.846,4.467 -5.202,7.07 -0.255,-0.039 -0.515,-0.065 -0.78,-0.065 -2.836,0 -5.135,2.299 -5.135,5.134 0,2.032 1.184,3.784 2.897,4.616 -0.389,3.156 -0.257,6.432 0.477,9.714 0.21,0.938 0.466,1.854 0.761,2.749 -3.129,4.578 -4.962,10.113 -4.962,16.076 0,0.218 0.01,0.433 0.015,0.648 -5.288,-2.651 -9.253,-6.83 -9.253,-13.406 0,-14.549 8.688,-27.06 21.155,-32.654 C -0.018,-0.079 -0.01,-0.039 0,0"
+               id="path2926"
+               style="fill:#1287b1;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g><g
+      transform="translate(155.8091,682.1509)"
+      id="g2928"><path
+               d="m 0,0 c -1.611,-4.582 -5.967,-7.873 -11.1,-7.873 -2.746,0 -5.265,0.947 -7.267,2.521 -4.127,-3.214 -7.242,-7.595 -9.144,-12.494 0.853,-0.919 1.765,-1.785 2.723,-2.599 2.888,-0.752 5.917,-1.155 9.042,-1.155 12.57,0 23.621,6.49 30.004,16.295 C 10.014,-2.365 5.09,-0.466 0,0"
+               id="path2930"
+               style="fill:#1287b1;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g><g
+      id="g2932"><g
+           clip-path="url(#clipPath2936)"
+           id="g2934"><g
+             id="g2940"><g
+               id="g2942" /><g
+      id="g2948"><g
+                 clip-path="url(#clipPath2944)"
+                 id="g2950"><g
+                   transform="translate(156.2222,685.187)"
+                   id="g2952"><path
+                     d="M 0,0 10.879,2.595 -0.041,3.152 8.846,9.944 -1.238,6.329 5.615,15.826 -3.85,9.535 l 3.309,11.117 -6.5,-9.163 -0.148,11.579 -4.277,-10.314 -3.566,10.437 0.193,-12.295 -6.163,11.021 3.335,-11.702 -9.997,7.27 7.831,-9.84 -12.411,4.564 9.795,-7.247 -12.56,-0.386 12.842,-3.314 -12.853,-2.779 12.687,-0.92 -10.699,-6.851 11.017,3.994 -7.644,-9.681 9.659,7.79 -3.478,-12.991 7.457,10.572 -1.045,-12.486 4.233,11.319 3.603,-11.897 0.876,11.933 5.348,-10.181 -3.16,11.645 9.79 [...]
+                     id="path2954"
+                     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g></g></g><g
+      id="g2956"><g
+           clip-path="url(#clipPath2960)"
+           id="g2958"><g
+             id="g2964"><g
+               id="g2966" /><g
+      id="g2972"><g
+                 clip-path="url(#clipPath2968)"
+                 id="g2974"
+                 style="opacity:0.35000604"><g
+                   transform="translate(40.4033,664.3701)"
+                   id="g2976"><path
+                     d="m 0,0 c 33.74,33.739 60.687,44.155 85.143,48.91 3.236,0.629 3.848,7.7 3.848,7.7 0,0 0.453,-5.208 2.718,-5.887 2.264,-0.68 5.207,8.152 5.207,8.152 0,0 -2.717,-7.926 0,-8.379 2.718,-0.453 7.699,7.699 7.699,7.699 0,0 -2.037,-7.019 -0.678,-7.472 1.357,-0.453 8.15,10.189 8.15,10.189 0,0 -4.076,-7.019 -0.226,-7.699 3.851,-0.679 9.467,4.791 9.467,4.791 0,0 -4.416,-5.005 -2.448,-5.696 8.379,-2.945 15.159,7.945 15.159,7.945 0,0 -1.571,-4.775 -5.647,-9.983 8.83,-2.264 15.38 [...]
+                     id="path2978"
+                     style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g><g
+      transform="translate(41.7861,666.9326)"
+      id="g2980"><path
+               d="m 0,0 c 33.74,33.739 60.686,44.154 85.142,48.91 3.237,0.629 3.849,7.699 3.849,7.699 0,0 0.452,-5.209 2.718,-5.887 2.264,-0.679 5.207,8.151 5.207,8.151 0,0 -2.717,-7.926 0,-8.378 2.718,-0.452 7.699,7.699 7.699,7.699 0,0 -2.037,-7.019 -0.68,-7.472 1.359,-0.453 8.152,10.19 8.152,10.19 0,0 -4.076,-7.02 -0.226,-7.699 3.849,-0.68 9.467,4.79 9.467,4.79 0,0 -4.416,-5.005 -2.448,-5.696 8.379,-2.944 15.157,7.945 15.157,7.945 0,0 -1.571,-4.775 -5.645,-9.983 8.83,-2.265 15.389,11.0 [...]
+               id="path2982"
+               style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g><g
+      id="g2984"><g
+           clip-path="url(#clipPath2988)"
+           id="g2986"><g
+             id="g2992"><g
+               id="g2994" /><g
+      id="g3000"><g
+                 clip-path="url(#clipPath2996)"
+                 id="g3002"
+                 style="opacity:0.35000604"><g
+                   transform="translate(39.5195,660.6802)"
+                   id="g3004"><path
+                     d="m 0,0 c 17.832,-8.945 34.137,1.358 54.686,-4.433 15.623,-4.404 34.645,-9.833 60.458,-6.096 25.814,3.735 47.893,14.944 58.424,34.985 3.283,8.943 16.642,-2.039 16.642,-2.039 0,0 -9.736,4.076 -9.509,2.151 0.226,-1.924 14.605,-8.604 14.605,-8.604 0,0 -13.021,4.076 -12.228,1.019 0.793,-3.057 16.302,-15.285 16.302,-15.285 0,0 -17.548,13.36 -19.019,11.549 -1.473,-1.812 7.472,-9.172 7.472,-9.172 0,0 -14.832,9.172 -20.041,6.467 -3.746,-1.943 15.399,-14.506 15.399,-14.506 0 [...]
+                     id="path3006"
+                     style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g><g
+      transform="translate(38.8408,662.7183)"
+      id="g3008"><path
+               d="m 0,0 c 17.832,-8.945 34.136,1.358 54.685,-4.434 15.623,-4.402 34.646,-9.832 60.46,-6.095 25.814,3.736 47.891,14.945 58.422,34.984 3.283,8.944 16.642,-2.037 16.642,-2.037 0,0 -9.736,4.075 -9.509,2.15 0.226,-1.924 14.605,-8.604 14.605,-8.604 0,0 -13.021,4.075 -12.228,1.018 0.793,-3.056 16.304,-15.284 16.304,-15.284 0,0 -17.55,13.361 -19.021,11.548 -1.471,-1.811 7.473,-9.17 7.473,-9.17 0,0 -14.833,9.17 -20.041,6.467 -3.747,-1.944 15.398,-14.506 15.398,-14.506 0,0 -12.455, [...]
+               id="path3010"
+               style="fill:#373535;fill-opacity:1;fill-rule:nonzero;stroke:none" /></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/MongoDB_Leaf_FullColor_RGB.svg b/hop-user-manual/modules/ROOT/assets/images/icons/MongoDB_Leaf_FullColor_RGB.svg
new file mode 100644
index 0000000..285408b
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/MongoDB_Leaf_FullColor_RGB.svg
@@ -0,0 +1,12 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.56 448.5">
+  <defs>
+    <style>.cls-1{fill:#10aa50;}.cls-2{fill:#b8c4c2;}.cls-3{fill:#12924f;}</style>
+  </defs>
+  <title>MongoDB_Leaf_FullColor_RGB</title>
+  <path class="cls-1"
+        d="M202.8,179.68c-23-101.47-71-128.49-83.18-147.59C113,21.7,106.25,5.91,106.25,5.91c-.66,9-1.83,14.7-9.51,21.54C81.36,41.16,16,94.42,10.51,209.72c-5.12,107.5,79,173.8,90.18,180.65,8.54,4.2,19,.08,24-3.77,40.54-27.84,96-102.07,78.06-206.92"/>
+  <path class="cls-2"
+        d="M109.73,333.11c-2.11,26.62-3.63,42.11-9,57.29,0,0,3.54,25.33,6,52.17l8.77,0a488.62,488.62,0,0,1,9.57-56.2C113.71,380.8,110.16,356.46,109.73,333.11Z"/>
+  <path class="cls-3"
+        d="M125.06,386.39h0c-11.48-5.3-14.8-30.13-15.31-53.28A1090.8,1090.8,0,0,0,112.2,218.4c-.6-20.07.3-185.92-4.94-210.2,2.12,4.75,7.24,15.91,12.36,23.88,12.23,19.11,60.19,46.13,83.17,147.61C220.7,284.27,165.57,358.37,125.06,386.39Z"/>
+</svg>
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/NEO4J.svg b/hop-user-manual/modules/ROOT/assets/images/icons/NEO4J.svg
new file mode 100644
index 0000000..d266818
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/NEO4J.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    version="1.1"
+    x="0px"
+    y="0px"
+    width="42px"
+    height="42px"
+    viewBox="0 0 42 42"
+    enable-background="new 0 0 42 42"
+    xml:space="preserve"
+>
+  <ellipse
+      fill="#3F6380"
+      cx="20.375"
+      cy="19.542"
+      rx="13.041"
+      ry="13.124"
+  />
+  <ellipse
+      fill="#1DB24B"
+      stroke="#FFFFFF"
+      stroke-width="0.5"
+      stroke-miterlimit="10"
+      cx="27.458"
+      cy="16.333"
+      rx="7.208"
+      ry="7.167"
+  />
+  <ellipse
+      fill="#1DB24B"
+      stroke="#FFFFFF"
+      stroke-width="0.5"
+      stroke-miterlimit="10"
+      cx="18.042"
+      cy="30.582"
+      rx="5.875"
+      ry="5.834"
+  />
+  <ellipse
+      fill="#1DB24B"
+      stroke="#FFFFFF"
+      stroke-width="0.5"
+      stroke-miterlimit="10"
+      cx="13.092"
+      cy="9.583"
+      rx="4.075"
+      ry="4"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="18.99"
+      cy="8.667"
+      rx="1.052"
+      ry="1.083"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="21.705"
+      cy="9.583"
+      rx="1.052"
+      ry="1.083"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="11.928"
+      cy="15.229"
+      rx="1.052"
+      ry="1.083"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="12.115"
+      cy="18.062"
+      rx="1.052"
+      ry="1.083"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="12.761"
+      cy="21.105"
+      rx="1.052"
+      ry="1.083"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="14.22"
+      cy="23.834"
+      rx="1.052"
+      ry="1.082"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="27.199"
+      cy="25.334"
+      rx="1.053"
+      ry="1.082"
+  />
+  <ellipse
+      fill="#FFFFFF"
+      cx="25.304"
+      cy="27.584"
+      rx="1.052"
+      ry="1.082"
+  />
+
+  <rect
+      x="4.202"
+      y="10.417"
+      fill="#3D6380"
+      width="7.481"
+      height="1.236"
+  />
+  <rect
+      x="10.448"
+      y="4.171"
+      fill="#3D6380"
+      width="1.235"
+      height="7.482"
+  />
+  <rect
+      x="1.095"
+      y="6.394"
+      transform="matrix(-0.707 -0.7072 0.7072 -0.707 7.0628 16.9487)"
+      fill="#3D6380"
+      width="11.894"
+      height="1.234"
+  />
+</svg>
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/Test_tube_icon.svg b/hop-user-manual/modules/ROOT/assets/images/icons/Test_tube_icon.svg
new file mode 100644
index 0000000..266f90d
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/Test_tube_icon.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="24"
+   height="24"
+   version="1.1"
+   >
+  <g
+     transform="translate(-379.90478,129.88361)">
+    <path
+       style="fill:#5cc0c4;fill-opacity:1;stroke-width:0.0437786"
+       d="m 400.07699,-117.81773 -0.39819,0.34509 c -1.13507,0.98367 -2.23636,2.42927 -2.81167,3.69065 -1.27231,2.78963 -0.50795,5.54973 1.68525,6.08582 0.43462,0.10623 1.30101,-4.1e-4 1.76881,-0.21754 0.51649,-0.23977 1.16437,-0.90075 1.41535,-1.44397 0.28076,-0.60767 0.31901,-1.68083 0.0927,-2.60049 -0.0986,-0.40071 -0.45531,-1.37556 -0.79273,-2.1664 -0.6587,-1.54387 -0.93017,-2.46567 -0.94818,-3.21964 z m -1.6169,3.43608 c 0.046,-0.002 0.0743,0.009 0.0748,0.0382 0.004,0.20828 0.1031,0 [...]
+        />
+    <path
+         style="opacity:1;fill:#5cc0c4;fill-opacity:1;stroke:none;stroke-width:0.131336;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 388.59957,-118.30002 -4.48567,4.5536 c -0.97778,1.02368 -0.97778,2.68339 0,3.70707 0.9778,1.02367 2.5631,1.02367 3.5409,0 l 7.00201,-7.60965 z"
+        />
+    <path
+       d="m 395.77524,-127.88361 -0.58121,0.60849 -12.21064,12.78368 c -1.43815,1.50567 -1.43815,3.97293 0,5.4786 1.43818,1.50564 3.79483,1.50564 5.23301,0 l 12.79185,-13.39217 z m 0,2.43395 2.90817,3.04465 -11.62943,12.1752 c -0.80996,0.84795 -2.09821,0.84795 -2.90817,0 -0.80995,-0.84798 -0.80995,-2.19668 0,-3.04465 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;ove [...]
+  </g>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/database.svg b/hop-user-manual/modules/ROOT/assets/images/icons/database.svg
new file mode 100644
index 0000000..d602739
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/database.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"  xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+     width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" >
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#3D6380;}
+</style>
+  <g>
+	<path class="st0" d="M12.2,11.2v2c0,0.1-0.3,0.3-1,0.5C10.4,13.9,9.3,14,8,14c-2.8,0-4.1-0.6-4.2-0.7v-2.1c0.5,0.3,2.1,0.6,4.3,0.6
+		C10.3,11.8,11.6,11.5,12.2,11.2z"/>
+    <path class="st0" d="M12.2,7.6v2.1c-0.2,0.1-0.5,0.2-0.9,0.3c-0.8,0.2-2,0.3-3.2,0.3c-2.1,0-3.6-0.3-4.2-0.6V7.6
+		c0.5,0.3,2.1,0.6,4.2,0.6C10.3,8.2,11.7,7.9,12.2,7.6z"/>
+    <path class="st0" d="M12.2,4.3v1.9c-0.2,0.1-0.5,0.2-0.9,0.3c-0.8,0.2-2,0.3-3.2,0.3c-2.1,0-3.6-0.3-4.2-0.7V4.3
+		c0.5,0.3,2.1,0.6,4.2,0.6C10.3,4.9,11.7,4.5,12.2,4.3z"/>
+    <path class="st0" d="M12.2,2.7v0.2c-0.6,0.3-2,0.6-4.1,0.6c-2.1,0-3.6-0.3-4.2-0.7V2.7C4.1,2.5,5.4,2,8,2C10.5,2,12,2.5,12.2,2.7z"
+    />
+    <path class="st1" d="M8,0.5c-2.1,0-5.6,0.3-5.6,2.1v10.7c0,2.1,4.3,2.2,5.7,2.2c1.3,0,2.6-0.1,3.5-0.4c1.4-0.4,2.1-1,2.1-1.8V2.6
+		C13.6,0.7,9.7,0.5,8,0.5z M3.8,2.7C4.1,2.5,5.4,2,8,2c2.5,0,4,0.5,4.2,0.7v0.2c-0.6,0.3-2,0.6-4.1,0.6c-2.1,0-3.6-0.3-4.2-0.7V2.7z
+		 M3.8,4.3c0.5,0.3,2.1,0.6,4.2,0.6c2.2,0,3.6-0.4,4.1-0.6v1.9c-0.2,0.1-0.5,0.2-0.9,0.3c-0.8,0.2-2,0.3-3.2,0.3
+		c-2.1,0-3.6-0.3-4.2-0.7V4.3z M3.8,7.6c0.5,0.3,2.1,0.6,4.2,0.6c2.2,0,3.6-0.4,4.1-0.6v2.1c-0.2,0.1-0.5,0.2-0.9,0.3
+		c-0.8,0.2-2,0.3-3.2,0.3c-2.1,0-3.6-0.3-4.2-0.6V7.6z M12.2,13.2c0,0.1-0.3,0.3-1,0.5C10.4,13.9,9.3,14,8,14
+		c-2.8,0-4.1-0.6-4.2-0.7v-2.1c0.5,0.3,2.1,0.6,4.3,0.6c2.2,0,3.6-0.3,4.1-0.6V13.2z"/>
+</g>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/dataset.svg b/hop-user-manual/modules/ROOT/assets/images/icons/dataset.svg
new file mode 100644
index 0000000..5fc1fda
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/dataset.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<rect id="rect1408_7_" x="3" y="13" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_6_" x="8" y="13" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_5_" x="13" y="13" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_4_" x="18" y="13" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_11_" x="3" y="18" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_10_" x="8" y="18" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_9_" x="13" y="18" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_8_" x="18" y="18" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_19_" x="3" y="3" transform="matrix(-0.7072 0.707 -0.707 -0.7072 10.8635 4.5009)" fill="none" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_17_" x="13" y="3" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_16_" x="18" y="3" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_14_" x="8" y="8" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_13_" x="13" y="8" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+<rect id="rect1408_12_" x="18" y="8" fill="#5CC1C5" stroke="#5CC1C5" stroke-linecap="round" stroke-linejoin="round" width="3" height="3"/>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/folder.svg b/hop-user-manual/modules/ROOT/assets/images/icons/folder.svg
new file mode 100644
index 0000000..bf19e1f
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/folder.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   version="1.1"
+   >
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+      />
+  <path
+     d="m 20.799999,5.2499999 h -8.8 L 9.8,3 H 3.2 C 1.99,3 1.0110001,4.0124999 1.0110001,5.2499999 L 1,18.749999 C 1,19.987499 1.99,21 3.2,21 H 20.799999 C 22.01,21 23,19.987499 23,18.749999 V 7.5000001 C 23,6.2625 22.01,5.2499999 20.799999,5.2499999 Z m 0,13.4999991 H 3.2 V 7.5000001 h 17.599999 z"
+     style="fill:#0e3a5a;fill-opacity:1;stroke-width:1.11243" />
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/partition_schema.svg b/hop-user-manual/modules/ROOT/assets/images/icons/partition_schema.svg
new file mode 100644
index 0000000..ff2847c
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/partition_schema.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   >
+  <path
+     d="m 7.809907,1.8427453 v 1.5231025 h 2.735338 L 7.1182638,6.7928283 8.1906829,7.8667344 11.617664,4.4397539 V 7.173604 h 1.5231 V 1.8427453 Z"
+     style="stroke-width:0.761551;fill:#ff00ff;fill-opacity:1" />
+  <path
+     d="m 13.079566,16.438258 h -1.454993 v 2.613018 L 8.3508423,15.777544 7.3249595,16.802006 10.598691,20.075738 H 7.9870944 v 1.45499 h 5.0924716 z"
+     style="stroke-width:0.727495;fill:#ff00ff;fill-opacity:1" />
+  <path
+     d="m 14.248748,15.614046 -1.128173,-1.118932 2.009489,-2.026083 -5.055986,0.02079 -0.0077,-1.583283 5.055986,-0.02079 -2.024983,-2.0083941 1.118933,-1.1281716 3.948603,3.9162617 z"
+     style="stroke-width:0.794478;fill:#ff00ff;fill-opacity:1" />
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/pipeline-log.svg b/hop-user-manual/modules/ROOT/assets/images/icons/pipeline-log.svg
new file mode 100644
index 0000000..b377180
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/pipeline-log.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="24px" height="24px" viewBox="-3 -2 24 24" enable-background="new -3 -2 24 24" xml:space="preserve">
+<defs>
+</defs>
+<path fill="#0F3B5A" d="M0,0v17.992h5.076c0-0.517,0-0.956,0-1.418H1.503V1.418h12.029V9.93c0.478,0,1.025,0,1.503,0V0H0z"/>
+<path fill="#0F3B5A" d="M9.22,18.102c-0.435,0-0.824-0.066-1.164-0.203c-0.339-0.138-0.627-0.323-0.863-0.562
+	c-0.236-0.238-0.415-0.522-0.537-0.854c-0.123-0.332-0.184-0.696-0.184-1.093c0-0.393,0.063-0.751,0.184-1.081
+	c0.124-0.33,0.301-0.614,0.537-0.856c0.233-0.238,0.523-0.426,0.863-0.561c0.339-0.134,0.727-0.201,1.164-0.201
+	c0.435,0,0.821,0.067,1.164,0.201c0.338,0.135,0.627,0.322,0.862,0.561c0.234,0.24,0.416,0.526,0.536,0.856
+	c0.123,0.33,0.185,0.691,0.185,1.081c0,0.398-0.062,0.761-0.185,1.093c-0.123,0.33-0.3,0.616-0.536,0.854
+	c-0.235,0.238-0.524,0.426-0.862,0.562C10.044,18.035,9.656,18.102,9.22,18.102z M9.22,17.208c0.267,0,0.497-0.054,0.694-0.159
+	s0.359-0.244,0.484-0.416s0.218-0.365,0.278-0.582c0.06-0.214,0.09-0.434,0.09-0.661c0-0.218-0.03-0.437-0.09-0.654
+	c-0.061-0.219-0.153-0.413-0.278-0.582c-0.125-0.17-0.287-0.307-0.484-0.412c-0.197-0.106-0.428-0.16-0.694-0.16
+	c-0.266,0-0.497,0.054-0.694,0.16c-0.197,0.105-0.357,0.242-0.484,0.412c-0.125,0.169-0.221,0.363-0.278,0.582
+	c-0.062,0.218-0.09,0.437-0.09,0.654c0,0.225,0.031,0.445,0.09,0.661c0.058,0.217,0.153,0.41,0.278,0.582
+	c0.126,0.172,0.288,0.311,0.484,0.416C8.723,17.154,8.954,17.208,9.22,17.208z"/>
+<path fill="#0F3B5A" d="M17.998,17.696c0,0.775-0.229,1.353-0.689,1.732C16.85,19.809,16.188,20,15.324,20
+	c-0.273,0-0.549-0.026-0.825-0.08c-0.276-0.053-0.529-0.143-0.757-0.267c-0.229-0.127-0.421-0.292-0.573-0.496
+	c-0.155-0.204-0.246-0.457-0.274-0.755h1.199c0.035,0.159,0.096,0.287,0.181,0.388c0.084,0.101,0.184,0.177,0.301,0.232
+	c0.114,0.056,0.244,0.094,0.385,0.109c0.141,0.015,0.287,0.023,0.44,0.023c0.485,0,0.839-0.112,1.065-0.336
+	c0.224-0.226,0.334-0.55,0.334-0.974v-0.783h-0.02c-0.169,0.283-0.397,0.507-0.69,0.664c-0.291,0.159-0.605,0.238-0.941,0.238
+	c-0.436,0-0.806-0.07-1.11-0.214c-0.305-0.143-0.559-0.339-0.759-0.586c-0.198-0.248-0.346-0.534-0.437-0.859
+	c-0.092-0.324-0.138-0.67-0.138-1.042c0-0.346,0.057-0.671,0.17-0.983c0.112-0.311,0.274-0.585,0.483-0.818
+	c0.211-0.234,0.471-0.422,0.774-0.563c0.306-0.139,0.651-0.207,1.037-0.207c0.343,0,0.659,0.066,0.946,0.202
+	c0.288,0.134,0.509,0.349,0.664,0.64h0.02v-0.706H18L17.998,17.696L17.998,17.696z M15.336,17.069c0.267,0,0.493-0.051,0.679-0.152
+	c0.187-0.104,0.338-0.239,0.454-0.408c0.118-0.169,0.199-0.361,0.253-0.576c0.052-0.215,0.078-0.43,0.078-0.651
+	c0-0.218-0.028-0.43-0.085-0.635c-0.055-0.204-0.143-0.387-0.257-0.546c-0.115-0.16-0.266-0.284-0.454-0.379
+	c-0.186-0.093-0.408-0.138-0.668-0.138c-0.267,0-0.491,0.054-0.673,0.159c-0.182,0.106-0.331,0.243-0.443,0.412
+	c-0.112,0.17-0.192,0.361-0.241,0.575c-0.051,0.215-0.074,0.43-0.074,0.641c0,0.213,0.028,0.419,0.084,0.621
+	c0.057,0.202,0.143,0.381,0.258,0.543c0.117,0.159,0.264,0.287,0.441,0.387C14.867,17.021,15.083,17.069,15.336,17.069z"/>
+<path id="path8080-6_1_" fill="#53C3C4" d="M9.732,2.083c-0.117,0-0.23,0.006-0.341,0.018
+	C8.5,2.198,7.747,2.642,7.254,2.931c-0.516,0.304-1.166,0.781-1.852,0.99C4.718,4.13,4.062,4.099,3.415,3.409
+	c-0.246-0.27-0.596-0.2-0.783,0.154c-0.187,0.355-0.139,0.86,0.107,1.13C2.743,4.697,2.747,4.701,2.75,4.705
+	C3.693,5.71,4.76,5.766,5.634,5.499c0.875-0.267,1.621-0.827,2.043-1.075c0.484-0.285,1.118-0.641,1.798-0.715
+	c0.679-0.074,1.388,0.101,2.13,0.942c0.238,0.281,0.592,0.229,0.785-0.116c0.195-0.345,0.16-0.853-0.08-1.134
+	c-0.004-0.006-0.01-0.012-0.014-0.018C11.449,2.424,10.543,2.087,9.732,2.083L9.732,2.083z M9.732,5.308
+	c-0.117,0-0.23,0.006-0.341,0.018C8.5,5.422,7.747,5.866,7.254,6.155c-0.516,0.304-1.166,0.781-1.852,0.99
+	C4.718,7.354,4.062,7.323,3.415,6.633c-0.246-0.269-0.596-0.2-0.783,0.155c-0.187,0.354-0.139,0.86,0.107,1.129
+	C2.743,7.921,2.747,7.925,2.75,7.929C3.693,8.935,4.76,8.99,5.634,8.723c0.875-0.267,1.621-0.827,2.043-1.075
+	c0.484-0.285,1.118-0.641,1.798-0.715c0.679-0.074,1.388,0.101,2.13,0.942c0.238,0.281,0.592,0.229,0.785-0.116
+	c0.195-0.345,0.16-0.853-0.08-1.134c-0.004-0.006-0.01-0.012-0.014-0.017C11.449,5.648,10.543,5.312,9.732,5.308L9.732,5.308z
+	 M9.732,8.532c-0.117,0-0.23,0.006-0.341,0.018C8.5,8.646,7.747,9.09,7.254,9.379c-0.516,0.304-1.166,0.781-1.852,0.99
+	c-0.685,0.208-1.341,0.177-1.988-0.513c-0.246-0.269-0.596-0.2-0.783,0.155c-0.187,0.354-0.139,0.86,0.107,1.129
+	c0.004,0.005,0.008,0.009,0.012,0.013c0.942,1.005,2.01,1.061,2.884,0.794c0.875-0.268,1.621-0.827,2.043-1.075
+	c0.484-0.285,1.118-0.641,1.798-0.715c0.679-0.074,1.388,0.101,2.13,0.942c0.238,0.282,0.592,0.229,0.785-0.115
+	c0.195-0.345,0.16-0.853-0.08-1.134c-0.004-0.006-0.01-0.012-0.014-0.017C11.449,8.872,10.543,8.536,9.732,8.532L9.732,8.532z"/>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/pipeline_run_config.svg b/hop-user-manual/modules/ROOT/assets/images/icons/pipeline_run_config.svg
new file mode 100644
index 0000000..5e13c42
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/pipeline_run_config.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 24 24"
+   width="24"
+   height="24"
+   y="0px"
+   x="0px"
+   version="1.1"
+   >
+  <g
+     transform="translate(-379.90478,129.88361)">
+    <path
+       d="m 383.43575,-107.93557 c -0.37253,-0.0851 -0.65467,-0.23003 -0.94305,-0.48466 -0.27928,-0.24661 -0.43935,-0.48119 -0.53638,-0.786 -0.0495,-0.15581 -0.0515,-0.49045 -0.0515,-8.67683 0,-8.18638 0.001,-8.52103 0.0515,-8.67685 0.10795,-0.33915 0.36479,-0.69029 0.66872,-0.91427 0.18773,-0.13836 0.59764,-0.31846 0.83879,-0.36854 0.42761,-0.0888 0.99027,-0.0295 1.37569,0.14485 0.23315,0.10553 16.10083,8.27682 16.2519,8.36919 0.15149,0.0927 0.43051,0.35694 0.54233,0.51376 0.05,0.0702 0 [...]
+       style="fill:#53c3c4;fill-opacity:1;stroke:none;stroke-width:0.3179;stroke-linecap:round;stroke-linejoin:round" />
+  </g>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/probe.svg b/hop-user-manual/modules/ROOT/assets/images/icons/probe.svg
new file mode 100644
index 0000000..340fe78
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/probe.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path fill="#0F3B5A" d="M20.242,8.62c0-4.202-3.697-7.62-8.241-7.62C7.456,1,3.758,4.418,3.758,8.62
+	c0,2.633,1.453,4.958,3.659,6.329v5.439c0,0.478,0.414,0.859,0.928,0.859c0.513,0,0.929-0.382,0.929-0.859v-4.577
+	c0.573,0.186,1.175,0.315,1.798,0.38v5.95c0,0.475,0.415,0.859,0.93,0.859c0.513,0,0.929-0.385,0.929-0.859v-5.95
+	c0.622-0.064,1.225-0.194,1.798-0.38v4.577c0,0.478,0.415,0.859,0.929,0.859s0.93-0.382,0.93-0.859v-5.439
+	C18.789,13.578,20.242,11.252,20.242,8.62z M5.617,8.62c0-3.252,2.863-5.901,6.384-5.901c3.518,0,6.382,2.649,6.382,5.901
+	c0,3.254-2.864,5.902-6.382,5.902C8.48,14.521,5.617,11.874,5.617,8.62z M12.001,12.859c2.528,0,4.585-1.902,4.585-4.24
+	c0-2.337-2.057-4.239-4.585-4.239c-2.529,0-4.587,1.902-4.587,4.239C7.414,10.958,9.472,12.859,12.001,12.859z"/>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/server.svg b/hop-user-manual/modules/ROOT/assets/images/icons/server.svg
new file mode 100644
index 0000000..2e345f6
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/server.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   >
+  <rect
+     y="1.9834554"
+     x="5.9834528"
+     height="20.033089"
+     width="12.033094"
+     style="fill:#0e3a5a;fill-opacity:1;stroke:#0e3a5a;stroke-width:1.96691;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="4"
+     x="8"
+     height="2"
+     width="8"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.75862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.75862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     width="8"
+     height="2"
+     x="8"
+     y="7" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.75862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     width="8"
+     height="2"
+     x="8"
+     y="10" />
+  <rect
+     y="18"
+     x="11"
+     height="2"
+     width="2"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.879308;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/splunk.svg b/hop-user-manual/modules/ROOT/assets/images/icons/splunk.svg
new file mode 100644
index 0000000..f379d48
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/splunk.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    id="svg38"
+    version="1.1"
+    viewBox="0 0 8.4666665 8.4666669"
+    height="32"
+    width="32">
+  <defs
+      id="defs32"/>
+  <metadata
+      id="metadata35">
+    <rdf:RDF>
+      <cc:Work
+          rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+      transform="translate(0,-288.53332)"
+      id="layer1">
+    <polygon
+        id="polygon14"
+        points="800,106.4 800,126.402 703.77,173.651 703.77,153.019 778.896,115.929 703.77,79.784 703.77,58.207 "
+        style="fill:#6ab361"
+        transform="matrix(0.06797798,0,0,0.06797798,-46.755784,284.91871)"/>
+  </g>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/test.svg b/hop-user-manual/modules/ROOT/assets/images/icons/test.svg
new file mode 100644
index 0000000..feb7637
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/test.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    version="1.1"
+    x="0px"
+    y="0px"
+    width="42px"
+    height="42px"
+    viewBox="0 0 42 42"
+    enable-background="new 0 0 42 42"
+    >
+<rect
+    style="opacity:1;fill:#00006d;fill-opacity:1;stroke:#756f00;stroke-width:1.93700004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+    width="12.433599"
+    height="33.010841"
+    x="14.227139"
+    y="4.0690408"/>
+</svg>
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/workflow-log.svg b/hop-user-manual/modules/ROOT/assets/images/icons/workflow-log.svg
new file mode 100644
index 0000000..8f9f1c5
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/workflow-log.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path fill="#0F3B5A" d="M3,2v17.992h5.076c0-0.517,0-0.956,0-1.418H4.503V3.418h12.029v8.511c0.478,0,1.025,0,1.503,0V2H3z"/>
+<path fill="#0F3B5A" d="M12.22,20.102c-0.435,0-0.824-0.066-1.164-0.203c-0.339-0.138-0.627-0.323-0.863-0.562
+	c-0.236-0.238-0.415-0.522-0.537-0.854c-0.123-0.332-0.184-0.696-0.184-1.093c0-0.393,0.063-0.751,0.184-1.081
+	c0.124-0.33,0.301-0.614,0.537-0.856c0.233-0.238,0.523-0.426,0.863-0.561c0.339-0.134,0.727-0.201,1.164-0.201
+	c0.435,0,0.821,0.067,1.164,0.201c0.338,0.135,0.627,0.322,0.862,0.561c0.234,0.24,0.416,0.526,0.536,0.856
+	c0.123,0.33,0.185,0.691,0.185,1.081c0,0.398-0.062,0.761-0.185,1.093c-0.123,0.33-0.3,0.616-0.536,0.854
+	c-0.235,0.238-0.524,0.426-0.862,0.562C13.044,20.035,12.656,20.102,12.22,20.102z M12.22,19.208c0.267,0,0.497-0.054,0.694-0.159
+	s0.359-0.244,0.484-0.416s0.218-0.365,0.278-0.582c0.06-0.214,0.09-0.434,0.09-0.661c0-0.218-0.03-0.437-0.09-0.654
+	c-0.061-0.219-0.153-0.413-0.278-0.582c-0.125-0.17-0.287-0.307-0.484-0.412c-0.197-0.106-0.428-0.16-0.694-0.16
+	c-0.266,0-0.497,0.054-0.694,0.16c-0.197,0.105-0.357,0.242-0.484,0.412c-0.125,0.169-0.221,0.363-0.278,0.582
+	c-0.062,0.218-0.09,0.437-0.09,0.654c0,0.225,0.031,0.445,0.09,0.661c0.058,0.217,0.153,0.41,0.278,0.582
+	c0.126,0.172,0.288,0.311,0.484,0.416C11.723,19.154,11.954,19.208,12.22,19.208z"/>
+<path fill="#0F3B5A" d="M20.998,19.696c0,0.775-0.229,1.353-0.689,1.732C19.85,21.809,19.188,22,18.324,22
+	c-0.273,0-0.549-0.026-0.825-0.08c-0.276-0.053-0.529-0.143-0.757-0.267c-0.229-0.127-0.421-0.292-0.573-0.496
+	c-0.155-0.204-0.246-0.457-0.274-0.755h1.199c0.035,0.159,0.096,0.287,0.181,0.388c0.084,0.101,0.184,0.177,0.301,0.232
+	c0.114,0.056,0.244,0.094,0.385,0.109c0.141,0.015,0.287,0.023,0.44,0.023c0.485,0,0.839-0.112,1.065-0.336
+	c0.224-0.226,0.334-0.55,0.334-0.974v-0.783h-0.02c-0.169,0.283-0.397,0.507-0.69,0.664c-0.291,0.159-0.605,0.238-0.941,0.238
+	c-0.436,0-0.806-0.07-1.11-0.214c-0.305-0.143-0.559-0.339-0.759-0.586c-0.198-0.248-0.346-0.534-0.437-0.859
+	c-0.092-0.324-0.138-0.67-0.138-1.042c0-0.346,0.057-0.671,0.17-0.983c0.112-0.311,0.274-0.585,0.483-0.818
+	c0.211-0.234,0.471-0.422,0.774-0.563c0.306-0.139,0.651-0.207,1.037-0.207c0.343,0,0.659,0.066,0.946,0.202
+	c0.288,0.134,0.509,0.349,0.664,0.64h0.02v-0.706H21L20.998,19.696L20.998,19.696z M18.336,19.069c0.267,0,0.493-0.051,0.679-0.152
+	c0.187-0.104,0.338-0.239,0.454-0.408c0.118-0.169,0.199-0.361,0.253-0.576c0.052-0.215,0.078-0.43,0.078-0.651
+	c0-0.218-0.028-0.43-0.085-0.635c-0.055-0.204-0.143-0.387-0.257-0.546c-0.115-0.16-0.266-0.284-0.454-0.379
+	c-0.186-0.093-0.408-0.138-0.668-0.138c-0.267,0-0.491,0.054-0.673,0.159c-0.182,0.106-0.331,0.243-0.443,0.412
+	c-0.112,0.17-0.192,0.361-0.241,0.575c-0.051,0.215-0.074,0.43-0.074,0.641c0,0.213,0.028,0.419,0.084,0.621
+	c0.057,0.202,0.143,0.381,0.258,0.543c0.117,0.159,0.264,0.287,0.441,0.387C17.867,19.021,18.083,19.069,18.336,19.069z"/>
+<g id="layer1" transform="translate(-379.90478,129.88361)">
+	<path id="rect8091-8" fill="#033D5D" d="M390.439-125.8c-0.2,0-0.401,0.077-0.555,0.23
+		l-1.599,1.599l0.566,0.567l1.365-1.365c0.062-0.062,0.142-0.092,0.222-0.092s0.16,0.031,0.222,0.092l1.066,1.066l-0.576,0.577
+		h1.722v-1.722l-0.578,0.578l-1.301-1.301C390.84-125.723,390.639-125.8,390.439-125.8L390.439-125.8z M386.375-123.25l0.578,0.578
+		l-1.301,1.301c-0.154,0.154-0.23,0.354-0.23,0.555s0.076,0.401,0.23,0.555l1.599,1.599l0.567-0.566l-1.365-1.365
+		c-0.062-0.062-0.092-0.142-0.092-0.222s0.03-0.16,0.092-0.222l1.066-1.067l0.577,0.577v-1.722H386.375z M393.593-122.937
+		l-0.567,0.567l1.365,1.365c0.062,0.062,0.092,0.142,0.092,0.222s-0.03,0.16-0.092,0.222l-1.066,1.067l-0.577-0.577v1.722h1.722
+		l-0.578-0.578l1.301-1.301c0.154-0.154,0.23-0.354,0.23-0.555s-0.076-0.401-0.23-0.555L393.593-122.937z M387.972-118.475v1.722
+		l0.578-0.578l1.301,1.301c0.153,0.154,0.354,0.23,0.555,0.23s0.401-0.076,0.555-0.23l1.599-1.599l-0.566-0.567l-1.365,1.366
+		c-0.062,0.061-0.142,0.092-0.222,0.092s-0.16-0.031-0.222-0.092l-1.066-1.067l0.576-0.577H387.972z"/>
+</g>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/assets/images/icons/workflow_run_config.svg b/hop-user-manual/modules/ROOT/assets/images/icons/workflow_run_config.svg
new file mode 100644
index 0000000..516d699
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/assets/images/icons/workflow_run_config.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   height="24"
+   width="24">
+  <g
+     transform="translate(-379.90478,129.88361)"
+     >
+    <path
+       style="fill:#0e3a5a;fill-opacity:1;stroke-width:2.35679"
+       d="m 400.89385,-116.33557 -15.90672,8.2033 c -1.34993,0.69546 -3.08235,-0.14665 -3.08235,-1.54867 v -16.40659 c 0,-1.39981 1.72992,-2.24413 3.08235,-1.54645 l 15.90672,8.20329 a 2.0049015,1.7819724 0 0 1 0,3.09512 z" />
+  </g>
+</svg>
diff --git a/hop-user-manual/modules/ROOT/nav.adoc b/hop-user-manual/modules/ROOT/nav.adoc
index ec31db7..f42fce4 100644
--- a/hop-user-manual/modules/ROOT/nav.adoc
+++ b/hop-user-manual/modules/ROOT/nav.adoc
@@ -323,13 +323,24 @@
 //::=END AUTO GENERATED LINKS DATABASES
 * xref:logging/logging-basics.adoc[Logging basics]
 ** xref:logging/logging-reflection.adoc[Logging reflection]
-* xref:metadata-types/metadata-types.adoc[Metadata Types]
+* xref:metadata-types/index.adoc[Metadata Types]
+** xref:metadata-types/beam-file-definition.adoc[Beam File Definition]
+** xref:metadata-types/cassandra/cassandra-connection.adoc[Cassandra Connection]
 ** xref:metadata-types/data-set.adoc[Data Set]
-** xref:metadata-types/database-connection.adoc[Database Connection]
+** xref:metadata-types/hop-server.adoc[Hop Server]
+** xref:metadata-types/mongodb-connection.adoc[MongoDB Connection]
 ** xref:metadata-types/neo4j/neo4j-connection.adoc[Neo4j Connection]
 ** xref:metadata-types/neo4j/neo4j-graphmodel.adoc[Neo4j Graph Model]
 ** xref:metadata-types/partition-schema.adoc[Partition Schema]
+** xref:metadata-types/pipeline-log.adoc[Pipeline Log]
+** xref:metadata-types/pipeline-probe.adoc[Pipeline Probe]
+** xref:metadata-types/pipeline-run-config.adoc[Pipeline Run Configuration]
+** xref:metadata-types/pipeline-unit-test.adoc[Pipeline Unit Test]
+** xref:metadata-types/rdbms-connection.adoc[Relational Database Connection]
+** xref:metadata-types/splunk-connection.adoc[Splunk Connection]
 ** xref:metadata-types/web-service.adoc[Web Service]
+** xref:metadata-types/workflow-log.adoc[Workflow Log]
+** xref:metadata-types/workflow-run-config.adoc[Workflow Run Configuration]
 * xref:password/passwords.adoc[Passwords]
 //::=START AUTO GENERATED LINKS PASSWORDS
 ** xref:password/passwords/aespasswords.adoc[AES Two way password encoder]
@@ -344,4 +355,4 @@
 ** xref:technology/neo4j/neo4j-info.adoc[Neo4j]
 ** xref:technology/google/google-info.adoc[Google]
 * xref:hop-tools/index.adoc[Hop Tools]
-** xref:hop-tools/hop-conf.adoc[hop-conf]
+** xref:hop-tools/hop-conf/hop-conf.adoc[hop-conf]
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-aws-s3.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-aws-s3.adoc
similarity index 100%
rename from hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-aws-s3.adoc
rename to hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-aws-s3.adoc
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-azure-blob-storage.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-azure-blob-storage.adoc
similarity index 100%
rename from hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-azure-blob-storage.adoc
rename to hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-azure-blob-storage.adoc
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-google-cloud-storage.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-google-cloud-storage.adoc
similarity index 100%
rename from hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-google-cloud-storage.adoc
rename to hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-google-cloud-storage.adoc
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-google-drive.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-google-drive.adoc
similarity index 100%
rename from hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-cloud-google-drive.adoc
rename to hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-cloud-google-drive.adoc
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-projects.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-projects.adoc
similarity index 100%
rename from hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-projects.adoc
rename to hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-projects.adoc
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-run-hpl-hwf.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-run-hpl-hwf.adoc
similarity index 100%
rename from hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf-run-hpl-hwf.adoc
rename to hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf-run-hpl-hwf.adoc
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf.adoc
similarity index 100%
rename from hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf.adoc
rename to hop-user-manual/modules/ROOT/pages/hop-tools/hop-conf/hop-conf.adoc
diff --git a/hop-user-manual/modules/ROOT/pages/hop-tools/index.adoc b/hop-user-manual/modules/ROOT/pages/hop-tools/index.adoc
index e69de29..21a9f63 100644
--- a/hop-user-manual/modules/ROOT/pages/hop-tools/index.adoc
+++ b/hop-user-manual/modules/ROOT/pages/hop-tools/index.adoc
@@ -0,0 +1,13 @@
+= Hop Tools
+
+Even though Hop developers will spend the majority of their time in Hop Gui, Hop has a lot more tools to offer.
+
+This page provides an overview of the tools that are available in the platform.
+
+* xref:hop-tools/hop-conf/hop-conf.adoc[Hop Conf]
+* Hop Encrypt
+* Hop Gui
+* Hop Run
+* Hop Search
+* Hop Server
+* Hop Translator
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/beam-file-definition.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/beam-file-definition.adoc
new file mode 100644
index 0000000..137ae6d
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/beam-file-definition.adoc
@@ -0,0 +1,40 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Beam File Definition
+
+== Description
+
+image:icons/folder.svg[]
+
+Describes a file layout in a Beam pipeline
+
+The Beam File Definition specifies the file layout (name, field definitions, enclosure and separator) to be used in Beam Pipelines.
+
+== Related Plugins
+
+Transforms:
+
+* xref:pipeline/transforms/beaminput.adoc[Beam Input]
+* xref:pipeline/transforms/beamoutput.adoc[Beam Output]
+
+== Options
+
+[options="header"]
+|===
+|Option |Description
+|Name|The name to be used for this Beam file definition
+|Description|The description to be used for this Beam file definition
+|Field Separator|separator used between fields in the file definition
+|Enclosure|field enclosure used for fields in the file definition
+|Field Definitions|List of field name, type, format, length and precision. Describes the file layout for this field definition.
+|===
+
+
+== Samples
+
+* beam/pipelines/complex.hpl
+* beam/pipelines/generate-synthetic-data.hpl
+* beam/pipelines/input-process-output.hpl
+* beam/pipelines/switch-case.hpl
+* beam/pipelines/unbounded-synthetic-data.hpl
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/cassandra/cassandra-connection.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/cassandra/cassandra-connection.adoc
index edcf895..7eea352 100644
--- a/hop-user-manual/modules/ROOT/pages/metadata-types/cassandra/cassandra-connection.adoc
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/cassandra/cassandra-connection.adoc
@@ -16,19 +16,29 @@ under the License.
 ////
 :documentationPath: /metadata-types/cassandra/
 :language: en_US
+:imagesdir: ../../assets/images/
+:page-pagination:
 
 = Cassandra Connection
 
 == Description
 
+image:icons/Cassandra_logo.svg[height="24px"]
+
 Connections can be created and edited using the logo (click on it to edit), and the drop down menu (arrow down) which you can find on the right of every connection line on the various Cassandra action or transform dialogs.
 
 They can also be managed with the metadata perspective in the Hop GUI. Finally, please note that Cassandra Connections are serialized as JSON in the Hop metadata folder under
 
 `metadata/cassandra-connection/`
 
-== The Options
+== Related Plugins
+
+* xref:pipeline/transforms/cassandra-input.adoc[Cassandra Input]
+* xref:pipeline/transforms/cassandra-output.adoc[Cassandra Output]
+
+== Options
 
+[options="header"]
 |===
 |Option |Description
 
@@ -62,3 +72,9 @@ WITH replication = {'class':'SimpleStrategy', 'replication_factor' : 3} ;`
 |Select if you want the text of each BATCH INSERT statement compressed (with GZIP) before transmitting it to the node.
 
 |===
+
+== Samples (Integration Tests)
+
+* integration-tests/cassandra/tests/cassandra-input-output/cassandra-input-validation.hpl
+* integration-tests/cassandra/tests/cassandra-input-output/cassandra-output-to-table.hpl
+
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/data-set.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/data-set.adoc
index e69de29..76672d0 100644
--- a/hop-user-manual/modules/ROOT/pages/metadata-types/data-set.adoc
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/data-set.adoc
@@ -0,0 +1,30 @@
+:page-pagination:
+
+= Data Set
+
+image:icons/dataset.svg[]
+
+
+This defines a data set, a static pre-defined collection of rows
+
+Data sets are used in xref:metadata-types/pipeline-unit-test.adoc[unit testing], where a data set is used as an alternative input data set. This input set is used to be processed in a unit testing pipeline. After processing the result of the pipeline is compared to a data set that has been specified as the 'golden data set' for the test.
+
+== Related Plugins
+
+None/All
+
+== Options
+
+[options="header"]
+|===
+|Option |Description
+|Name|The name to be used for this data set
+|Description|The description to be used for this data set
+|Set Folder (or use HOP_DATASETS_FOLDER)|project folder where data sets can be found and are saved
+|Base file name|the data set default name
+|data set fields and their column names in the file|List of field name, type, format, length and precision. Describes the file layout for this data set.
+|===
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/database-connection.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/database-connection.adoc
deleted file mode 100644
index e69de29..0000000
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/hop-server.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/hop-server.adoc
new file mode 100644
index 0000000..c264543
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/hop-server.adoc
@@ -0,0 +1,33 @@
+:page-pagination:
+
+= Hop Server
+
+== Description
+
+image:icons/server.svg[]
+
+Hop Server is a lightweight web server that hosts a Hop runtime for remote execution, with a web interfaces and a set of servlets to check execution status etc.
+
+Check the xref:hop-server/index.adoc[Hop Server docs] for more details.
+
+== Related Plugins
+
+None/All
+
+== Options
+
+[options="header"]
+|===
+|Option|Description
+|Server name|the name to use for this server definition
+|Hostname or IP address|
+|Port (empty is port 80)|
+|Web app name (optional)|
+|Username|
+|Password|
+|Use https protocal|default: false
+|===
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/index.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/index.adoc
new file mode 100644
index 0000000..3ef4e10
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/index.adoc
@@ -0,0 +1,34 @@
+:page-pagination:
+:page-pagination-no-back:
+
+= Metadata Types
+
+Metadata is one of the cornerstones in Hop. Metadata can be defined as workflows, pipelines and any other type of metadata objects.
+
+Hop Gui has a Metadata Perspective to manage all types of metadata: run configurations, database (relational and NoSQL) connections, logging, and pipeline probes just to name a few.
+
+Metadata is typically stored as json files in a projects' metadata folder as a set of json files, in subfolders per metadata type. The only exception to the rule are workflows and pipelines, which are defined as XML (for now, because of historical reasons). Since workflows and pipelines are what Hop is all about, these are typically stored in your project folder, not in your project's metadata folder.
+
+
+TIP: We've made it as easy as possible to add or remove plugins in Hop. Since metadata types are plugin types too, the available metadata types in your Hop installation may not match this list entirely.
+
+By default, Hop contains the following metadata types:
+
+
+* xref:metadata-types/beam-file-definition.adoc[Beam File Definition]: Describes a file layout in a Beam Pipeline
+* xref:metadata-types/cassandra/cassandra-connection.adoc[Cassandra Connection]: Describes a connection to a Cassandra cluster
+* xref:metadata-types/data-set.adoc[Data Set]: This defines a data set, a static pre-defined collection of rows
+* xref:metadata-types/hop-server.adoc[Hop Server]: Defines a Hop Server
+* xref:metadata-types/mongodb-connection.adoc[MongoDB Connection]: Describes a MongoDB connection
+* xref:metadata-types/neo4j/neo4j-connection.adoc[Neo4j Connection]: A shared connection to a Neo4j server
+* xref:metadata-types/neo4j/neo4j-graphmodel.adoc[Neo4j Graph Model]: Description of the nodes, relationships, indexes, ... of a Neo4j graph
+* xref:metadata-types/partition-schema.adoc[Partition Schema]: Describes a partition schema
+* xref:metadata-types/pipeline-log.adoc[Pipeline Log]: Allows to log the activity of a pipeline with another pipeline
+* xref:metadata-types/pipeline-probe.adoc[Pipeline Probe]: Allows to stream output rows of a pipeline to another pipeline
+* xref:metadata-types/pipeline-run-config.adoc[Pipeline Run Configuration]: Describes how and with which engine a pipeline is to be executed
+* xref:metadata-types/pipeline-unit-test.adoc[Pipeline Unit Test]: Describes a test for a pipeline with alternative data sets as input from a certain transform and testing output against golden data
+* xref:metadata-types/rdbms-connection.adoc[Relational Database Connection]: Describes all the metadata needed to connect to a relational database
+* xref:metadata-types/splunk-connection.adoc[Splunk Connection]: Describes a Splunk connection
+* xref:metadata-types/web-service.adoc[Web Service]: Allows to run a pipeline to generate output for a servlet on Hop Server
+* xref:metadata-types/workflow-log.adoc[Workflow Log]: Allows to log the activity of a workflow with a pipeline
+* xref:metadata-types/workflow-run-config.adoc[Workflow Run Configuration]: Describes how to run a workflow
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/metadata-types.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/metadata-types.adoc
deleted file mode 100644
index e69de29..0000000
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/mongodb-connection.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/mongodb-connection.adoc
new file mode 100644
index 0000000..1662714
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/mongodb-connection.adoc
@@ -0,0 +1,50 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= MongoDB Connection
+
+== Description
+
+image:icons/MongoDB_Leaf_FullColor_RGB.svg[width="24px"]
+
+Describes a MongoDB connection.
+
+The MongoDB connection, specified on a project level, can be reused across multiple (instances of) a transform or other plugin types.
+
+== Related Plugins
+
+* xref:pipeline/transforms/mongodbinput.adoc[MongoDB Input]
+* xref:pipeline/transforms/mongodboutput.adoc[MongoDB Output]
+
+== Options
+
+[options="header"]
+|===
+|Option|Default|Description
+|MongoDB Connection name||The name to use for this connection
+|Hostname|localhost|cluster hostname
+|Port|27017|the port for the Cassandra cluster
+|Database name||
+|Authentication database||
+|Username||
+|Password||
+|Authentication mechanism|PLAIN|SCRAM_SHA1, MONGODB_CR or PLAIN
+|User Kerberos|false|
+|Connection timeout (ms)||
+|Socket timeout (ms)||
+|Read preference|PRIMARY|PRIMARY, PRIMARY_PREFERRED, SECONDARY, SECONDARY_PREFERRED or NEAREST
+|Use all replica set members?|false|
+|Specify the read preference tag sets||
+|Use an SSL socket factory?|false|
+|Write concern||
+|Replication timeout (ms)||
+|Journaled?|true|
+|===
+
+== Samples (Integration Tests)
+
+./integration-tests/mongo/tests/mongo-update/mongo-insert-in-collection.hpl
+./integration-tests/mongo/tests/mongo-update/mongo-update-validation.hpl
+./integration-tests/mongo/tests/mongo-update/mongo-update-collection.hpl
+./integration-tests/mongo/tests/mongo-insert/mongo-insert-validation.hpl
+./integration-tests/mongo/tests/mongo-insert/mongo-insert-in-collection.hpl
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j-graphmodel.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j-graphmodel.adoc
deleted file mode 100644
index b58a678..0000000
--- a/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j-graphmodel.adoc
+++ /dev/null
@@ -1,26 +0,0 @@
-////
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-  http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-////
-:documentationPath: /metadata-types/
-:language: en_US
-
-= Neo4j Graph Model
-
-== Description
-
-A graph model describes (part of) a graph by allowing you to define nodes with their properties, and the relationships that connect these nodes.
-You can then use such a Graph Model to map input fields to properties in the link:neo4j-graphoutput.html[Neo4j Graph Output] transform.
-
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-connection.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-connection.adoc
index ed2beaa..37d2567 100644
--- a/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-connection.adoc
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-connection.adoc
@@ -16,11 +16,14 @@ under the License.
 ////
 :documentationPath: /metadata-types/neo4j/
 :language: en_US
+:page-pagination:
 
 = Neo4j Connection
 
 == Description
 
+image:icons/NEO4J.svg[width="24px"]
+
 Connections can be created and edited using the logo (click on it to edit), and the drop down menu (arrow down) which you can find on the right of every connection line on the various Neo4j dialogs.
 
 They can also be managed with the metadata perspective in the Hop GUI. Finally, please note that Neo4j Connections are serialized as JSON in the Hop metadata folder under
@@ -31,8 +34,9 @@ They can also be managed with the metadata perspective in the Hop GUI. Finally,
 
 **DON'T PANIC**: most of the options in the interface you don't need (...and most likely will never will need).
 
-== The Options
+== Options
 
+[options="header"]
 |===
 |Option |Description
 
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-graphmodel.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-graphmodel.adoc
index 3ceeb4d..9b9d9df 100644
--- a/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-graphmodel.adoc
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/neo4j/neo4j-graphmodel.adoc
@@ -14,13 +14,34 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 ////
-:documentationPath: /metadata-types/neo4j/
+:documentationPath: /metadata-types/
 :language: en_US
+:page-pagination:
 
 = Neo4j Graph Model
 
 == Description
 
+image:icons/NEO4J.svg[width="24px"]
+
 A graph model describes (part of) a graph by allowing you to define nodes with their properties, and the relationships that connect these nodes.
-You can then use such a Graph Model to map input fields to properties in the link:../../pipelines/transforms/neo4j-graphoutput.html[Neo4j Graph Output] transform.
 
+== Related Plugins
+
+* xref:pipeline/transforms/neo4j-graphoutput.adoc[Neo4j Graph Output]
+
+== Options
+
+[options="header"]
+|===
+|Option |Description
+|Model name|the name to be used for this model
+|Description|the description to be used for this model
+|Import graph from JSON|import this graph from a JSON file
+|Export graph to JSON|export this graph to a JSON file
+|Import Cypher Workbench model|Import a model from the Neo4j Cypher Workbench tool (not (yet) publicly available)
+|===
+
+== Samples (Integration Tests)
+
+* ./integration-tests/neo4j/tests/neo4j-graph-output/neo4j-cypher-build-graph.hpl
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/partition-schema.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/partition-schema.adoc
index e69de29..e035d07 100644
--- a/hop-user-manual/modules/ROOT/pages/metadata-types/partition-schema.adoc
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/partition-schema.adoc
@@ -0,0 +1,36 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Partition Schema
+
+== Description
+
+image:icons/partition_schema.svg[]
+
+Describes a partition schema. A partition schema defines how many ways the row stream will be split. The names used for the partitions can be anything you like.
+
+== Related Plugins
+
+None/All
+
+== Options
+
+[options="header"]
+|===
+|Option|Default|Description
+|Partition schema name||The name to be used for this partition schema
+|Dynamically create the schema definition|?|
+|Number of partitions?|4|
+|Partitions||list of partition IDs
+|===
+
+== Samples (Integration Tests)
+
+* integration-tests/partitioning/0006-partitioned-when-stream-lookup-should-fail2.hpl
+* integration-tests/partitioning/0004-copies-repartitioning.hpl
+* integration-tests/partitioning/0001-static-partitioning.hpl
+* integration-tests/partitioning/0005-partitioned-stream-lookup.hpl
+* integration-tests/partitioning/0006-partitioned-when-stream-lookup-should-fail.hpl
+* integration-tests/partitioning/0003-repartitioning.hpl
+* integration-tests/partitioning/0005-non-partitioned-stream-lookup.hpl
+* integration-tests/partitioning/0002-dynamic-partitioning.hpl
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-log.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-log.adoc
new file mode 100644
index 0000000..5d71228
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-log.adoc
@@ -0,0 +1,35 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Pipeline Log
+
+== Description
+
+image:icons/pipeline-log.svg[]
+
+Allows to log the activity of a pipeline with another pipeline.
+
+A pipeline log streams logging information from a running pipeline to another pipeline. This receiving pipeline can then process this logging information and e.g. write to a relational or NoSQL database, a Kafka topic etc
+
+== Related Plugins
+
+* Pipeline Logging
+
+== Options
+
+[options="header"]
+|===
+|Option|Default|Description
+|Name|The name to be used for this pipeline log|
+|Enabled?|true|
+|Logging parent pipelines only|true|
+|Pipeline executed to capture logging||the pipeline to process the logging information for this pipeline log
+|Execute at the start of the pipeline?|true|Should this pipeline log be executed at the start of a pipeline run
+|Execute at the end of the pipeline?|false|Should this pipeline log be executed at the end of a pipeline run
+|Execute periodically during execution?|true|Should this pipeline log be executed periodically during a pipeline run
+|Interval in seconds|30|if executed periodically, indicates the interval at which the pipeline log is executed
+|===
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-probe.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-probe.adoc
new file mode 100644
index 0000000..fd87fa7
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-probe.adoc
@@ -0,0 +1,31 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Pipeline Probe
+
+== Description
+
+image:icons/probe.svg[]
+
+Allows to stream output rows of a pipeline to another pipeline.
+
+A pipeline log streams data from a running pipeline to another pipeline. This receiving pipeline can then process this data for e.g. data quality, data profiling, data lineage etc
+
+== Related Plugins
+
+* Pipeline Probe
+
+== Options
+
+[options="header"]
+|===
+|Option|Default|Description
+|Name||The name to be used for this pipeline probe
+|Enabled|true|
+|Pipeline executed to capture logging||the pipeline to process the data for this pipeline probe
+|Capture output of the following transforms||list of pipelines and transforms to capture logging for
+|===
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-run-config.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-run-config.adoc
new file mode 100644
index 0000000..f1ee466
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-run-config.adoc
@@ -0,0 +1,38 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Pipeline Run Configuration
+
+== Description
+
+image:icons/pipeline_run_config.svg[]
+
+Describes how and with which engine a pipeline is to be executed.
+
+Pipelines can be executed on a variety of runtime engines. Check xref:pipeline/pipeline-run-configurations/pipeline-run-configurations.adoc[Pipeline Run Configurations] for more details.
+
+== Related Plugins
+
+None/All
+
+== Options
+
+[options="header"]
+|===
+|Option|Description
+|Name|the name to be used for this pipeline run configuration
+|Description|the description to be used for this pipeline run configuration
+|Engine Type
+a|The available pipeline engines are listed below. Detailed configuration depends on the xref:pipeline/pipeline-run-configurations/pipeline-run-configurations.adoc[selected engine].
+
+* Beam Dataflow pipeline engine
+* Beam Direct pipeline engine
+* Beam Flink pipeline engine
+* Beam Spark pipeline engine
+* Hop local pipeline engine
+* Hop remote pipeline engine
+|===
+
+== Samples
+
+Your Hop installation comes with a default 'local' pipeline run configuration.
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-unit-test.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-unit-test.adoc
new file mode 100644
index 0000000..96fde8e
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/pipeline-unit-test.adoc
@@ -0,0 +1,33 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Pipeline Unit Test
+
+== Description
+
+image:icons/Test_tube_icon.svg[]
+
+Describes a test for a pipeline with alternative data sets as input from a certain transform and testing output against golden data
+
+== Related Plugins
+
+None/All
+
+== Options
+
+[options="header"]
+|===
+|Option|Default|Description
+|Name||the name to use for this unit test
+|Description||the description to use for this unit test
+|Type of test|Development|'Development' or 'unit test'
+|The pipeline to test||the pipeline that will be tested by this unit test
+|Test pipeline filename (Optional)||
+|Base test path (or use HOP_UNIT_TESTS_FOLDER)||
+|Select this test automatically|false|
+|Replace a database connection with another||List of database connections in the pipeline to test (Original DB) to replace by database connections in this unit test (Replacement DB)
+|Variables||list of variable names and values to use for this test
+|===
+
+== Samples
+ None
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/rdbms-connection.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/rdbms-connection.adoc
new file mode 100644
index 0000000..d0dceaa
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/rdbms-connection.adoc
@@ -0,0 +1,85 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Relational Database Connection
+
+== Description
+
+image:icons/database.svg[]
+
+Describes all the metadata needed to connect to a relational database.
+
+== Related Plugins
+
+Actions:
+
+* xref:workflow/actions/checkdbconnection.adoc[Check DB Connections]
+* xref:workflow/actions/columnsexist.adoc[Columns exist in table]
+* xref:workflow/actions/mssqlbulkload.adoc[MS SQL Bulk Loader]
+* xref:workflow/actions/mysqlbulkfile.adoc[MySQL Bulk File]
+* xref:workflow/actions/mysqlbulkload.adoc[MySQL Bulk Loader]
+* xref:workflow/actions/sql.adoc[SQL]
+* xref:workflow/actions/tableexists.adoc[Table Exists]
+* xref:workflow/actions/truncatetables.adoc[Truncate Tables]
+* xref:workflow/actions/waitforsql.adoc[Wait for SQL]
+
+Transforms:
+
+* xref:pipeline/transforms/dbproc.adoc[Call DB Procedure]
+* xref:pipeline/transforms/columnexists.adoc[Column Exists]
+* xref:pipeline/transforms/combinationlookup.adoc[Combination Lookup/Update]
+* xref:pipeline/transforms/databasejoin.adoc[Database Join]
+* xref:pipeline/transforms/databaselookup.adoc[Database Lookup]
+* xref:pipeline/transforms/dynamicsqlrow.adoc[Dynamic SQL Row]
+* xref:pipeline/transforms/execsqlrow.adoc[Execute SQL Row]
+* xref:pipeline/transforms/insertupdate.adoc[Insert/Update]
+* xref:pipeline/transforms/pgbulkloader.adoc[PostgreSQL Bulk Loader]
+* xref:pipeline/transforms/synchronizeaftermerge.adoc[Synchronize After Merge]
+* xref:pipeline/transforms/tablecompare.adoc[Table Compare]
+* xref:pipeline/transforms/tableexists.adoc[Table Exists]
+* xref:pipeline/transforms/tableinput.adoc[Table Input]
+* xref:pipeline/transforms/tableoutput.adoc[Table Output]
+* xref:pipeline/transforms/terafast.adoc[Teradata Bulk Loader]
+* xref:pipeline/transforms/update.adoc[Update]
+
+== Options
+
+The options describe below are for the Generic database connection.
+
+The options for your selected database depend on the database vendor and/or engine. Check the list of xref:database/databases.adoc[databases] for more details.
+
+=== General
+
+[options="header"]
+|===
+|Option|Description
+|Connection name|the name to use for this connection
+|Connection type|the description to use for this connection
+|Username|
+|Password|
+|Driver class|classname to use for this connection. This is usually only needed for generic connections. There shouldn't be a need to specify if your select a specific database engine.
+|Manual Connection URL|This is usually only needed for generic connections. There shouldn't be a need to specify if your select a specific database engine.
+|===
+
+=== Advanced
+
+[options="header"]
+|===
+|Option|Default|Description
+|Supports the Boolean data type|true|
+|Supports the Timestamp data type|true|
+|Quote all identifiers in database||
+|Force all identifiers to lower case||
+|Force all identifiers to upper case||
+|Reserve case of reserved words?|true|
+|The preferred schema name||
+|The SQL statements to run after connecting (; separated||
+|===
+
+=== Options
+
+Specify a list of extra JDBC connection options as a parameter/value list.
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/splunk-connection.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/splunk-connection.adoc
new file mode 100644
index 0000000..1e60ad2
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/splunk-connection.adoc
@@ -0,0 +1,31 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Splunk Connection
+
+== Description
+
+image:icons/splunk.svg[]
+
+Describes a Splunk connection.
+
+
+== Related Plugins
+
+* xref:pipeline/transforms/splunkinput.adoc[Splunk Input]
+
+== Options
+
+[options="header"]
+|===
+|Option|Description
+|Connection name|the name to use for this splunk connection
+|Hostname or IP address|
+|Port|
+|Username|
+|Password|
+|===
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/web-service.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/web-service.adoc
index e69de29..2cc7dce 100644
--- a/hop-user-manual/modules/ROOT/pages/metadata-types/web-service.adoc
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/web-service.adoc
@@ -0,0 +1,32 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Web Service
+
+== Description
+
+image:icons/server.svg[]
+
+Hop has a simple way of exposing data through a servlet.
+
+== Related Plugins
+
+None/All
+
+== Options
+
+[options="header"]
+|===
+|Option |Description
+|Name|The name of the web service.  This is the name that is passed into the webService URL.
+|Enabled|Enables or disabled the web service
+|Filename on the server|This is the filename on the server.  Make sure that the pipeline you want to execute is available on the server.
+|Output transform|The name of the transform from which this service will take the output row(s).
+|Output field|The output field from which this service will take data from, convert it to a String and output it
+|Content type|The content type which will get reported by the webService servlet
+|List status on server|Enable this option if you want the executions of the web service pipeline to be listed in the status of the server.
+|===
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/workflow-log.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/workflow-log.adoc
new file mode 100644
index 0000000..a24837f
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/workflow-log.adoc
@@ -0,0 +1,35 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+
+= Workflow Log
+
+== Description
+
+image:icons/workflow-log.svg[]
+
+Allows to log the activity of a workflow with a pipeline.
+
+A workflow log streams logging information from a running workflow to a pipeline. This receiving pipeline can then process this logging information and e.g. write to a relational or NoSQL database, a Kafka topic etc
+
+== Related Plugins
+
+* Workflow Logging
+
+== Options
+
+[options="header"]
+|===
+|Option|Default|Description
+|Name|The name to be used for this workflow log|
+|Enabled?|true|
+|Logging parent workflow only|true|
+|Pipeline executed to capture logging||the pipeline to process the logging information for this workflow log
+|Execute at the start of the pipeline?|true|Should this workflow log be executed at the start of a pipeline run
+|Execute at the end of the pipeline?|false|Should this workflow log be executed at the end of a pipeline run
+|Execute periodically during execution?|true|Should this workflow log be executed periodically during a pipeline run
+|Interval in seconds|30|if executed periodically, indicates the interval at which the workflow log is executed
+|===
+
+== Samples
+
+None
\ No newline at end of file
diff --git a/hop-user-manual/modules/ROOT/pages/metadata-types/workflow-run-config.adoc b/hop-user-manual/modules/ROOT/pages/metadata-types/workflow-run-config.adoc
new file mode 100644
index 0000000..a938d7d
--- /dev/null
+++ b/hop-user-manual/modules/ROOT/pages/metadata-types/workflow-run-config.adoc
@@ -0,0 +1,34 @@
+:imagesdir: ../../assets/images/
+:page-pagination:
+:page-pagination-no-next:
+
+= Workflow Run Config
+
+== Description
+
+image:icons/workflow_run_config.svg[]
+
+Describes how to run a workflow
+
+Workflows can be executed either locally or remotely. Check xref:workflow/workflow-run-configurations/workflow-run-configurations.adoc[Workflow Run Configurations] for more details.
+
+
+== Related Plugins
+
+None/All actions
+
+== Options
+
+[options="header"]
+|===
+|Option|Description
+|Name|the name to use for this workflow run configuration
+|Description|the description to use for this workflow run configuration
+|Workflow engine type|Hop local workflow engine or Hop remote workflow engine
+|Safe mode|(default: false) In safe mode, Hop performs a number of data type and other validation before starting the workflow execution.
+|===
+
+== Samples
+
+Your Hop installation comes with a default 'local' workflow run configuration.
+
diff --git a/hop-user-manual/modules/ROOT/pages/plugins/plugins.adoc b/hop-user-manual/modules/ROOT/pages/plugins/plugins.adoc
index 72ab9ee..8b895e7 100644
--- a/hop-user-manual/modules/ROOT/pages/plugins/plugins.adoc
+++ b/hop-user-manual/modules/ROOT/pages/plugins/plugins.adoc
@@ -5,12 +5,32 @@ Hop is build around an eco-system of plguins, this gives the end users and infra
 
 The plugins are located in the following location `Instalation Directory/plugins`
 
-The most important plugin types are the following 4:
+The current plugin structure looks like this (with the amount of changes happening in Hop, new plugins may have appeared in your latest nightly build).
 
-. Database Plugins
-. Action Plugins
-. Transform Plugins
-. Miscellaneous Plugins
+This plugin organization is mainly technical, there is no 1 on 1 mapping between the plugins you'll find in the plugins directory and what you'll see in Hop Gui. For Example, the neo4j plugins category contains plugins for actions, transforms, metadata types, the Neo4j perspective etc.
+
+* xref:workflow/actions.adoc[Action Plugins]
+* xref:database/databases.adoc[Database Plugins]
+* Engines
+** Apache Beam (Spark, Flink and Google Dataflow run configurations over Apache Beam)
+* Miscellaneous Plugins
+** Debug
+** Git
+** Import
+** Passwords
+** xref:projects/index.adoc[Projects]
+** Reflection
+** Testing
+* Tech
+** Azure
+** Cassandra
+** Google
+** Neo4j
+* xref:pipeline/transforms.adoc[Transform Plugins]
+* Value Types
+** JSON
+* VFS
+** S3
 
 Each type is explained in their own section.
 
diff --git a/hop-user-manual/modules/ROOT/pages/projects/advanced.adoc b/hop-user-manual/modules/ROOT/pages/projects/advanced.adoc
index bc154db..8e1f678 100644
--- a/hop-user-manual/modules/ROOT/pages/projects/advanced.adoc
+++ b/hop-user-manual/modules/ROOT/pages/projects/advanced.adoc
@@ -98,5 +98,5 @@ Hop enviroments and their home folders are stored in the hop configuration file
 
 In addition to the Hop Gui and configuration files, all aspects of and operations on projects and environments can be managed through the Hop Conf command line tool.
 
-include::../hop-tools/hop-conf-projects.adoc[]
+include::../hop-tools/hop-conf/hop-conf-projects.adoc[]
 
diff --git a/hop-user-manual/modules/ROOT/pages/vfs/azure-blob-storage-vfs.adoc b/hop-user-manual/modules/ROOT/pages/vfs/azure-blob-storage-vfs.adoc
index c3cb865..d9296f8 100644
--- a/hop-user-manual/modules/ROOT/pages/vfs/azure-blob-storage-vfs.adoc
+++ b/hop-user-manual/modules/ROOT/pages/vfs/azure-blob-storage-vfs.adoc
@@ -39,17 +39,7 @@ You can find both in the Storage Accounts section of your Azure portal.
 
 All 3 options can be set in either the Hop GUI options dialog (Menu: Tools / Options) or using the following Hop Conf (`hop-conf.sh` or `hop-conf.bat`) command line options:
 
-[source,shell script]
-----
-      -aza, --azure-account=<account>
-                            The account to use for the Azure VFS
-      -azi, --azure-block-increment=<blockIncrement>
-                            The block increment size for new files on Azure,
-                              multiples of 512 only.
-      -azk, --azure-key=<key>
-                            The key to use for the Azure VFS
-
-----
+include::../hop-tools/hop-conf/hop-conf-cloud-azure-blob-storage.adoc[]
 
 Once done you will see an `azure` entry in the central `hop-config.json` file:
 
diff --git a/hop-user-manual/modules/ROOT/pages/vfs/google-cloud-storage-vfs.adoc b/hop-user-manual/modules/ROOT/pages/vfs/google-cloud-storage-vfs.adoc
index 13d79f2..79f5f0b 100644
--- a/hop-user-manual/modules/ROOT/pages/vfs/google-cloud-storage-vfs.adoc
+++ b/hop-user-manual/modules/ROOT/pages/vfs/google-cloud-storage-vfs.adoc
@@ -30,11 +30,7 @@ The scheme you can use to access your files in Google Cloud Storage is
 
 You need to generate a key file for a service account to make it work.  Go to the Google Cloud console to do this. Once you have a key file for your service account, with permissions to access your GCP storage, point to it with either a system environment variable called `GOOGLE_APPLICATION_CREDENTIALS` (standard Google way of doing this) or in the Options dialog in the 'Google Cloud' tab. You can also use `hop-conf`:
 
-[source,shell script]
-----
-      -gck, --google-cloud-service-account-key-file=<serviceAccountKeyFile>
-                            Configure the path to a Google Cloud service account JSON key file
-----
+include::../hop-tools/hop-conf/hop-conf-cloud-google-cloud-storage.adoc[]
 
 Once done you will see a `googleCloud` entry in the central `hop-config.json` file:
 
diff --git a/hop-user-manual/modules/ROOT/pages/vfs/google-drive-vfs.adoc b/hop-user-manual/modules/ROOT/pages/vfs/google-drive-vfs.adoc
index be70d3d..926ce07 100644
--- a/hop-user-manual/modules/ROOT/pages/vfs/google-drive-vfs.adoc
+++ b/hop-user-manual/modules/ROOT/pages/vfs/google-drive-vfs.adoc
@@ -30,14 +30,7 @@ The scheme you can use to access your files in Google Drive is
 
 You need to generate a credentials file to make it work.  Follow the Google documentation to see how that is done.  You also need to specify a folder in which security tokens are going to be saved.  You can specify both in the Hop system configuration options.  This can be done in the Hop GUI: go to the "Google Drive" tab in the Options dialog (from the Tools menu).  You can also use the `hop-conf` script with the following options:
 
-[source,shell script]
-----
-      -gdc, --google-drive-credentials-file=<credentialsFile>
-                            Configure the path to a Google Drive credentials JSON
-                              file
-      -gdt, --google-drive-tokens-folder=<tokensFolder>
-                            Configure the path to a Google Drive tokens folder
-----
+include::../hop-tools/hop-conf/hop-conf-cloud-google-drive.adoc[]
 
 Once done you will see a `googleDrive` entry in the central `hop-config.json` file: