diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.png b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.png
index 03f5232504f..522551a7946 100644
Binary files a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.png and b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.png differ
diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg
index 494798db691..43841b1fb64 100644
--- a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg
+++ b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/AppLifeCycle.svg
@@ -13,11 +13,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="765"
-   height="900"
-   viewBox="0 0 327 590"
+   height="722.83466"
+   viewBox="0 0 327 473.85828"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
+   inkscape:version="0.47 r22583"
    sodipodi:docname="AppLifeCycle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
@@ -32,7 +32,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -41,15 +41,15 @@
     <marker
        inkscape:stockid="Arrow2Lstart"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="Arrow2Lstart"
        style="overflow:visible">
       <path
          id="path4328"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) translate(1,0)" />
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)" />
     </marker>
     <marker
        inkscape:stockid="Arrow2Lend"
@@ -61,7 +61,7 @@
       <path
          id="path3605"
          style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
          transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
     </marker>
     <marker
@@ -73,7 +73,7 @@
        style="overflow:visible">
       <path
          id="path3727"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
          transform="scale(0.8,0.8)" />
     </marker>
@@ -86,7 +86,7 @@
        style="overflow:visible">
       <path
          id="path3587"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
          transform="matrix(-0.8,0,0,-0.8,-10,0)" />
     </marker>
@@ -107,7 +107,7 @@
        id="title33">state_deployed</title>
   </defs>
   <sodipodi:namedview
-     inkscape:window-height="1150"
+     inkscape:window-height="1144"
      inkscape:window-width="1914"
      inkscape:pageshadow="2"
      inkscape:pageopacity="1"
@@ -119,16 +119,16 @@
      pagecolor="#ffffff"
      id="base"
      showgrid="false"
-     inkscape:zoom="0.92828283"
-     inkscape:cx="289.31719"
-     inkscape:cy="428.51283"
+     inkscape:zoom="1.2118954"
+     inkscape:cx="382.5"
+     inkscape:cy="361.41733"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:current-layer="svg2"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:document-units="cm"
-     units="in"
+     units="cm"
      inkscape:snap-guide="true"
      inkscape:snap-bbox="true"
      inkscape:bbox-paths="false"
@@ -151,233 +151,241 @@
        snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <g
-     id="g2936">
-    <polygon
-       style="fill:#ffa500;stroke:#ffa500;stroke-width:0.80055952"
-       points="144,-468 228,-468 228,-510 228,-510 144,-510 "
-       id="polygon3447"
-       transform="matrix(1.2491264,0,0,1.2491264,114.40682,816.04947)" />
-    <text
-       x="346.67847"
-       y="210.18901"
-       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       id="text3449"
-       sodipodi:linespacing="125%">
-      <tspan
-         sodipodi:role="line"
-         id="tspan3453"
-         x="346.67847"
-         y="210.18901">Deploying</tspan>
-    </text>
-  </g>
-  <g
-     id="g2952">
-    <polygon
-       transform="matrix(1.6111428,0,0,1.2491264,-118.06476,648.90074)"
-       id="polygon3491"
-       points="138,-390 230,-390 230,-432 230,-432 138,-432 "
-       style="fill:#00ffff;stroke:#00ffff;stroke-width:0.70490372" />
-    <text
-       sodipodi:linespacing="125%"
-       id="text3493"
-       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       y="140.47214"
-       x="178.42064">
-      <tspan
-         sodipodi:role="line"
-         id="tspan3505"
+     id="g3665"
+     transform="translate(1.2741127,1.9059326)">
+    <g
+       transform="translate(-6.3558215,12.386246)"
+       id="g2936">
+      <polygon
+         transform="matrix(1.2491264,0,0,1.2491264,114.40682,816.04947)"
+         id="polygon3447"
+         points="228,-510 228,-510 144,-510 144,-468 228,-468 "
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3449"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="210.18901"
+         x="346.67847">
+        <tspan
+           y="210.18901"
+           x="346.67847"
+           id="tspan3453"
+           sodipodi:role="line">Deploying</tspan>
+      </text>
+    </g>
+    <g
+       transform="translate(-6.3558215,12.386246)"
+       id="g2952">
+      <polygon
+         style="fill:#00ffff;stroke:#00ffff;stroke-width:0.70490372"
+         points="230,-432 230,-432 138,-432 138,-390 230,-390 "
+         id="polygon3491"
+         transform="matrix(1.6111428,0,0,1.2491264,-118.06476,648.90074)" />
+      <text
          x="178.42064"
