Merge branch 'master' of ssh://git.eclipse.org/gitroot/www.eclipse.org/che
diff --git a/extend/index.php b/extend/index.php
index 8f1f52b..61bf2f9 100644
--- a/extend/index.php
+++ b/extend/index.php
@@ -30,7 +30,7 @@
<h4>Stacks</h4>
<p>Define workspace runtime templates displayed in the dsahboard.</p>
<ul>
- <li><a href="../docs/devops/runtime-stacks/index.html" target="_blank">Add stacks to Che</a></li>
+ <li><a href="../docs/6/che/docs/stacks.html" target="_blank">Add stacks to Che</a></li>
<li><a href="https://github.com/eclipse/che-dockerfiles/tree/master/recipes">Stacks included with Che</a></li>
</ul>
</div>
@@ -39,16 +39,13 @@
<h4>Recipes</h4>
<p>Describe a runtime created by a stack with Docker or Compose files.</p>
<ul>
- <li><a href="../docs/devops/runtime-recipes/index.html" target="blank">Custom Recipes</a></li>
+ <li><a href="../docs/6/che/docs/recipes.html" target="blank">Custom Recipes</a></li>
</ul>
</div>
<div class="col-md-4 col-sm-4">
<h4>Samples</h4>
- <p>Project template code to bootstrap the contents of a new project.</p>
- <ul>
- <li><a href="../docs/devops/project-samples/index.html" target="blank">Custom Templates</a></li>
- </ul>
+ <p>Add project template code to bootstrap the contents of a new project.</p>
</div>
<div class="clearfix"></div>
@@ -58,11 +55,9 @@
<div class="row">
<div class="col-md-4 col-sm-4">
<h4>Commands</h4>
- <p>Processes injected into workspaces. Commands can automate actions like compile and previews.</p><ul>
- <li><a href="../docs/assemblies/intro/index.html" target="blank">Developing Extensions</a></li>
- <li><a href="../docs/assemblies/assembly-lifecycle/index.html" target="blank">Assembly Lifecycle</a></li>
- <li><a href="../docs/assemblies/plugin-lifecycle/index.html" target="blank">Plugin Lifecycle</a></li>
- <li><a href="https://github.com/eclipse/che/tree/master/plugins">Che Extensions</a></li>
+ <p>Processes injected into workspaces. Commands can automate actions like compile and previews.</p>
+ <ul>
+ <li><a href="6/che/docs/commands-ide-macro.html" target="blank">Adding Commands</a></li>
</ul>
</div>
@@ -70,10 +65,7 @@
<h4>WS Extensions</h4>
<p>Modify the runtime behavior of the workspace with code that runs in agents with access to projects.</p>
<ul>
- <li><a href="../docs/assemblies/intro/index.html" target="blank">Developing Extensions</a></li>
- <li><a href="../docs/assemblies/assembly-lifecycle/index.html" target="blank">Assembly Lifecycle</a></li>
- <li><a href="../docs/assemblies/plugin-lifecycle/index.html" target="blank">Plugin Lifecycle</a></li>
- <li><a href="https://github.com/eclipse/che/tree/master/plugins" target="blank">Che Extrensions</a></li>
+ <li><a href="../docs/6/che/docs/framework-overview.html" target="blank">Developing Extensions</a></li>
</ul>
</div>
@@ -81,10 +73,7 @@
<h4>IDE Extensions</h4>
<p>Modify the behavior of the browser IDE with new views, actions, look, perspectives, and wizards.</p>
<ul>
- <li><a href="../docs/assemblies/intro/index.html" target="blank">Developing Extensions</a></li>
- <li><a href="../docs/assemblies/assembly-lifecycle/index.html" target="blank">Assembly Lifecycle</a></li>
- <li><a href="../docs/assemblies/plugin-lifecycle/index.html" target="blank">Plugin Lifecycle</a></li>
- <li><a href="../docs/plugins/calling-workspace-apis/" target="blank">Invoking Workspace APIs</a></li>
+ <li><a href="../docs/6/che/docs/ide-extensions-js.html" target="blank">Developing Extensions</a></li>
</ul>
</div>
@@ -96,7 +85,7 @@
<h4>Agents</h4>
<p>Software dynamically installed and run within a user's workspace.</p><ul>
<ul>
- <li><a href="../docs/devops/ws-agents/index.html" target="blank">Workspace Agents</a></li>
+ <li><a href="../docs/6/che/docs/installers.html" target="blank">Workspace Agents</a></li>
</ul>
</div>
@@ -104,7 +93,7 @@
<h4>REST APIs</h4>
<p>The Che server and each workspace has all services programmable through REST APIs.</p>
<ul>
- <li><a href="../docs/assemblies/sdk-rest-apis/index.html" target="blank">Che REST APIs</a></li>
+ <li><a href="../docs/6/che/docs/rest-api.html" target="blank">Che REST APIs</a></li>
</ul>
</div>
@@ -112,8 +101,7 @@
<h4>Assemblies</h4>
<p>A re-packaging of Eclipse Che distributable as a new desktop IDE application or server.</p>
<ul>
- <li><a href="../docs/assemblies/assembly-lifecycle/index.html" target="blank">Assembly Lifecycle</a></li>
- <li><a href="../docs/assemblies/plugin-lifecycle/index.html" target="blank">Plugin Lifecycle</a></li>
+ <li><a href="../docs/6/che/docs/assemblies.html" target="blank">Assembly Lifecycle</a></li>
</ul>
</div>
@@ -136,9 +124,9 @@
</div>
<div class="col-md-4">
- <a href="../docs/setup/openshift/" target="_blank"><img src="<?php echo $rootPath; ?>/images/logo-extend-redhat@2x.jpg" style="height: 111px; width:333px" class="img-responsive"></a>
- <h3><a href="../docs/setup/openshift/" target="_blank">Red Hat OpenShift</a></h3>
- <p>Strategic developer tooling platform for Docker orchestration.</p>
+ <a href="<?php echo $rootPath; ?>/extend/silexica/" target="_blank"><img src="<?php echo $rootPath; ?>/images/logo-silexica@2x.png" style="height: 111px" class="img-responsive"></a>
+ <h3><a href="<?php echo $rootPath; ?>/extend/silexica/" target="_blank">Silexica</a></h3>
+ <p>Developer tooling for simplifying multicore platform development based on Che.</p>
</div>
<div class="col-md-4">
diff --git a/technology/index.php b/technology/index.php
index 7986bea..e688ff6 100644
--- a/technology/index.php
+++ b/technology/index.php
@@ -64,14 +64,13 @@
<p>Use Che as an IDE for any framework or programming language. Take your projects and runtimes anywhere with workspace portability and cloud export.</p>
<p>
<a href="../getting-started/">Get Started with Che</a><br>
- <a href="../docs/tutorials/multi-machine/" target="_blank">Tutorials</a>
</div>
<div class="col-sm-4">
<h3>Product Owners</h3>
<p>Embed Che in your own product and control it with APIs. Samsung, SAP and Red Hat use custom assemblies to create great developer experiences.</p>
<p>
- <a href="../extend/artik/">Samsung ARTIK IDE</a><BR>
+ <a href="../extend/silexica/">Silexica</a><BR>
<a href="../extend/sap/">SAP Web IDE</a><br>
<a href="../extend/codenvy/">Codenvy Enterprise Che</a>
</div>
@@ -80,8 +79,7 @@
<h3>Extension Providers</h3>
<p>Package stacks, templates, extensions, and plug-ins to create new developer tooling. Dozens of existing extensions and stacks to leverage.</p>
<p>
- <a href="../docs/plugins/introduction/" target="_blank">Customize Che</a><br>
- <a href="../docs/openshift/config/" target="_blank">OpenShift Plug-In</a>
+ <a href="../docs/6/che/docs/framework-overview.html">Customize Che</a><br>
</div>
</div> <!-- .row -->
</div><!-- .contributors -->
@@ -94,16 +92,16 @@
<img alt="" class="img-responsive" src="../images/hero-home-technology.png" />
<h3>Cloud IDE</h3>
- <p>Che’s browser IDE is built on an extensible plug-in platform that enables panels, menus, wizards, popups and tools. With an Orion editor experience, server-side RESTful code intellisense, and distributable workspaces, the developer experience and non-blocking performance will surprise you. Read about how we do this more in our <a href="../docs/setup/intro/" target="blank">documentation</a>, or check out our <a href="../docs/plugins/introduction/" target="blank">extension builder's guide</a>.</p>
+ <p>Che’s browser IDE is built on an extensible plug-in platform that enables panels, menus, wizards, popups and tools. With an Orion editor experience, server-side RESTful code intellisense, and distributable workspaces, the developer experience and non-blocking performance will surprise you. Want to extend the IDE? Check out our <a href="../docs/6/che/docs/framework-overview.html" target="blank">extension builder's guide</a> for help.</p>
<h3>Workspace Server</h3>
- <p>The Che server controls the lifecycle of workspaces and can be customized with plug-ins. Any client can communicate with the workspace server and any spawned workspaces. Read more in our <a href="../docs/server/rest-api/" target="blank">documentation</a>, or see all the <a href="../features/">features</a>.</p>
+ <p>The Che server controls the lifecycle of workspaces and can be customized with plug-ins. Any client can communicate with the workspace server and any spawned workspaces. Read more in our <a href="../docs/6/che/docs/what-are-workspaces.html" target="blank">documentation</a>, or see the <a href="../docs/6/che/docs/rest-api.html">API</a>.</p>
<h3>Workspaces</h3>
- <p>Workspaces are isolated and personal spaces for developer work. Whether developers use an API, browser, CLI, or SSH to access a workspace, their projects are synchronized and kept consistent. Plug-ins enable service injection into workspaces based upon project type, making every workspace tailored to the projects it manages. Read more in our <a href="../docs/workspace/admin-intro/" target="blank">documentation</a>.</p>
+ <p>Workspaces are isolated and personal spaces for developer work. Whether developers use an API, browser, CLI, or SSH to access a workspace, their projects are synchronized and kept consistent. Plug-ins enable service injection into workspaces based upon project type, making every workspace tailored to the projects it manages. Read more in our <a href="../docs/6/che/docs/what-are-workspaces.html" target="blank">documentation</a>.</p>
<h3>Extensions</h3>
- <p>Che includes a growing set of extensions. You can also <a href="../docs/plugins/introduction/" target="blank">create and package</a> your own. You can also extend Che's <a href="../docs/workspace/recipes/" target="blank">recipes</a>, <a href="../docs/workspace/stacks/" target="blank">stacks</a>, <a href="../docs/ide/commands/" target="blank">commands</a>, and <a href="../docs/workspace/machines/" target="blank">machines</a>.</p>
+ <p>Che includes a growing set of extensions. You can <a href="../docs/6/che/docs/framework-overview.html" target="blank">create and package</a> your own. You can also extend Che's <a href="../docs/6/che/docs/recipes.html" target="blank">recipes</a>, <a href="../docs/6/che/docs/stacks.html" target="blank">stacks</a>, <a href="../docs/6/che/docs/commands-ide-macro.html" target="blank">commands</a>, and <a href="../docs/6/che/docs/servers.html" target="blank">machines</a>.</p>
<div class="row">
<div class="col-md-3 col-sm-6">
<h5>Languages</h5>
@@ -125,11 +123,9 @@
<h5>Frameworks</h5>
<p>Project types, scaffold tool integration, and syntax analysis.</p>
<ul>
- <li><a href="../extend/artik/">Samsung ARTIK</a></li>
+ <li><a href="../extend/silexica/">Silexica</a></li>
<li><a href="../extend/sap/">SAP HANA</a></li>
- <li><a href="../docs/openshift/config/" target="_blank">Red Hat OpenShift</a></li>
<li>Angular JS</li>
- <li>Docker</li>
<li>Yeoman</li>
</ul>
</div>
@@ -156,7 +152,6 @@
<li>Git</li>
<li>Orion</li>
<li>SSH</li>
- <li>Subversion</li>
</ul>
</div>
</div> <!-- .row -->