-         y="140.47214">Undeployed</tspan>
-    </text>
-  </g>
-  <g
-     id="g2944">
-    <polygon
-       style="fill:#ffa500;stroke:#ffa500;stroke-width:0.80055952"
-       points="228,-510 144,-510 144,-468 228,-468 228,-510 "
-       id="polygon3551"
-       transform="matrix(1.4834695,0,0,1.2470109,-274.63019,815.015)" />
+         y="140.47214"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text3493"
+         sodipodi:linespacing="125%">
+        <tspan
+           y="140.47214"
+           x="178.42064"
+           id="tspan3505"
+           sodipodi:role="line">Undeployed</tspan>
+      </text>
+    </g>
+    <g
+       transform="translate(-6.3558215,12.386246)"
+       id="g2944">
+      <polygon
+         transform="matrix(1.4834695,0,0,1.2470109,-274.63019,815.015)"
+         id="polygon3551"
+         points="144,-468 228,-468 228,-510 228,-510 144,-510 "
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3553"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="210.18903"
+         x="1.3302708">
+        <tspan
+           y="210.18903"
+           x="1.3302691"
+           id="tspan3561"
+           sodipodi:role="line">Undeploying</tspan>
+      </text>
+    </g>
+    <g
+       transform="matrix(1.2491264,0,0,1.2491264,-109.24039,19.970246)"
+       id="g3483">
+      <ellipse
+         d="m 318.7846,-564 c 0,9.94113 -43.33194,18 -96.7846,18 -53.45266,0 -96.7846,-8.05887 -96.7846,-18 0,-9.94113 43.33194,-18 96.7846,-18 53.45266,0 96.7846,8.05887 96.7846,18 z"
+         transform="translate(4,586)"
+         sodipodi:ry="18"
+         sodipodi:rx="96.784599"
+         sodipodi:cy="-564"
+         sodipodi:cx="222"
+         id="ellipse3485"
+         ry="18"
+         rx="96.784599"
+         cy="-564"
+         cx="222"
+         style="fill:#c1c1c1;fill-opacity:1;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3487"
+         style="font-size:14.39999962px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="26.099976"
+         x="226">Incoming WebApp</text>
+    </g>
+    <path
+       sodipodi:nodetypes="cc"
+       id="path2594"
+       d="m 174.04489,69.910232 0,50.845998"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 246.14225,166.65923 41.78294,36.021"
+       id="path3923"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path3925"
+       d="m 287.92519,225.48323 -57.81112,52.05"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <g
+       transform="translate(-6.3558215,12.386246)"
+       id="g2928">
+      <polygon
+         transform="matrix(1.2491264,0,0,1.2491264,-50.829179,787.70992)"
+         id="polygon3471"
+         points="230,-432 230,-432 138,-432 138,-390 230,-390 "
+         style="fill:#00ffff;stroke:#00ffff;stroke-width:0.80055952" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3473"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="279.28131"
+         x="178.94421">
+        <tspan
+           y="279.28131"
+           x="178.94421"
+           id="tspan3477"
+           sodipodi:role="line">Deployed</tspan>
+      </text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 230.11407,296.60023 57.18658,46.465"
+       id="path3927"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 56.368406,199.14923 41.548722,-33.236"
+       id="path3941"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 115.19445,276.22323 -58.826044,-50.892"
+       id="path3943"
+       sodipodi:nodetypes="cc" />
     <text
-       x="1.3302708"
-       y="210.18903"
-       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       id="text3553"
-       sodipodi:linespacing="125%">
+       sodipodi:linespacing="100%"
+       id="text2456"
+       style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic"
+       y="36.154835"
+       x="-17.191069">
       <tspan
-         sodipodi:role="line"
-         id="tspan3561"
-         x="1.3302691"
-         y="210.18903">Undeploying</tspan>
-    </text>
-  </g>
-  <g
-     id="g3483"
-     transform="matrix(1.2491264,0,0,1.2491264,-102.88457,7.5836656)">
-    <ellipse
-       style="fill:#c1c1c1;fill-opacity:1;stroke:none"
-       cx="222"
-       cy="-564"
-       rx="96.784599"
-       ry="18"
-       id="ellipse3485"
-       sodipodi:cx="222"
-       sodipodi:cy="-564"
-       sodipodi:rx="96.784599"
-       sodipodi:ry="18"
-       transform="translate(4,586)"
-       d="m 318.7846,-564 c 0,9.94113 -43.33194,18 -96.7846,18 -53.45266,0 -96.7846,-8.05887 -96.7846,-18 0,-9.94113 43.33194,-18 96.7846,-18 53.45266,0 96.7846,8.05887 96.7846,18 z" />
-    <text
-       x="226"
-       y="26.099976"
-       style="font-size:14.39999962px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       id="text3487"
-       sodipodi:linespacing="125%">Incoming WebApp</text>
-  </g>
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.9988189;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
-     d="M 180.40071,57.523395 L 180.40071,108.36997"
-     id="path2594"
-     sodipodi:nodetypes="cc" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path3923"
-     d="M 252.49807,154.27312 L 294.28101,190.29424"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 294.28101,213.09705 L 236.46989,265.1469"
-     id="path3925"
-     sodipodi:nodetypes="cc" />
-  <g
-     id="g2928">
-    <polygon
-       style="fill:#00ffff;stroke:#00ffff;stroke-width:0.80055952"
-       points="138,-390 230,-390 230,-432 230,-432 138,-432 "
-       id="polygon3471"
-       transform="matrix(1.2491264,0,0,1.2491264,-50.829179,787.70992)" />
-    <text
-       x="178.94421"
-       y="279.28131"
-       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       id="text3473"
-       sodipodi:linespacing="125%">
+         style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic"
+         y="36.154835"
+         x="-17.191067"
+         id="tspan2460"
+         sodipodi:role="line">App</tspan>
       <tspan
-         sodipodi:role="line"
-         id="tspan3477"
-         x="178.94421"
-         y="279.28131">Deployed</tspan>
+         style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic"
+         id="tspan2464"
+         y="56.618599"
+         x="-17.191069"
+         sodipodi:role="line">LifeCycle</tspan>
     </text>
-  </g>
-  <path
-     sodipodi:nodetypes="cc"
-     id="path3927"
-     d="M 236.46989,284.21436 L 293.65647,330.6791"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path3941"
-     d="M 62.724228,186.76323 L 104.27295,153.52683"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <path
-     sodipodi:nodetypes="cc"
-     id="path3943"
-     d="M 121.55027,263.8367 L 62.724228,212.94524"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <text
-     x="-10.835248"
-     y="23.769073"
-     style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic"
-     id="text2456"
-     sodipodi:linespacing="100%">
-    <tspan
-       sodipodi:role="line"
-       id="tspan2460"
-       x="-10.835247"
-       y="23.769073"
-       style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic">App</tspan>
-    <tspan
-       sodipodi:role="line"
-       x="-10.835247"
-       y="44.232838"
-       id="tspan2464"
-       style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic">LifeCycle</tspan>
-  </text>
-  <g
-     id="g2904"
-     transform="translate(0,-136.06598)">
-    <polygon
-       style="fill:#ffa500;stroke:#ffa500;stroke-width:0.80055952"
-       points="228,-510 228,-510 144,-510 144,-468 228,-468 "
-       id="polygon2474"
-       transform="matrix(1.2491264,0,0,1.2491264,114.40682,1087.7193)" />
-    <text
-       x="346.96829"
-       y="481.85883"
-       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       id="text2476"
-       sodipodi:linespacing="125%">
-      <tspan
+    <g
+       transform="translate(-6.3558215,-123.67976)"
+       id="g2904">
+      <polygon
+         transform="matrix(1.2491264,0,0,1.2491264,114.40682,1087.7193)"
+         id="polygon2474"
+         points="144,-510 144,-468 228,-468 228,-510 228,-510 "
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2476"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
          y="481.85883"
-         x="346.96829"
-         id="tspan2480"
-         sodipodi:role="line">Starting</tspan>
-    </text>
-  </g>
-  <g
-     id="g2920"
-     transform="translate(0,-0.23108)">
-    <polygon
-       style="fill:#ffa500;stroke:#ffa500;stroke-width:0.80055952"
-       points="228,-510 228,-510 144,-510 144,-468 228,-468 "
-       id="polygon2484"
-       transform="matrix(1.2491264,0,0,1.2491264,-222.07659,951.8844)" />
-    <text
-       x="10.484886"
-       y="346.02393"
-       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       id="text2486"
-       sodipodi:linespacing="125%">
-      <tspan
+         x="346.96829">
+        <tspan
+           sodipodi:role="line"
+           id="tspan2480"
+           x="346.96829"
+           y="481.85883">Starting</tspan>
+      </text>
+    </g>
+    <g
+       transform="translate(-6.3558215,12.155246)"
+       id="g2920">
+      <polygon
+         transform="matrix(1.2491264,0,0,1.2491264,-222.07659,951.8844)"
+         id="polygon2484"
+         points="144,-510 144,-468 228,-468 228,-510 228,-510 "
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2486"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
          y="346.02393"
-         x="10.484884"
-         id="tspan2490"
-         sodipodi:role="line">Stopping</tspan>
-    </text>
-  </g>
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 62.724228,326.37326 L 121.55027,286.42657"
-     id="path2494"
-     sodipodi:nodetypes="cc" />
-  <g
-     id="g2912"
-     transform="translate(0,-136.29706)">
-    <polygon
-       transform="matrix(1.2491264,0,0,1.2491264,-51.844096,1059.3798)"
-       id="polygon2553"
-       points="230,-390 230,-432 230,-432 138,-432 138,-390 "
-       style="fill:#00ffff;stroke:#00ffff;stroke-width:0.80055952" />
-    <text
-       sodipodi:linespacing="125%"
-       id="text2555"
-       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
-       y="552.69458"
-       x="178.21913">
-      <tspan
-         y="552.69458"
+         x="10.484886">
+        <tspan
+           sodipodi:role="line"
+           id="tspan2490"
+           x="10.484884"
+           y="346.02393">Stopping</tspan>
+      </text>
+    </g>
+    <path
+       sodipodi:nodetypes="cc"
+       id="path2494"
+       d="m 56.368406,338.75923 58.826044,-39.946"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <g
+       transform="translate(-6.3558215,-123.91076)"
+       id="g2912">
+      <polygon
+         style="fill:#00ffff;stroke:#00ffff;stroke-width:0.80055952"
+         points="230,-432 138,-432 138,-390 230,-390 230,-432 "
+         id="polygon2553"
+         transform="matrix(1.2491264,0,0,1.2491264,-51.844096,1059.3798)" />
+      <text
          x="178.21913"
-         id="tspan2559"
-         sodipodi:role="line">Started</tspan>
-    </text>
+         y="552.69458"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text2555"
+         sodipodi:linespacing="125%">
+        <tspan
+           sodipodi:role="line"
+           id="tspan2559"
+           x="178.21913"
+           y="552.69458">Started</tspan>
+      </text>
+    </g>
+    <path
+       sodipodi:nodetypes="cc"
+       id="path2561"
+       d="m 114.17953,414.91423 -57.104922,-50.065"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path2563"
+       d="m 287.92519,367.75723 -58.82603,53.672"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
   </g>
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow2Lend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 120.53535,402.5276 63.43043,352.463"
-     id="path2561"
-     sodipodi:nodetypes="cc" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
-     d="m 294.28101,355.37135 -58.82603,53.67139"
-     id="path2563"
-     sodipodi:nodetypes="cc" />
 </svg>
diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.png b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.png
new file mode 100644
index 00000000000..9436817ac33
Binary files /dev/null and b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.png differ
diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.svg b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.svg
new file mode 100644
index 00000000000..969021da7fa
--- /dev/null
+++ b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.svg
@@ -0,0 +1,777 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generated by Graphviz version 2.20.2 (Mon Mar 30 10:11:53 UTC 2009)
+     For user: (joakim) Joakim Erdfelt,,, -->
+
+<!-- Title: G Pages: 1 -->
+
+<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:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1530.7086"
+   height="722.83466"
+   viewBox="0 0 654.3029 473.85826"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="DefaultAppLifeCycleBindings.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   inkscape:export-filename="/home/joakim/code/webtide/jetty7-git/jetty/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DefaultAppLifeCycleBindings.png"
+   inkscape:export-xdpi="50.05294"
+   inkscape:export-ydpi="50.05294">
+  <sodipodi:namedview
+     inkscape:window-height="1144"
+     inkscape:window-width="1914"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="13"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="0.85693946"
+     inkscape:cx="731.22712"
+     inkscape:cy="317.08378"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:document-units="cm"
+     units="cm"
+     inkscape:snap-guide="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-intersection-line-segments="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-center="false"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       snapvisiblegridlinesonly="true"
+       empspacing="5"
+       spacingy="0.25cm"
+       spacingx="0.25cm"
+       units="cm"
+       enabled="true"
+       visible="true"
+       dotted="true"
+       id="grid3514"
+       type="xygrid" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="1532.1969,282.40035"
+       id="guide5198" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata184">
+    <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>
+  <defs
+     id="defs182">
+    <marker
+       style="overflow:visible"
+       id="DotL"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotL">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4059" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow2Lstart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lstart">
+      <path
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path4328" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow2Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Lend">
+      <path
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         id="path3605" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="TriangleOutL"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="TriangleOutL">
+      <path
+         transform="scale(0.8,0.8)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         id="path3727" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Arrow1Lend"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         id="path3587" />
+    </marker>
+    <inkscape:perspective
+       id="perspective186"
+       inkscape:persp3d-origin="204.375 : 245.83333 : 1"
+       inkscape:vp_z="408.75 : 368.75 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 368.75 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <title
+       id="title5">G</title>
+    <title
+       id="title10">incoming_app</title>
+    <title
+       id="title17">command_deploy</title>
+    <title
+       id="title33">state_deployed</title>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3722" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3747" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3775" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3803" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3847" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3876" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3876-6" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3954" />
+    <marker
+       style="overflow:visible"
+       id="DotLD"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLD">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4861" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotLW"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLW">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4864" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5056"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       style="overflow:visible"
+       id="DotLD-2"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLD">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4861-8" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotLW-9"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLW">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4864-2" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5056-5"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       style="overflow:visible"
+       id="DotLD-3"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLD">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4861-6" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotLW-2"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLW">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4864-3" />
+    </marker>
+    <inkscape:perspective
+       id="perspective5056-7"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       style="overflow:visible"
+       id="DotLD-5"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLD">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4861-1" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="DotLW-4"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="DotLW">
+      <path
+         transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+         style="fill:#ff0d0d;fill-rule:evenodd;stroke:#ff0d0d;stroke-width:1pt;marker-start:none;marker-end:none"
+         d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+         id="path4864-28" />
+    </marker>
+  </defs>
+  <g
+     id="g5120"
+     transform="translate(164.12806,-1.8650493)">
+    <g
+       id="g2936"
+       transform="translate(-5.0817088,14.292179)">
+      <polygon
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1"
+         points="228,-510 144,-510 144,-468 228,-468 228,-510 "
+         id="polygon3447"
+         transform="matrix(1.2491264,0,0,1.2491264,114.40682,816.04947)" />
+      <text
+         x="346.67847"
+         y="210.18901"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text3449"
+         sodipodi:linespacing="125%">
+        <tspan
+           sodipodi:role="line"
+           id="tspan3453"
+           x="346.67847"
+           y="210.18901">Deploying</tspan>
+      </text>
+    </g>
+    <polygon
+       style="fill:#00ffff;stroke:#00ffff;stroke-width:0.70490372"
+       points="138,-390 230,-390 230,-432 230,-432 138,-432 "
+       id="polygon3491"
+       transform="matrix(1.6111428,0,0,1.2491264,-123.14647,663.19292)" />
+    <text
+       x="173.33893"
+       y="154.76431"
+       style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+       id="text3493"
+       sodipodi:linespacing="125%">
+      <tspan
+         y="154.76431"
+         x="173.33893"
+         id="tspan3505"
+         sodipodi:role="line">Undeployed</tspan>
+    </text>
+    <g
+       id="g2944"
+       transform="translate(-5.0817088,14.292179)">
+      <polygon
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1"
+         points="228,-468 228,-510 228,-510 144,-510 144,-468 "
+         id="polygon3551"
+         transform="matrix(1.4834695,0,0,1.2470109,-274.63019,815.015)" />
+      <text
+         x="1.3302708"
+         y="210.18903"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text3553"
+         sodipodi:linespacing="125%">
+        <tspan
+           sodipodi:role="line"
+           id="tspan3561"
+           x="1.3302691"
+           y="210.18903">Undeploying</tspan>
+      </text>
+    </g>
+    <g
+       id="g3483"
+       transform="matrix(1.2491264,0,0,1.2491264,-107.96628,21.876179)">
+      <ellipse
+         style="fill:#c1c1c1;fill-opacity:1;stroke:none"
+         cx="222"
+         cy="-564"
+         rx="96.784599"
+         ry="18"
+         id="ellipse3485"
+         sodipodi:cx="222"
+         sodipodi:cy="-564"
+         sodipodi:rx="96.784599"
+         sodipodi:ry="18"
+         transform="translate(4,586)"
+         d="m 318.7846,-564 c 0,9.94113 -43.33194,18 -96.7846,18 -53.45266,0 -96.7846,-8.05887 -96.7846,-18 0,-9.94113 43.33194,-18 96.7846,-18 53.45266,0 96.7846,8.05887 96.7846,18 z" />
+      <text
+         x="226"
+         y="26.099976"
+         style="font-size:14.39999962px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text3487"
+         sodipodi:linespacing="125%">Incoming WebApp</text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 175.319,71.816165 0,50.845995"
+       id="path2594"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path3923"
+       d="m 247.41636,168.56516 41.78294,36.021"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 289.1993,227.38916 -57.81112,52.05"
+       id="path3925"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g2928"
+       transform="translate(-5.0817088,14.292179)">
+      <polygon
+         style="fill:#00ffff;stroke:#00ffff;stroke-width:0.80055952"
+         points="230,-432 138,-432 138,-390 230,-390 230,-432 "
+         id="polygon3471"
+         transform="matrix(1.2491264,0,0,1.2491264,-50.829179,787.70992)" />
+      <text
+         x="178.94421"
+         y="279.28131"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text3473"
+         sodipodi:linespacing="125%">
+        <tspan
+           sodipodi:role="line"
+           id="tspan3477"
+           x="178.94421"
+           y="279.28131">Deployed</tspan>
+      </text>
+    </g>
+    <path
+       sodipodi:nodetypes="cc"
+       id="path3927"
+       d="m 231.38818,298.50616 57.18658,46.465"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path3941"
+       d="m 57.642519,201.05516 41.548722,-33.236"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path3943"
+       d="m 116.46856,278.12916 -58.826041,-50.892"
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)" />
+    <text
+       x="-254.59583"
+       y="43.415741"
+       style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic"
+       id="text2456"
+       sodipodi:linespacing="100%">
+      <tspan
+         sodipodi:role="line"
+         id="tspan2460"
+         x="-254.59583"
+         y="43.415741"
+         style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic">Default</tspan>
+      <tspan
+         id="tspan5116"
+         sodipodi:role="line"
+         x="-254.59583"
+         y="63.879505"
+         style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic">App</tspan>
+      <tspan
+         sodipodi:role="line"
+         x="-254.59583"
+         y="84.343269"
+         id="tspan2464"
+         style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic">LifeCycle</tspan>
+      <tspan
+         id="tspan5118"
+         sodipodi:role="line"
+         x="-254.59583"
+         y="104.80704"
+         style="font-size:20.46376419px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans Bold Italic">Bindings</tspan>
+    </text>
+    <g
+       id="g2904"
+       transform="translate(-5.0817088,-121.77383)">
+      <polygon
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1"
+         points="144,-468 228,-468 228,-510 228,-510 144,-510 "
+         id="polygon2474"
+         transform="matrix(1.2491264,0,0,1.2491264,114.40682,1087.7193)" />
+      <text
+         x="346.96829"
+         y="481.85883"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text2476"
+         sodipodi:linespacing="125%">
+        <tspan
+           y="481.85883"
+           x="346.96829"
+           id="tspan2480"
+           sodipodi:role="line">Starting</tspan>
+      </text>
+    </g>
+    <g
+       id="g2920"
+       transform="translate(-5.0817088,14.061179)">
+      <polygon
+         style="fill:#00ffff;fill-opacity:1;stroke:#00aaaa;stroke-width:0.80055952;stroke-opacity:1"
+         points="144,-468 228,-468 228,-510 228,-510 144,-510 "
+         id="polygon2484"
+         transform="matrix(1.2491264,0,0,1.2491264,-222.07659,951.8844)" />
+      <text
+         x="10.484886"
+         y="346.02393"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         id="text2486"
+         sodipodi:linespacing="125%">
+        <tspan
+           y="346.02393"
+           x="10.484884"
+           id="tspan2490"
+           sodipodi:role="line">Stopping</tspan>
+      </text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 57.642519,340.66516 58.826041,-39.946"
+       id="path2494"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g2912"
+       transform="translate(-5.0817088,-122.00483)">
+      <polygon
+         transform="matrix(1.2491264,0,0,1.2491264,-51.844096,1059.3798)"
+         id="polygon2553"
+         points="138,-432 138,-390 230,-390 230,-432 230,-432 "
+         style="fill:#00ffff;stroke:#00ffff;stroke-width:0.80055952" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2555"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="552.69458"
+         x="178.21913">
+        <tspan
+           y="552.69458"
+           x="178.21913"
+           id="tspan2559"
+           sodipodi:role="line">Started</tspan>
+      </text>
+    </g>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 115.45364,416.82016 -57.104919,-50.065"
+       id="path2561"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow2Lend)"
+       d="m 289.1993,369.66316 -58.82603,53.672"
+       id="path2563"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g3977"
+       transform="translate(7.7330887,-301.24273)">
+      <rect
+         ry="14.334748"
+         rx="13.523358"
+         y="479.53809"
+         x="-319.58121"
+         height="78.435448"
+         width="207.17775"
+         id="rect2870-4-7-5"
+         style="fill:#9bffa7;fill-opacity:1;stroke:#05aa00;stroke-width:1.31111109;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3493-7-9-4-2"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="507.49014"
+         x="-216.57639">
+        <tspan
+           sodipodi:role="line"
+           id="tspan3505-5-2-2-4"
+           x="-216.57639"
+           y="507.49014">StandardUndeployer</tspan>
+      </text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3823"
+         y="521.42426"
+         x="-306.41623"
+         style="font-size:10.48471642px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+         xml:space="preserve"><tspan
+           y="521.42426"
+           x="-306.41623"
+           id="tspan3825"
+           sodipodi:role="line">Removes Contexts</tspan><tspan
+           id="tspan3864"
+           y="534.53015"
+           x="-306.41623"
+           sodipodi:role="line">Removes Handlers</tspan><tspan
+           id="tspan3866"
+           y="547.63605"
+           x="-306.41623"
+           sodipodi:role="line">Frees Up Resources</tspan></text>
+    </g>
+    <g
+       id="g3939"
+       transform="translate(19.889905,-73.43965)">
+      <rect
+         ry="12.711966"
+         rx="13.523358"
+         y="401.10266"
+         x="-317.9584"
+         height="57.339012"
+         width="194.19533"
+         id="rect2870-4-7"
+         style="fill:#9bffa7;fill-opacity:1;stroke:#05aa00;stroke-width:1.31111109;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3493-7-9-4"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="429.05469"
+         x="-221.44481">
+        <tspan
+           sodipodi:role="line"
+           id="tspan3505-5-2-2"
+           x="-221.44481"
+           y="429.05469">StandardStopper</tspan>
+      </text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3823-0"
+         y="445.06137"
+         x="-298.81668"
+         style="font-size:10.48471642px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+         xml:space="preserve"><tspan
+           y="445.06137"
+           x="-298.81668"
+           id="tspan3825-5"
+           sodipodi:role="line">Disables Incoming Requests</tspan></text>
+    </g>
+    <g
+       id="g3932"
+       transform="translate(766.52635,50.489759)">
+      <rect
+         ry="14.875703"
+         rx="13.523358"
+         y="276.14685"
+         x="-322.82678"
+         height="57.380497"
+         width="194.19533"
+         id="rect2870-4"
+         style="fill:#9bffa7;fill-opacity:1;stroke:#05aa00;stroke-width:1.31111109;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3493-7-9"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="304.09891"
+         x="-226.31319">
+        <tspan
+           sodipodi:role="line"
+           id="tspan3505-5-2"
+           x="-226.31319"
+           y="304.09891">StandardStarter</tspan>
+      </text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3823-4"
+         y="316.95959"
+         x="-299.94962"
+         style="font-size:10.48471642px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+         xml:space="preserve"><tspan
+           id="tspan3866-6"
+           y="316.95959"
+           x="-299.94962"
+           sodipodi:role="line">Allows Incoming Requests</tspan></text>
+    </g>
+    <g
+       id="g3923"
+       transform="translate(725.21654,76.499635)">
+      <rect
+         ry="13.79382"
+         rx="14.064292"
+         y="102.23655"
+         x="-284.69095"
+         height="82.221977"
+         width="194.19534"
+         id="rect2870"
+         style="fill:#9bffa7;fill-opacity:1;stroke:#05aa00;stroke-width:1.31111109;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3493-7"
+         style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
+         y="130.1886"
+         x="-188.17734">
+        <tspan
+           sodipodi:role="line"
+           id="tspan3505-5"
+           x="-188.17734"
+           y="130.1886">StandardDeployer</tspan>
+      </text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3823-7"
+         y="143.86069"
+         x="-268.57544"
+         style="font-size:10.48471642px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic"
+         xml:space="preserve"><tspan
+           y="143.86069"
+           x="-268.57544"
+           id="tspan3825-56"
+           sodipodi:role="line">Allocates Resources</tspan><tspan
+           id="tspan3914"
+           y="156.96658"
+           x="-268.57544"
+           sodipodi:role="line">Creates Contexts</tspan><tspan
+           id="tspan3866-3"
+           y="170.07248"
+           x="-268.57544"
+           sodipodi:role="line">Creates / Adds Handlers</tspan></text>
+    </g>
+    <path
+       style="fill:#ff1f1f;fill-opacity:1;stroke:#ff0d0d;stroke-width:1.16141737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotLD);marker-mid:none;marker-end:url(#DotLW)"
+       d="m -104.67037,221.33486 38.578079,0.44811"
+       id="path3988"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#ff1f1f;fill-opacity:1;stroke:#ff0d0d;stroke-width:1.16141737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotLD);marker-mid:none;marker-end:url(#DotLW)"
+       d="m -103.87317,356.47299 56.589073,-0.54095"
+       id="path3988-8"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#ff1f1f;fill-opacity:1;stroke:#ff0d0d;stroke-width:1.16141737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotLD);marker-mid:none;marker-end:url(#DotLW)"
+       d="m 394.12593,220.69852 46.39966,-0.54095"
+       id="path3988-9"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#ff1f1f;fill-opacity:1;stroke:#ff0d0d;stroke-width:1.16141737;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotLD);marker-mid:none;marker-end:url(#DotLW)"
+       d="m 394.12593,356.47298 49.57364,0.54092"
+       id="path3988-2"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.png b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.png
index fd341172bd4..b24de8c5873 100644
Binary files a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.png and b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.png differ
diff --git a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.svg b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.svg
index 6b4281dc438..375f4dab298 100644
--- a/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.svg
+++ b/jetty-deploy/src/main/javadoc/org/eclipse/jetty/deploy/doc-files/DeploymentManager.svg
@@ -17,7 +17,7 @@
    viewBox="0 0 327 590"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47pre4 r22446"
+   inkscape:version="0.47 r22583"
    sodipodi:docname="DeploymentManager.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
@@ -200,9 +200,16 @@
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
          transform="matrix(-0.8,0,0,-0.8,-10,0)" />
     </marker>
+    <inkscape:perspective
+       id="perspective2903"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
   </defs>
   <sodipodi:namedview
-     inkscape:window-height="1150"
+     inkscape:window-height="1144"
      inkscape:window-width="1914"
      inkscape:pageshadow="2"
      inkscape:pageopacity="1"
@@ -215,8 +222,8 @@
      id="base"
      showgrid="false"
      inkscape:zoom="1.4142136"
-     inkscape:cx="491.99319"
-     inkscape:cy="522.61453"
+     inkscape:cx="403.9584"
+     inkscape:cy="579.18307"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:current-layer="svg2"
@@ -287,20 +294,15 @@
      id="polygon3312"
      transform="matrix(1.8650712,0,0,1.4508985,-123.28021,719.97907)" />
   <text
-     x="219.019"
-     y="117.38"
+     x="219.83141"
+     y="128.62213"
      style="font-size:17.98741913px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;font-family:Sans;-inkscape-font-specification:Sans"
      id="text3314"
      sodipodi:linespacing="125%">
-    <tspan
-       y="117.38"
-       x="219.019"
-       id="tspan3316"
-       sodipodi:role="line">MonitoredDir</tspan>
     <tspan
        id="tspan3318"
-       y="139.86427"
-       x="219.019"
+       y="128.62213"
+       x="219.83141"
        sodipodi:role="line">AppProvider</tspan>
   </text>
   <path
@@ -392,33 +394,33 @@
   <text
      transform="matrix(0.99999999,1.6038357e-4,-1.6038357e-4,0.99999999,0,0)"
      id="text3912"
-     y="195.42377"
-     x="192.83795"
+     y="194.93675"
+     x="178.15657"
      style="font-size:13.11166191px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
      xml:space="preserve"
      inkscape:transform-center-x="-17.522216"
      inkscape:transform-center-y="1.6854193"><tspan
-       y="195.42377"
-       x="192.83795"
+       y="194.93675"
+       x="178.15657"
        sodipodi:role="line"
        id="tspan3916">Start</tspan><tspan
-       y="211.81334"
-       x="192.83795"
+       y="211.32632"
+       x="178.15657"
        sodipodi:role="line"
        id="tspan3920">Stop</tspan></text>
   <text
      transform="matrix(0.99999999,1.6038357e-4,-1.6038357e-4,0.99999999,0,0)"
      id="text3926"
-     y="195.40883"
-     x="285.98944"
+     y="205.57097"
+     x="287.04779"
      style="font-size:13.11166191px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
      xml:space="preserve"
      inkscape:transform-center-x="-17.522216"
      inkscape:transform-center-y="1.6854193"><tspan
-       y="195.40883"
-       x="285.98944"
+       y="205.57097"
+       x="287.04779"
        sodipodi:role="line"
-       id="tspan3928">App</tspan></text>
+       id="tspan3928">WebApp</tspan></text>
   <path
      style="fill:none;stroke:#000000;stroke-width:0.99881887;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#Arrow1Lend)"
      d="m 168.06957,249.88292 3e-5,-95.75427"
@@ -538,7 +540,7 @@
          id="tspan3909-4"
          sodipodi:role="line"
          x="440.00369"
-         y="325.52832">App</tspan>
+         y="325.52832">WebApp</tspan>
     </text>
   </g>
   <path