You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by vi...@apache.org on 2020/01/11 13:17:59 UTC
[netbeans-website] branch master updated: Semantic leveling of some pages in kb/docs (#432)

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

vieiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git


The following commit(s) were added to refs/heads/master by this push:
     new 76d9e7a  Semantic leveling of some pages in kb/docs (#432)
76d9e7a is described below

commit 76d9e7acea8ff7a52e13f9d1f2f44fc5870f8698
Author: Antonio Vieiro <vi...@users.noreply.github.com>
AuthorDate: Sat Jan 11 14:17:52 2020 +0100

    Semantic leveling of some pages in kb/docs (#432)
    
    Clear up asciidoc with proper header levels.
---
 .../src/content/kb/docs/cnd.asciidoc               |  78 +------
 .../src/content/kb/docs/cnd_ca.asciidoc            |  66 +-----
 .../src/content/kb/docs/cnd_ja.asciidoc            |  62 +-----
 .../src/content/kb/docs/cnd_pt_BR.asciidoc         |  78 +------
 .../src/content/kb/docs/cnd_ru.asciidoc            |  78 +------
 .../src/content/kb/docs/cnd_zh_CN.asciidoc         |  72 +------
 .../src/content/kb/docs/contributing.asciidoc      |   2 +-
 .../src/content/kb/docs/java-ee.asciidoc           | 121 +++--------
 .../src/content/kb/docs/java-ee_ca.asciidoc        | 110 ++--------
 .../src/content/kb/docs/java-ee_ja.asciidoc        | 118 +++--------
 .../src/content/kb/docs/java-ee_pt_BR.asciidoc     | 121 +++--------
 .../src/content/kb/docs/java-ee_ru.asciidoc        |  78 +------
 .../src/content/kb/docs/java-ee_zh_CN.asciidoc     | 121 ++---------
 .../src/content/kb/docs/java-se_ca.asciidoc        |  88 ++------
 .../src/content/kb/docs/java-se_ja.asciidoc        |  87 ++------
 .../src/content/kb/docs/java-se_pt_BR.asciidoc     |  88 ++------
 .../src/content/kb/docs/java-se_ru.asciidoc        |  87 ++------
 .../src/content/kb/docs/java-se_zh_CN.asciidoc     |  87 ++------
 .../src/content/kb/docs/matisse.asciidoc           | 108 ++--------
 .../src/content/kb/docs/matisse_ca.asciidoc        |  82 +-------
 .../src/content/kb/docs/matisse_ja.asciidoc        | 108 ++--------
 .../src/content/kb/docs/matisse_pt_BR.asciidoc     | 108 ++--------
 .../src/content/kb/docs/matisse_ru.asciidoc        |  88 +-------
 .../src/content/kb/docs/matisse_zh_CN.asciidoc     | 108 ++--------
 .../src/content/kb/docs/mobility.asciidoc          |  84 +-------
 .../src/content/kb/docs/mobility_ca.asciidoc       | 121 ++---------
 .../src/content/kb/docs/mobility_ja.asciidoc       |  84 +-------
 .../src/content/kb/docs/mobility_pt_BR.asciidoc    |  85 +-------
 .../src/content/kb/docs/mobility_ru.asciidoc       |  85 +-------
 .../src/content/kb/docs/mobility_zh_CN.asciidoc    |  84 +-------
 .../src/content/kb/docs/php.asciidoc               | 101 ++-------
 .../src/content/kb/docs/php/quickstart_ru.asciidoc |  11 +-
 .../content/kb/docs/php/wish-list-lesson9.asciidoc |  84 ++------
 .../src/content/kb/docs/php_ca.asciidoc            |  96 ++-------
 .../src/content/kb/docs/php_fr.asciidoc            |  97 ++-------
 .../src/content/kb/docs/php_ja.asciidoc            |  98 ++-------
 .../src/content/kb/docs/php_pt_BR.asciidoc         |  97 ++-------
 .../src/content/kb/docs/php_ru.asciidoc            |  97 ++-------
 .../src/content/kb/docs/php_zh_CN.asciidoc         |  98 ++-------
 .../src/content/kb/docs/platform.asciidoc          | 219 ++++----------------
 .../src/content/kb/docs/platform_ca.asciidoc       | 131 ++----------
 .../src/content/kb/docs/platform_ja.asciidoc       | 223 ++++----------------
 .../src/content/kb/docs/platform_pt_BR.asciidoc    | 229 ++++-----------------
 .../src/content/kb/docs/platform_ru.asciidoc       | 180 ++--------------
 .../src/content/kb/docs/platform_zh_CN.asciidoc    | 228 ++++----------------
 .../src/content/kb/docs/tools.asciidoc             |  73 +------
 .../src/content/kb/docs/tools_ca.asciidoc          |  68 +-----
 .../src/content/kb/docs/tools_ja.asciidoc          |  73 +------
 .../src/content/kb/docs/tools_pt_BR.asciidoc       |  73 +------
 .../src/content/kb/docs/tools_ru.asciidoc          |  73 +------
 .../src/content/kb/docs/tools_zh_CN.asciidoc       |  74 +------
 .../src/content/kb/docs/web.asciidoc               | 100 ++-------
 .../src/content/kb/docs/web_ca.asciidoc            |  99 ++-------
 .../src/content/kb/docs/web_ja.asciidoc            | 100 ++-------
 .../src/content/kb/docs/web_pt_BR.asciidoc         |  99 ++-------
 .../src/content/kb/docs/web_ru.asciidoc            | 100 ++-------
 .../src/content/kb/docs/web_zh_CN.asciidoc         |  99 ++-------
 57 files changed, 880 insertions(+), 4827 deletions(-)

diff --git a/netbeans.apache.org/src/content/kb/docs/cnd.asciidoc b/netbeans.apache.org/src/content/kb/docs/cnd.asciidoc
index 32e4d98..82766dd 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd.asciidoc
@@ -29,68 +29,33 @@
 :description: C/C++ Application Learning Trail - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, C/C++ Application Learning Trail
 
-
-==== Developing C, C++, and Fortran Applications
+== Developing C, C++, and Fortran Applications
 
 When you install the NetBeans IDE with C/C++ support, the IDE includes project types for C and C++ and appropriate templates. You can create C, C++, and Fortran applications with dynamic and static libraries, and you can also create C/C++/Fortran projects from existing sources. The editor indents, completes, and syntax-highlights C and C++ code and is well integrated with the GNU gdb debugger.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started 
+== Getting Started 
 
 * link:../../community/releases/80/cpp-setup-instructions.html[+ Configuring NetBeans IDE for C/C++/Fortran+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Creating C and C++ Projects*
+=== Creating C and C++ Projects
 
 * link:../docs/cnd/quickstart.html[+C/C++ Projects Quick Start Tutorial+]
 * link:../docs/cnd/development-environment.html[+Defining Your C/C++ Project's Development Environment+]
 * link:../docs/cnd/beginning-jni-linux.html[+Beginning JNI with NetBeans IDE and C/C++ Plugin on Linux+]
 
-*Developing C and C++ Projects*
+=== Developing C and C++ Projects
 
 * link:../docs/cnd/navigating-editing.html[+Editing and Navigating C/C++ Source Files Tutorial+]
 * link:../docs/cnd/debugging.html[+Debugging C/C++ Projects Tutorial+]
 * link:../docs/cnd/remote-modes.html[+Modes of C/C++ Remote Development+]
 * link:../docs/cnd/remotedev-tutorial.html[+C/C++ Remote Development Tutorial+]
 * link:../docs/cnd/c-unit-test.html[+Adding Unit Tests to a C/C++ Project+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*C and C++ Project How-tos*
+=== C and C++ Project How-tos
 
 * link:../docs/cnd/HowTos.html[+C/C++ Application How-Tos+]
 * link:../docs/cnd/depchecking.html[+Make Dependency Checking+]
@@ -98,38 +63,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/cnd/cpp-vcs.html[+Storing NetBeans C/C++ Projects Under VCS+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://wiki.netbeans.org/HowToCreate64-BitC/C++WindowsProgramWithNetBeans[+Setting up NetBeans IDE to Create 64-bit C/C++ Windows Executables+]
 * link:http://wiki.netbeans.org/HowToSetup64-BitQt5WithNetBeans8.0OnWindows[+Setting up 64-bit Qt 5 on Windows to use with NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
 * link:../72/cnd/index.html[+C/C++ Documentation for Earlier Releases+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack[+NetBeans C/C++ Plugin FAQs+]
 * link:https://netbeans.org/projects/cnd/lists[+NetBeans C/C++ Mailing Lists+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/cnd_ca.asciidoc
index 8b10b6c..f2be94b 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd_ca.asciidoc
@@ -29,92 +29,42 @@
 :description: Camí d'aprenentatge d'aplicacions C/C++ - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge d'aplicacions C/C++
 
-
-==== Desenvolupant aplicacions C i C++
+== Desenvolupant aplicacions C i C++
 
 Quant instal·leu l'IDE NetBeans amb suport C/C++, l'IDE inclou els tipus de projectes per a C i C++, així com les plantilles adequades. Podeu crear aplicacions C/C++ amb biblioteques estàtiques i dinàmiques, i també podeu crear projectes C/C++ des de fonts existents. El sagnat, el completament, i el ressaltat de la sintaxi per al codi en C i C++ en l'editor, està perfectament integrat amb el depurador GNU gdb.
 
 En l'IDE NetBeans 6.8, noves característiques en C/C++ inclouen l'ús nou d'E/S i eines d'anàlisi de microestat en fils d'execució, millora en la còpia en projectes remots, millores en les eines d'anàlisis ja existents.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Com començar 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Com començar  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Com començar 
+== Com començar 
 
 * link:../../community/releases/71/cpp-setup-instructions.html[+ Configurant l'IDE NetBeans per a C/C++/Fortran+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Guies d'aprenentatge i Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Guies d'aprenentatge i Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Guies d'aprenentatge i Articles
+== Guies d'aprenentatge i Articles
 
-*Creant projectes C i C++*
+=== Creant projectes C i C++
 
 * link:../docs/cnd/quickstart.html[+Guia d'aprenentatge d'iniciació a projectes C/C+++]
 * link:../docs/cnd/development-environment.html[+Definint el vostre entorn de desenvolupament de projectes C/C+++]
 * link:../docs/cnd/beginning-jni-linux.html[+ Començant JNI amb l'IDE NetBeans 6.7 i l'extensió C/C++ en Linux+]
 
-*Desenvolupant projectes C/C++*
+=== Desenvolupant projectes C/C++
 
 * link:../docs/cnd/navigating-editing.html[+Guia d'aprenentatge de l'edició i navegació a fitxers font en C/C+++]
 * link:../docs/cnd/debugging.html[+Guia d'aprenentatge de depuració de projectes C/C+++]
 * link:../docs/cnd/remotedev-tutorial.html[+Desenvolupament remot C/C+++]
 
-*Com fer-ho en projectes C i C++*
+=== Com fer-ho en projectes C i C++
 
 * link:../docs/cnd/HowTos.html[+Com fer-ho en aplicacions C/C+++]
 * link:../docs/cnd/depchecking.html[+Fer la comprovació de dependències+]
 * link:../docs/cnd/macro-features.html[+Explorant les Macros en projectes C/C+++]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Documents aportats per la comunitat
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documents aportats per la comunitat - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documents aportats per la comunitat
+== Documents aportats per la comunitat
 
 * link:http://wiki.netbeans.org/CNDObservabilityTool[+Eines d'anàlisi per a la resolució de problemes+]
 * link:http://wiki.netbeans.org/GtkApplicationInNetBeans[+ Aplicació GTK+ en NetBeans 6.0+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Altres recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Altres recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Altres recursos
+== Altres recursos
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-CAndCPlusPlusFAQ-NetBeansCCPluginFAQAndHOWTOs[+PMFs complement C/C++ NetBeans+]
 * link:https://netbeans.org/projects/cnd/lists[+Llistes de correu de NetBeans C/C+++]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/cnd_ja.asciidoc
index 6fb766c..462512e 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd_ja.asciidoc
@@ -30,38 +30,18 @@
 :keywords: Apache NetBeans, Tutorials, C/C++アプリケーションの学習
 
 
-==== C、C++およびFortranアプリケーションの開発
+== C、C++およびFortranアプリケーションの開発
 
 C/C++をサポートするNetBeans IDEをインストールすると、そのIDEにはC/C++用のプロジェクト・タイプと適切なテンプレートが含まれます。動的ライブラリや静的ライブラリとともに、C/C++/Fortranアプリケーションを作成でき、既存のソースからC/C++/Fortranプロジェクトを作成することもできます。エディタによって、C/C++コードのインデント、コード補完、および構文の強調が行われ、GNU gdbデバッガが十分に統合されています。
 
 image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 開始 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始 
+== 開始 
 
 * link:../../community/releases/80/cpp-setup-instructions.html[+C/C++/Fortran向けのNetBeans IDEの構成+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
 *C/C++プロジェクトの作成*
 
@@ -78,17 +58,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/cnd/c-unit-test.html[+C/C++プロジェクトへの単体テストの追加+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
 *C/C++プロジェクトの操作方法*
 
@@ -98,17 +68,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/cnd/cpp-vcs.html[+VCSへのNetBeans C/C++プロジェクトの格納+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://wiki.netbeans.org/HowToCreate64-BitC/C++WindowsProgramWithNetBeans[+64ビットC/C++ Windows実行可能ファイルを作成するためのNetBeans IDEの設定+]
 * link:http://wiki.netbeans.org/Talk:HowToSetup64-BitQt5WithNetBeans7.4OnWindows[+NetBeans IDEと組み合せて使用するためのWindowsでの64ビットQt 5の設定+]
@@ -117,17 +77,7 @@ image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbe
 
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
 * link:../72/cnd/index.html[+以前のリリースのC/C++ドキュメント+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack[+NetBeans C/C++プラグインのFAQ+]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/cnd_pt_BR.asciidoc
index 8a32eb8..4bf1780 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd_pt_BR.asciidoc
@@ -30,106 +30,46 @@
 :keywords: Apache NetBeans, Tutorials, Trilha do Aprendizado de Aplicações em C/C++
 
 
-==== Desenvolvendo Aplicações C, C++ e Fortran
+== Desenvolvendo Aplicações C, C++ e Fortran
 
 Quando você instala o NetBeans IDE com suporte a C/C++, o IDE inclui tipos de projeto para C e C++ e modelos apropriados. Você pode criar aplicações em C, C++ e Fortran com bibliotecas dinâmicas e estáticas e também pode criar projetos C/C++/Fortran a partir dos códigos-fontes existentes. O editor recua, completa e realça a sintaxe do código C e C++ e é bem integrado com o depurador gdb do GNU.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Conceitos Básicos 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Conceitos Básicos  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Conceitos Básicos 
+== Conceitos Básicos 
 
 * link:../../community/releases/80/cpp-setup-instructions.html[+Configurando o NetBeans IDE para C/C++/Fortran+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Criando Projetos em C e C++*
+=== Criando Projetos em C e C++
 
 * link:../docs/cnd/quickstart.html[+Tutorial para Início Rápido de Projetos em C/C+++]
 * link:../docs/cnd/development-environment.html[+Definindo o Ambiente de Desenvolvimento de Projetos em C/C+++]
 * link:../docs/cnd/beginning-jni-linux.html[+Introdução ao JNI com NetBeans IDE e Plug-in do C/C++ no Linux+]
 
-*Desenvolvendo Projetos C e C++*
+=== Desenvolvendo Projetos C e C++
 
 * link:../docs/cnd/navigating-editing.html[+Tutorial Editando e Navegando Arquivos de Códigos-Fonte C/C+++]
 * link:../docs/cnd/debugging.html[+Tutorial Depurando projetos C/C+++]
 * link:../docs/cnd/remote-modes.html[+Modos de Desenvolvimento Remoto de C/C+++]
 * link:../docs/cnd/remotedev-tutorial.html[+Tutorial de Desenvolvimento Remoto C/C+++]
 * link:../docs/cnd/c-unit-test.html[+Adicionando Testes de Unidade a um Projeto C/C+++]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Como Fazer do Projeto C e C++*
+=== Como Fazer do Projeto C e C++
 
 * link:../docs/cnd/HowTos.html[+Como fazer de Aplicações em C/C+++]
 * link:../docs/cnd/depchecking.html[+Verificação da Dependência de Make+]
 * link:../docs/cnd/toolchain.html[+Usando o Descritor de Coleção da Ferramenta C/C+++]
 * link:../docs/cnd/cpp-vcs.html[+Armazenando Projetos do NetBeans C/C++ em VCS+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * link:http://wiki.netbeans.org/HowToCreate64-BitC/C++WindowsProgramWithNetBeans[+Configurando o NetBeans IDE para Criar Executáveis do Windows C/C++ de 64 bits+]
 * link:http://wiki.netbeans.org/Talk:HowToSetup64-BitQt5WithNetBeans7.4OnWindows[+Configurando Qt 5 de 64 bits no Windows para usar com o NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
 * link:../72/cnd/index.html[+Documentação C/C++ para Releases Anteriores+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack[+Perguntas Frequentes do Plug-in C/C++ do NetBeans+]
 * link:https://netbeans.org/projects/cnd/lists[+Listas de Correspondência do C/C++ do NetBeans+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/cnd_ru.asciidoc
index 6bb03de..06cddb0 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd_ru.asciidoc
@@ -30,106 +30,46 @@
 :keywords: Apache NetBeans, Tutorials, Учебная карта по приложениям на C/C++
 
 
-==== Разработка приложений на C, C++ и Фортране
+== Разработка приложений на C, C++ и Фортране
 
 При установке IDE NetBeans с поддержкой C/C++, среда включает IDE типы проектов для C и C++ и соответствующие шаблоны. Существует возможность создания приложений на C, C++ и Фортране с динамическими и статическими библиотеками, а также проектов на C, C++ и Фортране на основе существующего кода. С помощью редактора можно выполнить вставку отступов, автозавершение и выделение синтаксиса кода C/C++. Кроме того, редактор тесно интегрирован с отладчиком GNU gdb.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Начало работы 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы 
+== Начало работы 
 
 * link:../../community/releases/80/cpp-setup-instructions.html[+ Настройка IDE NetBeans для C/C++/Fortran+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
-*Создание проектов на языках C и C++*
+=== Создание проектов на языках C и C++
 
 * link:../docs/cnd/quickstart.html[+Краткий учебный курс по работе с проектами C/C+++]
 * link:../docs/cnd/development-environment.html[+Определение среды разработки проекта C/C +++]
 * link:../docs/cnd/beginning-jni-linux.html[+Начало работы с JNI с IDE NetBeans и подключаемым модулем C/C++ Plugin в Linux+]
 
-*Разработка проектов на языках C и C++*
+=== Разработка проектов на языках C и C++
 
 * link:../docs/cnd/navigating-editing.html[+Учебный курс по внесению изменений и переходам в исходных файлах C/C+++]
 * link:../docs/cnd/debugging.html[+Учебный курс по отладке проектов на языках C и C+++]
 * link:../docs/cnd/remote-modes.html[+Режимы удаленной разработки на языке C/C+++]
 * link:../docs/cnd/remotedev-tutorial.html[+Учебный курс по удаленной разработке на языке C/C+++]
 * link:../docs/cnd/c-unit-test.html[+Добавление модульных тестов к проекту C/C+++]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
-*Указания по разработке проектов на языках C и C++*
+=== Указания по разработке проектов на языках C и C++
 
 * link:../docs/cnd/HowTos.html[+Указания по разработке приложений, написанных на C/C+++]
 * link:../docs/cnd/depchecking.html[+Выполнение проверки зависимостей+]
 * link:../docs/cnd/toolchain.html[+Использование дескрипторов наборов средств C/C+++]
 * link:../docs/cnd/cpp-vcs.html[+Сохранение проектов NetBeans C/C++ в VCS+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://wiki.netbeans.org/HowToCreate64-BitC/C++WindowsProgramWithNetBeans[+Настройка IDE NetBeans для создания 64-разрядных исполняемых файлов C/C++ для Windows+]
 * link:http://wiki.netbeans.org/Talk:HowToSetup64-BitQt5WithNetBeans7.4OnWindows[+Настройка 64-разрядной версии Qt 5 в Windows для работы с IDE NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
 * link:../72/cnd/index.html[+Документация по языкам C/C++ для более ранних версий+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack[+Часто задаваемые вопросы по подключаемым модулям NetBeans C/C+++]
 * link:https://netbeans.org/projects/cnd/lists[+Рассылки по NetBeans C/C+++]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/cnd_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/cnd_zh_CN.asciidoc
index 8781e22..2841e83 100644
--- a/netbeans.apache.org/src/content/kb/docs/cnd_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/cnd_zh_CN.asciidoc
@@ -30,38 +30,15 @@
 :keywords: Apache NetBeans, Tutorials, C/C++ 应用程序学习资源
 
 
-==== 开发 C、C++ 和 Fortran 应用程序
+== 开发 C、C++ 和 Fortran 应用程序
 
 当安装支持 C/C++ 的 NetBeans IDE 时，IDE 中将包括 C 和 C++ 项目类型以及相应的模板。您可以使用动态库和静态库创建 C、C++ 和 Fortran 应用程序，也可以创建基于现有源代码的 C/C++/Fortran 项目。编辑器可以缩进、补充完整 C 和 C++ 代码并能突出显示其语法，它很好地集成了 GNU gdb 调试器。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南 
+== 入门指南 
 
 * link:../../community/releases/80/cpp-setup-instructions.html[+ 配置 NetBeans IDE 以使用 C/C++/Fortran+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
 *创建 C 和 C++ 项目*
 
@@ -76,19 +53,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/cnd/remote-modes.html[+C/C++ 远程开发模式+]
 * link:../docs/cnd/remotedev-tutorial.html[+C/C++ 远程开发教程+]
 * link:../docs/cnd/c-unit-test.html[+将单元测试添加到 C/C++ 项目+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
 *C 和 C++ 项目指导*
 
@@ -96,40 +62,14 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/cnd/depchecking.html[+执行依赖关系检查+]
 * link:../docs/cnd/toolchain.html[+使用 C/C++ 工具集合描述符+]
 * link:../docs/cnd/cpp-vcs.html[+在 VCS 下存储 NetBeans C/C++ 项目+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://wiki.netbeans.org/HowToCreate64-BitC/C++WindowsProgramWithNetBeans[+设置 NetBeans IDE 以创建 64 位 C/C++ Windows 可执行文件+]
 * link:http://wiki.netbeans.org/Talk:HowToSetup64-BitQt5WithNetBeans7.4OnWindows[+在 Windows 上设置 64 位 Qt 5 以用于 NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
 * link:../72/cnd/index.html[+早期发行版的 C/C++ 文档+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack[+NetBeans C/C++ 插件常见问题解答+]
 * link:https://netbeans.org/projects/cnd/lists[+NetBeans C/C++ 邮件列表+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/contributing.asciidoc b/netbeans.apache.org/src/content/kb/docs/contributing.asciidoc
index b005644..0bebf8e 100644
--- a/netbeans.apache.org/src/content/kb/docs/contributing.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/contributing.asciidoc
@@ -52,7 +52,7 @@ All web pages can be edited directly in GitHub. To do so follow these instructio
 image::images/contributing-link.png[title="Click the 'See this page in GitHub' link to edit a page"]
 
 [start=2]
-2. You will then be redirected to GitHub. Once there click the "Edit this file" button.
+1. You will then be redirected to GitHub. Once there click the "Edit this file" button.
 
 image::images/contributing-button.png[title="Edit button in GitHub"]
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java-ee.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-ee.asciidoc
index 0f13abc..7fc2a1c 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee.asciidoc
@@ -29,15 +29,13 @@
 :description: Java EE &amp; Java Web Learning Trail - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Java EE &amp; Java Web Learning Trail
 
-
-==== What is a Java Web Application?
+== What is a Java Web Application?
 
 A Java web application generates interactive web pages containing various types of markup language (HTML, XML, and so on) and dynamic content. It is typically comprised of web components such as JavaServer Pages (JSP), servlets and JavaBeans to modify and temporarily store data, interact with databases and web services, and render content in response to client requests.
 
 Because many of the tasks involved in web application development can be repetitive or require a surplus of boilerplate code, web frameworks can be applied to alleviate the overhead associated with common activities. For example, many frameworks, such as JavaServer Faces, provide libraries for templating pages and session management, and often promote code reuse.
 
-
-==== *What is Java EE?*
+=== *What is Java EE?*
 
 Java EE (Enterprise Edition) is a widely used platform containing a set of coordinated technologies that significantly reduce the cost and complexity of developing, deploying, and managing multi-tier, server-centric applications. Java EE builds upon the Java SE platform and provides a set of APIs (application programming interfaces) for developing and running portable, robust, scalable, reliable and secure server-side applications.
 
@@ -46,47 +44,21 @@ Some of the fundamental components of Java EE include:
 * Enterprise JavaBeans (EJB): a managed, server-side component architecture used to encapsulate the business logic of an application. EJB technology enables rapid and simplified development of distributed, transactional, secure and portable applications based on Java technology.
 * Java Persistence API (JPA): a framework that allows developers to manage data using object-relational mapping (ORM) in applications built on the Java Platform.
 
-
-==== JavaScript and Ajax Development
+=== JavaScript and Ajax Development
 
 JavaScript is an object-oriented scripting language primarily used in client-side interfaces for web applications. Ajax (Asynchronous JavaScript and XML) is a Web 2.0 technique that allows changes to occur in a web page without the need to perform a page refresh. JavaScript toolkits can be leveraged to implement Ajax-enabled components and functionality in web pages.
 
- 
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started
+== Getting Started
 
 * link:../docs/web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
 * link:../docs/javaee/javaee-intro.html[+Introduction to Java EE Technology+]
 * link:../docs/javaee/javaee-gettingstarted.html[+Getting Started with Java EE Applications+]
 * link:../docs/web/jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]
 * link:../docs/web/ajax-quickstart.html[+Introduction to Ajax+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*NetBeans E-commerce Tutorial*
+=== NetBeans E-commerce Tutorial
 
 * link:../docs/javaee/ecommerce/intro.html[+Introduction+]
 * link:../docs/javaee/ecommerce/design.html[+Designing the Application+]
@@ -102,7 +74,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/ecommerce/test-profile.html[+Testing and Profiling+]
 * link:../docs/javaee/ecommerce/conclusion.html[+Conclusion+]
 
-*Contexts and Dependency Injection*
+=== Contexts and Dependency Injection
 
 * link:../docs/javaee/cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.x+]
 * link:../docs/javaee/cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
@@ -110,7 +82,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/cdi-events.html[+Working with Events in CDI+]
 * link:../docs/javaee/maven-osgiservice-cdi.html[+Using CDI to Inject OSGi Bundles as Services +]
 
-*Developing Java Web Applications*
+=== Developing Java Web Applications
 
 * link:../docs/javaee/maven-websocketapi.html[+Using the WebSocket API in a Web Application+]
 * link:../docs/web/jsf-jpa-weblogic.html[+Developing an Enterprise Application for Oracle WebLogic Server+]
@@ -120,13 +92,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/security-webapps.html[+Securing a Web Application+]
 * link:../docs/java/profile-loadgenerator.html[+Using a Load Generator in NetBeans IDE+]
 
-*Cloud Support*
+=== Cloud Support
 
 * link:../docs/web/oracle-cloud.html[+Running Web Applications on Oracle Cloud+]
 * link:https://blogs.oracle.com/javatraining/entry/oracle_cloud_development_with_netbeans[+Oracle Cloud Development with NetBeans and Eclipse (OEPE)+] (Java Training Beat blog)
 * NetBeans Wiki: link:http://wiki.netbeans.org/AmazonBeanstalkSupport[+Amazon Beanstalk Support+]
 
-*EJB Technology and Java Persistence*
+=== EJB Technology and Java Persistence
 
 * link:../docs/javaee/javaee-entapp-junit.html[+Using the Embedded EJB Container to Test Enterprise Applications+]
 * link:../docs/javaee/javaee-entapp-ejb.html[+Creating an Enterprise Application with EJB 3.1+]
@@ -137,7 +109,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/profiler-javaee.html[+Profiling an Enterprise Application+]
 * link:http://wiki.netbeans.org/WebLogicJMS[+Using WebLogic JMS from NetBeans IDE+]
 
-*Web Frameworks*
+=== Web Frameworks
 
 * link:../docs/web/jsf20-intro.html[+Introduction to JavaServer Faces 2.x+]
 * link:../docs/web/jsf20-support.html[+JSF 2.x Support+]
@@ -148,24 +120,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/quickstart-webapps-wicket.html[+Wicket+]
 * link:../docs/web/framework-adding-support.html[+Adding Support For A Web Framework+]
 
-*JavaScript and Ajax Development*
+=== JavaScript and Ajax Development
 
 * link:../docs/web/ajax-quickstart.html[+Introduction to Ajax+]
 * link:../docs/web/js-toolkits-jquery.html[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]
 * link:../docs/web/js-toolkits-dojo.html[+Connecting a Dojo Tree to an ArrayList using JSON+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/javaee/maven-primefaces-screencast.html[+PrimeFaces Development with Maven+]
 * link:../docs/javaee/javaee-gettingstarted-js-screencast.html[+JavaScript Client Development in Java EE+]
@@ -179,7 +140,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=wcg2SCgTL-4[+HTML5 and Web Sockets in Glassfish+]
 * YouTube: link:http://www.youtube.com/watch?v=zdYxdx3FuX0[+Java EE 6 does Java 7 with GlassFish 3.1.1+]
 
-*OSGi-enabled Java EE Applications by Arun Gupta* (YouTube)
+=== OSGi-enabled Java EE Applications by Arun Gupta (YouTube)
 
 * YouTube: link:http://www.youtube.com/watch?v=X7GwN4XSzfU[+Parent POM Project (Part 1 of 6) +]
 * YouTube: link:http://www.youtube.com/watch?v=eBdLqdvOF_8[+API and Service OSGi Bundle (Part 2 of 6) +]
@@ -188,7 +149,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=6WexZAUeFWM[+Client OSGi bundle invoking EJB service (Part 5 of 6) +]
 * YouTube: link:http://www.youtube.com/watch?v=IU4UMTnifhw[+Conclusion and other possible extensions (Part 6 of 6) +]
 
-*Java EE 6 Video Tutorial by Arun Gupta* (YouTube)
+=== Java EE 6 Video Tutorial by Arun Gupta (YouTube)
 
 * link:http://www.youtube.com/watch?v=pwBNmAhtqk8[+ JSP + Servlets + EJB: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 1 of 5) +]
 * link:http://www.youtube.com/watch?v=_D_vphsAM-Y[+ Java Persistence API 2: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 2 of 5) +]
@@ -196,19 +157,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.youtube.com/watch?v=D1fyKOTO5rw[+ CDI with JSF 2: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 4 of 5) +]
 * link:http://www.youtube.com/watch?v=qf2Jxwpbsuo[+RESTful Web services using JAX-RS: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 5 of 5) +]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Sample Applications
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Sample Applications - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Sample Applications
+== Sample Applications
 
 * link:../samples/pet-catalog.html[+Pet Catalog - Java EE 6 Sample Application+]
 * link:../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
@@ -217,19 +166,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screenca
 * link:../samples/javaee-crud.html[+JSF CRUD Web Application with Java Persistence API+]
 * link:../samples/javaee-stateless.html[+Dependency Injection with Stateless Session Beans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Hierarchical Web Service Development with NetBeans IDE+] by Jayasurya Venug (Extension of NetBeans E-commerce Tutorial)
 * link:http://blog.mueller-bruehl.de/en/tutorial-web-development/[+Tutorial web development (with JSF)+] by Michael Muller
@@ -242,21 +179,9 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+Simplest Possible EJB 3.1/REST (JSR 311) Component+] by Adam Bien
 * link:http://wiki.netbeans.org/DevelopAjaxJSF2App[+Develop Ajax-based JSF2 applications with PrimeFaces using Netbeans 6.8+] by Christopher Lam
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
-*_Developing Applications with NetBeans IDE_ User's Guide*
+=== _Developing Applications with NetBeans IDE_ User's Guide
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+Developing Enterprise Applications+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1349[+Developing with Java Persistence+]
@@ -265,12 +190,12 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+Working with Web and Application Servers+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1138[+Using Web Application Frameworks+]
 
-*FAQs*
+=== FAQs
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebFrameworks[+NetBeans Web Framework FAQs+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-JavaEEDevelopment[+Java EE Development FAQs+]
 
-*Tutorials and Other Docs*
+=== Tutorials and Other Docs
 
 * link:http://docs.oracle.com/javaee/7/tutorial/doc/[+The Java EE 7 Tutorial+]
 * link:http://docs.oracle.com/javaee/6/tutorial/doc/[+The Java EE 6 Tutorial+]
@@ -281,7 +206,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://technology.amis.nl/blog/?p=2613[+Integrating Seam with Maven, NetBeans and GlassFish +]
 * link:http://technology.amis.nl/blog/?p=2610[+Combining Hibernate and Facelets with Maven, NetBeans and GlassFish+]
 
-*Weblogs*
+=== Weblogs
 
 * link:http://www.java.net/blogs/edburns/[+Ed Burns+]
 * link:https://blogs.oracle.com/arungupta/[+Arun Gupta+]
@@ -291,4 +216,4 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga+]
 * link:http://blogs.oracle.com/theaquarium/[+The Aquarium+]
 * link:http://buttso.blogspot.com/[+The Buttso Blathers+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/java-ee_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-ee_ca.asciidoc
index 920a131..9d58789 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee_ca.asciidoc
@@ -30,14 +30,13 @@
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge de Java EE &amp; Java Web
 
 
-==== Què és una aplicació Java Web?
+== Què és una aplicació Java Web?
 
 Una aplicació Java Web genera pàgines web interactives que contenen diversos tipus de llenguatges de marcatge (HTML, XML, i d'altres) i contingut dinàmic. Aquest està típicament contingut en components web, com les pàgines JavaServer (JSP), servlets i JavaBeans, per modificar i emmagatzemar temporalment les dades, interactuar amb bases de dades i serveis web, i subministrar contingut en resposta a peticions de clients.
 
 Degut a que algunes tasques involucrades en el desenvolupament d'aplicacions web poden ser repetitives o poden necessitar un excés de codi que fàcilment es pot re-aprofitar, es poden aplicar els frameworks web per alleugerar la sobrecàrrega associada a activitats comuns. Per exemple, alguns frameworks, com JavaServer Faces, proporcionen biblioteques per a l'acomodament de pàgines i gestió de sessions, i de vegades difonen la reutilització del codi.
 
-
-==== *Què és Java EE?*
+=== *Què és Java EE?*
 
 Java EE (Edició Empresarial) és una plataforma extensament utilitzada que conté un conjunt de tecnologies coordinades que signifiquen la reducció de costos i la complexitat del desenvolupament, desplegament, i gestió multi-tutelada d'aplicacions centralitzades al servidor. Les construccions de Java EE estan per damunt de la plataforma Java SE i proporcionen un conjunt d'APIs (Interfícies de Programació d'Aplicacions) per al desenvolupament i l'execució d'aplicacions en el cantó del servi [...]
 
@@ -45,40 +44,18 @@ Alguns dels components fonamentals de Java EE inclouen:
 
 * JavaBeans Empresarials(EJB): una arquitectura de component gestionada en el cantó del servidor, utilitzada per a encapsular la lògica de negoci d'una aplicació. La tecnologia EJB permet un desenvolupament ràpid i senzill d'aplicacions distribuïdes, transaccionals, segures i portables, basades en tecnologia Java.
 * API Persistència Java (JPA): un framework que permet als desenvolupadors gestionar dades mitjançant el mapeig relacional d'objectes (ORM) en aplicacions construïdes en la plataforma Java.
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Getting Started
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started
+== Getting Started
 
 * link:../docs/web/quickstart-webapps.html[+Introduction to Developing Web Applications+]
 * link:../docs/javaee/javaee-intro.html[+Introduction to Java EE Technology+]
 * link:../docs/javaee/javaee-gettingstarted.html[+Getting Started with Java EE 6 Applications+]
 * link:../docs/web/jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]
 * link:../docs/web/ajax-quickstart.html[+Introduction to Ajax+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*NetBeans E-commerce Tutorial*
+=== NetBeans E-commerce Tutorial
 
 * link:../docs/javaee/ecommerce/intro.html[+Introduction+]
 * link:../docs/javaee/ecommerce/design.html[+Designing the Application+]
@@ -94,14 +71,14 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/ecommerce/test-profile.html[+Testing and Profiling+]
 * link:../docs/javaee/ecommerce/conclusion.html[+Conclusion+]
 
-*Contexts and Dependency Injection*
+=== Contexts and Dependency Injection
 
 * link:../docs/javaee/cdi-intro.html[+Getting Started with Contexts and Dependency Injection and JSF 2.0+]
 * link:../docs/javaee/cdi-inject.html[+Working with Injection and Qualifiers in CDI+]
 * link:../docs/javaee/cdi-validate.html[+Applying @Alternative Beans and Lifecycle Annotations+]
 * link:../docs/javaee/cdi-events.html[+Working with Events in CDI+]
 
-*Developing Java Web Applications*
+=== Developing Java Web Applications
 
 * link:../docs/web/jsf-jpa-weblogic.html[+Developing an Enterprise Application for Oracle WebLogic Server+]
 * link:../docs/web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
@@ -110,7 +87,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/security-webapps.html[+Securing a Web Application+]
 * link:../docs/java/profile-loadgenerator.html[+Using a Load Generator in NetBeans IDE+]
 
-*EJB Technology and Java Persistence*
+=== EJB Technology and Java Persistence
 
 * link:../docs/javaee/javaee-entapp-junit.html[+Using the Embedded EJB Container to Test Enterprise Applications+]
 * link:../docs/javaee/javaee-entapp-ejb.html[+Creating an Enterprise Application with EJB 3.1+]
@@ -120,7 +97,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/secure-ejb.html[+Building Secure Enterprise Beans+]
 * link:../docs/javaee/profiler-javaee.html[+Profiling an Enterprise Application+]
 
-*Web Frameworks*
+=== Web Frameworks
 
 * link:../docs/web/jsf20-intro.html[+Introduction to JavaServer Faces 2.0+]
 * link:../docs/web/jsf20-support.html[+JSF 2.0 Support+]
@@ -128,23 +105,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/quickstart-webapps-struts.html[+Struts+]
 * link:../docs/web/grails-quickstart.html[+Grails+]
 
-*JavaScript and Ajax Development*
+=== JavaScript and Ajax Development
 
 * link:../docs/web/js-toolkits-jquery.html[+Using jQuery to Enhance the Appearance and Usability of a Web Page+]
 * link:../docs/web/js-toolkits-dojo.html[+Connecting a Dojo Tree to an ArrayList using JSON+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/javaee/weblogic-javaee-m1-screencast.html[+Video of Deploying a Web Application to the Oracle WebLogic Server+]
 * link:../docs/javaee/javaee-gettingstarted-screencast.html[+Video of Getting Started with Java EE 6 Applications+]
@@ -152,7 +118,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=vaOpJJ-Xm70[+Type-safe injection of OSGi dynamic services with GlassFish 3.1 and CDI+]
 * YouTube: link:http://www.youtube.com/watch?v=wcg2SCgTL-4[+HTML5 and Web Sockets in Glassfish+]
 
-*OSGi-enabled Java EE Applications by Arun Gupta* (YouTube)
+=== OSGi-enabled Java EE Applications by Arun Gupta (YouTube)
 
 * YouTube: link:http://www.youtube.com/watch?v=X7GwN4XSzfU[+Parent POM Project (Part 1 of 6) +]
 * YouTube: link:http://www.youtube.com/watch?v=eBdLqdvOF_8[+API and Service OSGi Bundle (Part 2 of 6) +]
@@ -161,7 +127,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=6WexZAUeFWM[+Client OSGi bundle invoking EJB service (Part 5 of 6) +]
 * YouTube: link:http://www.youtube.com/watch?v=IU4UMTnifhw[+Conclusion and other possible extensions (Part 6 of 6) +]
 
-*Java EE 6 Video Tutorial by Arun Gupta* (YouTube)
+=== Java EE 6 Video Tutorial by Arun Gupta (YouTube)
 
 * link:http://www.youtube.com/watch?v=pwBNmAhtqk8[+ JSP + Servlets + EJB: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 1 of 5) +]
 * link:http://www.youtube.com/watch?v=_D_vphsAM-Y[+ Java Persistence API 2: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 2 of 5) +]
@@ -169,19 +135,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.youtube.com/watch?v=D1fyKOTO5rw[+ CDI with JSF 2: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 4 of 5) +]
 * link:http://www.youtube.com/watch?v=qf2Jxwpbsuo[+RESTful Web services using JAX-RS: Java EE 6 &amp; GlassFish 3 using NetBeans 6.9 (Part 5 of 5) +]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Sample Applications
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Sample Applications - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Sample Applications
+== Sample Applications
 
 * link:../samples/pet-catalog.html[+Pet Catalog - Java EE 6 Sample Application+]
 * link:../samples/scrum-toys.html[+Scrum Toys - The JSF 2.0 Complete Sample Application+]
@@ -190,19 +144,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screenca
 * link:../samples/javaee-crud.html[+JSF CRUD Web Application with Java Persistence API+]
 * link:../samples/javaee-stateless.html[+Dependency Injection with Stateless Session Beans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://wiki.netbeans.org/DevelopAjaxJSF2App[+Develop Ajax-based JSF2 applications with PrimeFaces using Netbeans 6.8+] by Christopher Lam
 * link:http://wiki.netbeans.org/DevelopJavaEE6App[+Develop JavaEE 6 application with JSF2, EJB3 and JPA+] (also at link:http://netbeans.dzone.com/articles/develop-java-ee-6-app-jsf2[+dzone+]) by Christopher Lam
@@ -214,26 +156,14 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index
 * link:http://wiki.netbeans.org/MavenSpringEJBsOnGlassfish[+EJB development for Glassfish using Maven2 and Spring+] by Kristian Rink
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+Simplest Possible EJB 3.1/REST (JSR 311) Component+] by Adam Bien
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== Other Resources
 
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
-
-*FAQs*
+=== FAQs
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebFrameworks[+NetBeans Web Framework FAQs+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-JavaEEDevelopment[+Java EE Development FAQs+]
 
-*Tutorials and Other Docs*
+=== Tutorials and Other Docs
 
 * link:http://java.sun.com/javaee/6/docs/tutorial/doc/[+The Java EE 6 Tutorial+]
 * link:http://java.sun.com/javaee/5/docs/tutorial/doc/[+The Java EE 5 Tutorial+]
@@ -244,7 +174,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://technology.amis.nl/blog/?p=2610[+Combining Hibernate and Facelets with Maven, NetBeans and GlassFish+]
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Using JAX-RS with WebLogic Server 10.3.4+]
 
-*Weblogs*
+=== Weblogs
 
 * link:http://www.java.net/blogs/edburns/[+Ed Burns+]
 * link:http://www.java.net/blogs/driscoll/[+Jim Driscoll+]
@@ -256,4 +186,4 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://blogs.oracle.som/geertjan/[+Geertjan Wielenga+]
 * link:http://blogs.oracle.com/theaquarium/[+The Aquarium+]
 * link:http://buttso.blogspot.com/[+The Buttso Blathers+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/java-ee_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-ee_ja.asciidoc
index 2c3a70c..4d0bcc8 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee_ja.asciidoc
@@ -30,14 +30,14 @@
 :keywords: Apache NetBeans, Tutorials, Java EEおよびJava Webの学習
 
 
-==== Java Webアプリケーションとは
+== Java Webアプリケーションとは
 
 Java Webアプリケーションは、様々なタイプのマークアップ言語(HTML、XMLなど)や動的コンテンツを含む、対話式のWebページを生成します。通常、JavaServer Pages (JSP)、サーブレット、およびJavaBeansなどのWebコンポーネントで構成され、データの変更と一時保存、データベースやWebサービスとの対話、クライアント・リクエストに応じたコンテンツのレンダリングを行います。
 
 Webアプリケーションの開発に伴うタスクの多くは反復的であったり、過剰な定型コードが必要であったりすることがあるため、Webフレームワークを適用して、一般的なアクティビティに関連するオーバーヘッドを軽減することができます。たとえば、JavaServer Facesなどのフレームワークの多くは、ページをテンプレート化するためのライブラリやセッション管理を提供し、コードの再利用を促進します。
 
 
-==== *Java EEとは*
+=== *Java EEとは*
 
 Java EE (Enterprise Edition)は、サーバー中心の複数層アプリケーションの開発、デプロイおよび管理にかかるコストと複雑さを大幅に削減する組織的なテクノロジのセットを含み、広く使用されているプラットフォームです。Java EEはJava SEプラットフォーム上にビルドされ、移植可能、堅牢、スケーラブル、信頼性、およびセキュリティに優れたサーバー側アプリケーションを開発および実行するための一連のAPI (application programming interfaces)を提供します。
 
@@ -47,46 +47,21 @@ Java EEの基本的なコンポーネントには、次のものが含まれま
 * Java Persistence API (JPA): 管理者が、プラットフォーム上にビルドされたアプリケーションでオブジェクト・リレーショナル・マッピング(ORM)を使用して、データを管理するためのフレームワークです。
 
 
-==== JavaScriptとAjaxの開発
+=== JavaScriptとAjaxの開発
 
 JavaScriptはオブジェクト指向のスクリプト言語で、主にWebアプリケーションのクライアント側インタフェースで使用されます。Ajax (Asynchronous JavaScript and XML)はWeb 2.0のテクニックで、ページをリフレッシュせずに、Webページを変更できます。JavaScriptのツールキットは、Ajax対応のコンポーネントや機能をWebページに実装するために利用できます。
 
- 
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 開始
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始
+== 開始
 
 * link:../docs/web/quickstart-webapps.html[+Webアプリケーション開発入門+]
 * link:../docs/javaee/javaee-intro.html[+Java EEテクノロジ入門+]
 * link:../docs/javaee/javaee-gettingstarted.html[+Java EEアプリケーションの開始+]
 * link:../docs/web/jsf20-intro.html[+JavaServer Faces 2.x入門+]
 * link:../docs/web/ajax-quickstart.html[+Ajax入門+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
-*NetBeans Eコマースのチュートリアル*
+=== NetBeans Eコマースのチュートリアル
 
 * link:../docs/javaee/ecommerce/intro.html[+概要+]
 * link:../docs/javaee/ecommerce/design.html[+アプリケーションの設計+]
@@ -102,7 +77,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/ecommerce/test-profile.html[+テストとプロファイリング+]
 * link:../docs/javaee/ecommerce/conclusion.html[+まとめ+]
 
-*コンテキストと依存性の注入*
+=== コンテキストと依存性の注入
 
 * link:../docs/javaee/cdi-intro.html[+コンテキストと依存性の注入およびJSF 2.xの開始+]
 * link:../docs/javaee/cdi-inject.html[+CDIの注入および修飾子の操作+]
@@ -110,7 +85,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/cdi-events.html[+CDIのイベントの操作+]
 * link:../docs/javaee/maven-osgiservice-cdi.html[+OSGiバンドルをサービスとして注入するためのCDIの使用+]
 
-*Java Webアプリケーションの開発*
+=== Java Webアプリケーションの開発
 
 * link:../docs/javaee/maven-websocketapi.html[+WebアプリケーションでのWebSocket APIの使用+]
 * link:../docs/web/jsf-jpa-weblogic.html[+Oracle WebLogic Serverのためのエンタープライズ・アプリケーションの開発+]
@@ -120,13 +95,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/security-webapps.html[+Webアプリケーションのセキュリティ保護+]
 * link:../docs/java/profile-loadgenerator.html[+NetBeans IDEでの負荷ジェネレータの使用+]
 
-*クラウドのサポート*
+=== クラウドのサポート
 
 * link:../docs/web/oracle-cloud.html[+Oracle CloudでのWebアプリケーションの実行+]
 * link:https://blogs.oracle.com/javatraining/entry/oracle_cloud_development_with_netbeans[+NetBeansおよびEclipse (OEPE)を使用したOracle Cloud開発+] (Java Training Beatブログ)
 * NetBeans Wiki: link:http://wiki.netbeans.org/AmazonBeanstalkSupport[+Amazon Beanstalkのサポート+]
 
-*EJBテクノロジとJava Persistence*
+=== EJBテクノロジとJava Persistence
 
 * link:../docs/javaee/javaee-entapp-junit.html[+エンタープライズ・アプリケーションをテストするための組込みEJBコンテナの使用+]
 * link:../docs/javaee/javaee-entapp-ejb.html[+EJB 3.1を使用したエンタープライズ・アプリケーションの作成+]
@@ -137,7 +112,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/profiler-javaee.html[+エンタープライズ・アプリケーションのプロファイリング+]
 * link:http://wiki.netbeans.org/WebLogicJMS[+NetBeans IDEからのWebLogic JMSの使用+]
 
-*Webフレームワーク*
+=== Webフレームワーク
 
 * link:../docs/web/jsf20-intro.html[+JavaServer Faces 2.x入門+]
 * link:../docs/web/jsf20-support.html[+JSF 2.xのサポート+]
@@ -147,24 +122,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/quickstart-webapps-wicket.html[+Wicket+]
 * link:../docs/web/framework-adding-support.html[+Webフレームワークのサポートの追加+]
 
-*JavaScriptとAjaxの開発*
+=== JavaScriptとAjaxの開発
 
 * link:../docs/web/ajax-quickstart.html[+Ajax入門+]
 * link:../docs/web/js-toolkits-jquery.html[+jQueryを使用した、Webページの見た目と使いやすさの向上+]
 * link:../docs/web/js-toolkits-dojo.html[+JSONを使用したDojoツリーのArrayListへの接続+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * link:../docs/javaee/maven-primefaces-screencast.html[+Mavenを使用したPrimeFaces開発+]
 * link:../docs/javaee/javaee-gettingstarted-js-screencast.html[+Java EEでのJavaScriptクライアント開発+]
@@ -178,7 +142,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=wcg2SCgTL-4[+GlassfishでのHTML5およびWebソケット+]
 * YouTube: link:http://www.youtube.com/watch?v=zdYxdx3FuX0[+GlassFish 3.1.1を使用したJava EE 6のJava 7への対応+]
 
-*Arun Gupta氏によるOSGi対応のJava EEアプリケーション* (YouTube)
+=== Arun Gupta氏によるOSGi対応のJava EEアプリケーション (YouTube)
 
 * YouTube: link:http://www.youtube.com/watch?v=X7GwN4XSzfU[+親のPOMプロジェクト(パート1/6) +]
 * YouTube: link:http://www.youtube.com/watch?v=eBdLqdvOF_8[+APIおよびサービスOSGiバンドル(パート2/6) +]
@@ -187,7 +151,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=6WexZAUeFWM[+EJBサービスを呼び出すクライアントOSGiバンドル(パート5/6) +]
 * YouTube: link:http://www.youtube.com/watch?v=IU4UMTnifhw[+結論および他の可能な拡張(パート6/6) +]
 
-*Arun Gupta氏によるJava EE 6ビデオ・チュートリアル* (YouTube)
+=== Arun Gupta氏によるJava EE 6ビデオ・チュートリアル (YouTube)
 
 * link:http://www.youtube.com/watch?v=pwBNmAhtqk8[+ JSP+Servlet+EJB: NetBeans 6.9を使用したJava EE 6およびGlassFish 3 (パート1/5) +]
 * link:http://www.youtube.com/watch?v=_D_vphsAM-Y[+ Java Persistence API 2: NetBeans 6.9を使用したJava EE 6およびGlassFish 3 (パート2/5) +]
@@ -195,19 +159,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.youtube.com/watch?v=D1fyKOTO5rw[+ CDIとJSF 2: NetBeans 6.9を使用したJava EE 6およびGlassFish 3 (パート4/5) +]
 * link:http://www.youtube.com/watch?v=qf2Jxwpbsuo[+JAX-RSを使用したRESTful Webサービス: NetBeans 6.9を使用したJava EE 6およびGlassFish 3 (パート5/5) +]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= サンプル・アプリケーション
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: サンプル・アプリケーション - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, サンプル・アプリケーション
+== サンプル・アプリケーション
 
 * link:../samples/pet-catalog.html[+Pet Catalog - Java EE 6サンプル・アプリケーション+]
 * link:../samples/scrum-toys.html[+Scrum Toys - JSF 2.0の完全版サンプル・アプリケーション+]
@@ -216,19 +168,7 @@ image::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencas
 * link:../samples/javaee-crud.html[+Java Persistence APIを使用したJSF CRUD Webアプリケーション+]
 * link:../samples/javaee-stateless.html[+ステートレス・セッションBeansを使用した依存性注入+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+NetBeans IDEを使用した階層的なWebサービス開発+]、Jayasurya Venug著(NetBeans Eコマースのチュートリアルの拡張)
 * link:http://blog.mueller-bruehl.de/en/tutorial-web-development/[+チュートリアルWeb開発(JSFを使用)+]、Michael Muller著
@@ -241,21 +181,9 @@ image::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index.
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+非常に簡易なEJB 3.1/REST (JSR 311)コンポーネント+]、Adam Bien著
 * link:http://wiki.netbeans.org/DevelopAjaxJSF2App[+NetBeans 6.8でのPrimeFacesを使用したAjaxベースのJSF2アプリケーションの開発+]、Christopher Lam著
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== その他のリソース
 
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
-
-*_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド*
+=== _NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+エンタープライズ・アプリケーションの開発+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1349[+Java Persistenceを使用した開発+]
@@ -264,12 +192,12 @@ image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbe
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+Webおよびアプリケーション・サーバーの使用+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1138[+Webアプリケーション・フレームワークの使用+]
 
-*FAQ*
+=== FAQ
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebFrameworks[+NetBeans Web FrameworkのFAQ+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-JavaEEDevelopment[+Java EE開発のFAQ+]
 
-*チュートリアルおよびその他のドキュメント*
+=== チュートリアルおよびその他のドキュメント
 
 * link:http://docs.oracle.com/javaee/7/tutorial/doc/[+The Java EE 7 Tutorial+]
 * link:http://docs.oracle.com/javaee/6/tutorial/doc/[+The Java EE 6 Tutorial+]
@@ -280,7 +208,7 @@ image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbe
 * link:http://technology.amis.nl/blog/?p=2613[+Maven、NetBeansおよびGlassFishを使用したSeamの統合+]
 * link:http://technology.amis.nl/blog/?p=2610[+Maven、NetBeansおよびGlassFishを使用したHibernateとFaceletsの結合+]
 
-*ブログ*
+=== ブログ
 
 * link:http://www.java.net/blogs/edburns/[+Ed Burns+]
 * link:https://blogs.oracle.com/arungupta/[+Arun Gupta+]
@@ -290,4 +218,4 @@ image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbe
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga+]
 * link:http://blogs.oracle.com/theaquarium/[+Aquarium+]
 * link:http://buttso.blogspot.com/[+The Buttso Blathers+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/java-ee_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-ee_pt_BR.asciidoc
index ff9a065..feea48f 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee_pt_BR.asciidoc
@@ -29,15 +29,13 @@
 :description: Trilha do Aprendizado do Java EE e Java Web - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Trilha do Aprendizado do Java EE e Java Web
 
-
-==== O que é uma Aplicação Java Web?
+== O que é uma Aplicação Java Web?
 
 Uma aplicação Java Web gera páginas Web interativas, que contêm vários tipos de linguagem de marcação (HTML, XML, etc.) e conteúdo dinâmico. Normalmente é composto por componentes Web, como JavaServer Pages (JSP), servlets e JavaBeans para modificar e armazenar dados temporariamente, interagir com bancos de dados e Web services e processar o conteúdo como resposta às solicitações do cliente.
 
 Como a maioria das tarefas envolvidas no desenvolvimento de aplicações Web, pode ser repetitiva ou exigir um excedente de código padrão, os frameworks da Web podem ser aplicados para aliviar a sobrecarga associada às atividades comuns. Muitos frameworks, como JavaServer Faces, fornecem, por exemplo, bibliotecas para páginas de modelo e gerenciamento de sessão, e geralmente fomentam a reutilização do código.
 
-
-==== *O que é Java EE?*
+=== *O que é Java EE?*
 
 O Java EE (Enterprise Edition) é uma plataforma amplamente usada que contém um conjunto de tecnologias coordenadas que reduz significativamente o custo e a complexidade do desenvolvimento, implantação e gerenciamento de aplicações de várias camadas centradas no servidor. O Java EE é construído sobre a plataforma Java SE e oferece um conjunto de APIs (interfaces de programação de aplicações) para desenvolvimento e execução de aplicações portáteis, robustas, escaláveis, confiáveis e segura [...]
 
@@ -46,47 +44,21 @@ Alguns dos componentes fundamentais do Java EE são:
 * Enterprise JavaBeans (EJB): uma arquitetura gerenciada de componente do lado do servidor utilizada para encapsular a lógica de negócios de uma aplicação. A tecnologia EJB permite o desenvolvimento rápido e simplificado de aplicações distribuídas, transacionais, seguras e portáteis baseadas na tecnologia Java.
 * Java Persistence API (JPA): um framework que permite aos desenvolvedores gerenciar os dados utilizando o mapeamento relacional de objetos (ORM) em aplicações construídas na plataforma Java.
 
-
-==== Desenvolvimento em JavaScript e Ajax
+=== Desenvolvimento em JavaScript e Ajax
 
 JavaScript é uma linguagem de script orientada a objetos utilizada principalmente em interfaces no lado do cliente para aplicações Web. Ajax (Asynchronous JavaScript and XML) é uma técnica Web 2.0 que permite que sejam feitas alterações em uma página Web sem que seja necessário atualizar a página. O kit de ferramentas JavaScript pode ser aproveitado para implementar funcionalidades e componentes ativados para o Ajax em páginas Web.
 
- 
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Introdução
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Introdução - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Introdução
+== Introdução
 
 * link:../docs/web/quickstart-webapps.html[+Introdução ao Desenvolvimento de Aplicações Web+]
 * link:../docs/javaee/javaee-intro.html[+Introdução à Tecnologia Java EE+]
 * link:../docs/javaee/javaee-gettingstarted.html[+Conceitos Básicos sobre Aplicações do Java EE+]
 * link:../docs/web/jsf20-intro.html[+Introdução ao JavaServer Faces 2.x+]
 * link:../docs/web/ajax-quickstart.html[+Introdução ao Ajax+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Tutorial de E-commerce do NetBeans*
+=== Tutorial de E-commerce do NetBeans
 
 * link:../docs/javaee/ecommerce/intro.html[+Introdução+]
 * link:../docs/javaee/ecommerce/design.html[+Criando a Aplicação+]
@@ -102,7 +74,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/ecommerce/test-profile.html[+Testando e Criando Perfis+]
 * link:../docs/javaee/ecommerce/conclusion.html[+Conclusão+]
 
-*Injeção de Dependência e Contextos*
+=== Injeção de Dependência e Contextos
 
 * link:../docs/javaee/cdi-intro.html[+Conceitos Básicos sobre a Injeção de Dependência e Contextos e JSF 2.x+]
 * link:../docs/javaee/cdi-inject.html[+Trabalhando com Injeção e Qualificadores no CDI+]
@@ -110,7 +82,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/cdi-events.html[+Trabalhando com Eventos no CDI+]
 * link:../docs/javaee/maven-osgiservice-cdi.html[+Usando o CDI para Injetar Pacotes OSGi como Serviços+]
 
-*Desenvolvendo Aplicações Java Web*
+=== Desenvolvendo Aplicações Java Web
 
 * link:../docs/javaee/maven-websocketapi.html[+ Usando a API do WebSocket em uma Aplicação Web+]
 * link:../docs/web/jsf-jpa-weblogic.html[+Desenvolvendo uma Aplicação Corporativa para Oracle WebLogic Server+]
@@ -120,13 +92,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/security-webapps.html[+Tornando uma Aplicação Web Segura+]
 * link:../docs/java/profile-loadgenerator.html[+Usando um Gerador de Carga no NetBeans IDE+]
 
-*Suporte a Nuvem*
+=== Suporte a Nuvem
 
 * link:../docs/web/oracle-cloud.html[+Executando Aplicações Web no Oracle Cloud+]
 * link:https://blogs.oracle.com/javatraining/entry/oracle_cloud_development_with_netbeans[+Oracle Cloud Development with NetBeans and Eclipse (OEPE)+] (blog do Java Training Beat)
 * Wiki do NetBeans: link:http://wiki.netbeans.org/AmazonBeanstalkSupport[+Suporte a Beanstalk da Amazon+]
 
-*Tecnologia EJB e Java Persistence*
+=== Tecnologia EJB e Java Persistence
 
 * link:../docs/javaee/javaee-entapp-junit.html[+Usando o Contêiner EJB Incorporado para Testar Aplicações Corporativas+]
 * link:../docs/javaee/javaee-entapp-ejb.html[+Criando uma Aplicação Enterprise com o EJB 3.1+]
@@ -137,7 +109,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/profiler-javaee.html[+Criando Perfis de uma Aplicação Corporativa+]
 * link:http://wiki.netbeans.org/WebLogicJMS[+Usando WebLogic JMS a partir do NetBeans IDE+]
 
-*Frameworks Web*
+=== Frameworks Web
 
 * link:../docs/web/jsf20-intro.html[+Introdução ao JavaServer Faces 2.x+]
 * link:../docs/web/jsf20-support.html[+Suporte a JSF 2.x+]
@@ -147,24 +119,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/quickstart-webapps-wicket.html[+Wicket+]
 * link:../docs/web/framework-adding-support.html[+Adicionando Suporte a um Framework Web+]
 
-*Desenvolvimento em JavaScript e Ajax*
+=== Desenvolvimento em JavaScript e Ajax
 
 * link:../docs/web/ajax-quickstart.html[+Introdução ao Ajax+]
 * link:../docs/web/js-toolkits-jquery.html[+Usando jQuery para Aprimorar a Aparência e o Uso de uma Página Web+]
 * link:../docs/web/js-toolkits-dojo.html[+Conectando uma Árvore Dojo a uma ArrayList utilizando JSON+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/javaee/maven-primefaces-screencast.html[+Desenvolvimento de PrimeFaces com Maven+]
 * link:../docs/javaee/javaee-gettingstarted-js-screencast.html[+Desenvolvimento do Cliente JavaScript no Java EE+]
@@ -178,7 +139,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=wcg2SCgTL-4[+HTML5 e Web Sockets no Glassfish+]
 * YouTube: link:http://www.youtube.com/watch?v=zdYxdx3FuX0[+Java EE 6 faz Java 7 com o GlassFish 3.1.1+]
 
-*Aplicações do Java EE ativados para OSGi de Arun Gupta* (YouTube)
+=== Aplicações do Java EE ativados para OSGi de Arun Gupta (YouTube)
 
 * YouTube: link:http://www.youtube.com/watch?v=X7GwN4XSzfU[+Projeto POM Pai (Parte 1 de 6) +]
 * YouTube: link:http://www.youtube.com/watch?v=eBdLqdvOF_8[+API e Pacote OSGi de Serviço (Parte 2 de 6) +]
@@ -187,7 +148,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube: link:http://www.youtube.com/watch?v=6WexZAUeFWM[+pacote de OSGi de Cliente que chama um serviço EJB (Parte 5 de 6) +]
 * YouTube: link:http://www.youtube.com/watch?v=IU4UMTnifhw[+conclusão e outras extensões possíveis (parte 6 de 6) +]
 
-*Tutorial em Vídeo do Java EE 6 de Arun Gupta* (YouTube)
+=== Tutorial em Vídeo do Java EE 6 de Arun Gupta (YouTube)
 
 * link:http://www.youtube.com/watch?v=pwBNmAhtqk8[+ JSP + Servlets + EJB: Java EE 6 e GlassFish 3 usando NetBeans 6.9 (Parte 1 de 5) +]
 * link:http://www.youtube.com/watch?v=_D_vphsAM-Y[+ Java Persistence API 2: Java EE 6 e GlassFish 3 usando NetBeans 6.9 (Parte 2 de 5) +]
@@ -195,19 +156,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.youtube.com/watch?v=D1fyKOTO5rw[+ CDI com JSF 2: Java EE 6 e GlassFish 3 usando NetBeans 6.9 (Parte 4 de 5) +]
 * link:http://www.youtube.com/watch?v=qf2Jxwpbsuo[+Web Services RESTful usando JAX-RS: Java EE 6 e GlassFish 3 usando NetBeans 6.9 (Parte 5 de 5) +]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Aplicações de Amostra
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Aplicações de Amostra - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Aplicações de Amostra
+== Aplicações de Amostra
 
 * link:../samples/pet-catalog.html[+Castálogo Pet - Aplicação de Amostra do Java EE 6+]
 * link:../samples/scrum-toys.html[+Scrum Toys: A Aplicação de Amostra Completa do JSF 2.0+]
@@ -216,19 +165,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screenca
 * link:../samples/javaee-crud.html[+Aplicação da Web JSF CRUD com o Java Persistence API+]
 * link:../samples/javaee-stateless.html[+Injeção de Dependência com Beans de Sessão Sem Estado+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Desenvolvimento de Web Service Hierárquico com NetBeans IDE+] de Jayasurya Venug (Extensão do Tutorial do NetBeans E-commerce)
 * link:http://blog.mueller-bruehl.de/en/tutorial-web-development/[+Desenvolvimento da Web em tutorial (com JSF)+] de Michael Muller
@@ -241,21 +178,9 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+O Componente EJB 3.1/REST (JSR 311) Mais Simples Possível+] de Adam Bien
 * link:http://wiki.netbeans.org/DevelopAjaxJSF2App[+Desenvolva aplicações JSF2 com base em Ajax com PrimeFaces utilizando o Netbeans 6.8+] por Christopher Lam
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
-*_Desenvolvendo Aplicações com o NetBeans IDE_ Guia do Usuário*
+=== _Desenvolvendo Aplicações com o NetBeans IDE_ Guia do Usuário
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+Desenvolvendo Aplicações Corporativas+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1349[+Desenvolvendo Persistência Java+]
@@ -264,12 +189,12 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+Trabalhando com Servidores Web e Servidores de Aplicações+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1138[+Usando Frameworks da Aplicação Web+]
 
-*Perguntas Frequentes*
+=== Perguntas Frequentes
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebFrameworks[+Perguntas Frequentes sobre o Framework Web do NetBeans+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-JavaEEDevelopment[+Perguntas Frequentes de Desenvolvimento do Java EE+]
 
-*Tutoriais e Outras Documentações*
+=== Tutoriais e Outras Documentações
 
 * link:http://docs.oracle.com/javaee/7/tutorial/doc/[+Tutorial do Java EE 7+]
 * link:http://docs.oracle.com/javaee/6/tutorial/doc/[+O Tutorial do Java EE 6+]
@@ -280,7 +205,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://technology.amis.nl/blog/?p=2613[+Integrando Seam com Maven, NetBeans e GlassFish +]
 * link:http://technology.amis.nl/blog/?p=2610[+Combinando Hibernate e Facelets com Maven, NetBeans e GlassFish+]
 
-*Weblogs*
+=== Weblogs
 
 * link:http://www.java.net/blogs/edburns/[+Ed Burns+]
 * link:https://blogs.oracle.com/arungupta/[+Arun Gupta+]
@@ -290,4 +215,4 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga+]
 * link:http://blogs.oracle.com/theaquarium/[+The Aquarium+]
 * link:http://buttso.blogspot.com/[+The Buttso Blathers+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/java-ee_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-ee_ru.asciidoc
index 21bb928..fdb5226 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee_ru.asciidoc
@@ -30,14 +30,14 @@
 :keywords: Apache NetBeans, Tutorials, Учебная карта по Java EE и веб-приложениям Java
 
 
-==== Общее представление о веб-приложении Java
+== Общее представление о веб-приложении Java
 
 Веб-приложение Java создает интерактивные веб-страницы, содержащие различные типы языков разметки (HTML, XML и т.д.), а также динамическое содержимое. Это содержимое обычно формируется веб-компонентами, например страницами JavaServer (JSP), сервлетами и компонентами JavaBean, которые позволяют изменять данные и осуществлять их временное хранение, взаимодействовать с базами данных и веб-службами, а также отображать содержимое в ответ на запросы клиентов.
 
 Так как многие задачи разработки веб-приложения могут повторяться или требовать наличия избыточного шаблонного кода, то для уменьшения количества общих действий следует применять веб-платформы. Многие платформы (например, JavaServer Faces) предоставляют библиотеки для создания шаблонов страниц и управления сеансами, а также часто обеспечивают повторное использование кода.
 
 
-==== *Общие сведения о Java EE*
+== *Общие сведения о Java EE*
 
 Java EE (Enterprise Edition) представляет собой широко используемую платформу, содержащую набор взаимосвязанных технологий, которые существенно сокращают стоимость и сложность разработки, развертывания многоуровневых серверных приложений, а также управления ими. Платформа Java EE основана на платформе Java SE и предоставляет набор интерфейсов API (интерфейсов разработки приложений) для разработки и запуска портируемых, надежных, масштабируемых и безопасных серверных приложений.
 
@@ -47,7 +47,7 @@ Java EE в числе прочих содержит следующие комп
 * Интерфейс API сохранения состояния Java (Java Persistence API, JPA): инфраструктура, позволяющая разработчикам управлять данными с помощью объектно-реляционного сопоставления (ORM) в приложениях, созданных на платформе Java.
 
 
-==== Разработка на JavaScript и Ajax
+== Разработка на JavaScript и Ajax
 
 JavaScript представляет собой объектно-ориентированный язык сценариев и в основном используется в клиентских интерфейсах веб-приложений. Ajax (асинхронный JavaScript и XML) является технологией Web 2.0, позволяющей выполнять изменения веб-страницы без ее обновления. Для реализации компонентов и функций Ajax на веб-страницах можно использовать наборы инструментов JavaScript.
 
@@ -55,17 +55,7 @@ JavaScript представляет собой объектно-ориентир
 
 image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Начало работы
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы
+== Начало работы
 
 * link:../docs/web/quickstart-webapps.html[+Введение в разработку веб-приложений+]
 * link:../docs/javaee/javaee-intro.html[+Введение в технологию Java EE +]
@@ -74,17 +64,7 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/web/ajax-quickstart.html[+Введение в Ajax+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
 *Учебный курс по электронной коммерции в среде NetBeans*
 
@@ -154,17 +134,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/js-toolkits-dojo.html[+Подключение дерева Dojo к списку ArrayList с помощью JSON+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * link:../docs/javaee/maven-primefaces-screencast.html[+Разработка PrimeFaces с помощью Maven+]
 * link:../docs/javaee/javaee-gettingstarted-js-screencast.html[+Разработка клиентов JavaScript в Java EE+]
@@ -197,17 +167,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 
 image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Примеры приложений
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Примеры приложений - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Примеры приложений
+== Примеры приложений
 
 * link:../samples/pet-catalog.html[+Pet Catalog – пример приложения на Java EE 6+]
 * link:../samples/scrum-toys.html[+Scrum Toys – полный пример приложения JSF 2.0+]
@@ -218,17 +178,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screenca
 
 image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Иерархическая разработка веб-служб с помощью IDE NetBeans+] (автор Джайсурая Венуг (Jayasurya Venug)) (дополнение к учебному курсу по электронной коммерции в NetBeans)
 * link:http://blog.mueller-bruehl.de/en/tutorial-web-development/[+Учебный курс по веб-разработке (с помощью JSF)+], Майкл Мюллер (Michael Muller)
@@ -243,17 +193,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index
 
 image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
 *_Разработка приложений в IDE NetBeans_ - Руководство пользователя*
 
diff --git a/netbeans.apache.org/src/content/kb/docs/java-ee_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-ee_zh_CN.asciidoc
index a33c823..553a087 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-ee_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-ee_zh_CN.asciidoc
@@ -29,15 +29,13 @@
 :description: Java EE 和 Java Web 学习资源 - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Java EE 和 Java Web 学习资源
 
-
-==== 什么是 Java Web 应用程序？
+== 什么是 Java Web 应用程序？
 
 Java Web 应用程序会生成包含各种类型的标记语言（HTML 和 XML 等）和动态内容的交互式 Web 页。它通常由 Web 组件组成（如 JavaServer Pages (JSP)、servlet 和 JavaBeans），可用来修改和临时存储数据、与数据库和 Web 服务交互，以及根据客户端的请求呈现内容。
 
 由于 Web 应用程序开发中涉及的很多任务都可以重复或需要多余的模板代码，因此可以应用 Web 框架来减少与常见活动相关联的开销。例如，很多框架（如 JavaServer Faces）为模板页面和会话管理提供了库，并经常提高代码的重用率。
 
-
-==== *什么是 Java EE？*
+=== *什么是 Java EE？*
 
 Java EE (Enterprise Edition) 是一种广泛使用的平台，包含了一组协调技术，可显著降低成本以及开发、部署和管理以服务器为中心的多层应用程序的复杂性。Java EE 是基于 Java SE 平台构建的，并提供了一组用于开发和运行可移植、强健、可伸缩、可靠和安全的服务器端应用程序的 API（应用程序编程接口）。
 
@@ -47,46 +45,21 @@ Java EE 的一些基本组件包括：
 * Java 持久性 API (JPA)：一种使开发者能够在基于 Java 平台构建的应用程序中使用对象关系映射 (ORM) 来管理数据的框架。
 
 
-==== JavaScript 和 Ajax 开发
+=== JavaScript 和 Ajax 开发
 
 JavaScript 是面向对象的脚本语言，主要用在 Web 应用程序的客户端接口中。Ajax（异步 JavaScript 和 XML）是一种 Web 2.0 技术，能使 Web 页发生变化而无需执行页面刷新。JavaScript 工具包可用于在 Web 页中实现支持 Ajax 的组件和功能。
 
- 
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南
+== 入门指南
 
 * link:../docs/web/quickstart-webapps.html[+Web 应用程序开发简介+]
 * link:../docs/javaee/javaee-intro.html[+Java EE 技术简介+]
 * link:../docs/javaee/javaee-gettingstarted.html[+Java EE 应用程序入门指南+]
 * link:../docs/web/jsf20-intro.html[+JavaServer Faces 2.x 简介+]
 * link:../docs/web/ajax-quickstart.html[+Ajax 简介+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
-*NetBeans 电子商务教程*
+=== NetBeans 电子商务教程
 
 * link:../docs/javaee/ecommerce/intro.html[+简介+]
 * link:../docs/javaee/ecommerce/design.html[+设计应用程序+]
@@ -102,7 +75,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/ecommerce/test-profile.html[+测试和性能分析+]
 * link:../docs/javaee/ecommerce/conclusion.html[+小结+]
 
-*上下文和依赖关系注入*
+=== 上下文和依赖关系注入
 
 * link:../docs/javaee/cdi-intro.html[+上下文和依赖关系注入以及 JSF 2.x 入门+]
 * link:../docs/javaee/cdi-inject.html[+使用 CDI 中的注入和限定符+]
@@ -110,7 +83,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/cdi-events.html[+使用 CDI 中的事件+]
 * link:../docs/javaee/maven-osgiservice-cdi.html[+使用 CDI 将 OSGi 包作为服务注入+]
 
-*开发 Java Web 应用程序*
+=== 开发 Java Web 应用程序
 
 * link:../docs/javaee/maven-websocketapi.html[+在 Web 应用程序中使用 WebSocket API+]
 * link:../docs/web/jsf-jpa-weblogic.html[+为 Oracle WebLogic Server 开发企业应用程序+]
@@ -120,13 +93,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/security-webapps.html[+保护 Web 应用程序+]
 * link:../docs/java/profile-loadgenerator.html[+使用 NetBeans IDE 中的负载生成器+]
 
-*云支持*
+=== 云支持
 
 * link:../docs/web/oracle-cloud.html[+在 Oracle Cloud 上运行 Web 应用程序+]
 * link:https://blogs.oracle.com/javatraining/entry/oracle_cloud_development_with_netbeans[+使用 NetBeans 和 Eclipse (OEPE) 进行 Oracle Cloud 开发+]（Java Training Beat 博客）
 * NetBeans Wiki：link:http://wiki.netbeans.org/AmazonBeanstalkSupport[+Amazon Beanstalk 支持+]
 
-*EJB 技术和 Java 持久性*
+=== EJB 技术和 Java 持久性
 
 * link:../docs/javaee/javaee-entapp-junit.html[+使用嵌入的 EJB 容器测试企业应用程序+]
 * link:../docs/javaee/javaee-entapp-ejb.html[+使用 EJB 3.1 创建企业应用程序+]
@@ -137,7 +110,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/javaee/profiler-javaee.html[+对企业应用程序进行性能分析+]
 * link:http://wiki.netbeans.org/WebLogicJMS[+从 NetBeans IDE 中使用 WebLogic JMS+]
 
-*Web 框架*
+=== Web 框架
 
 * link:../docs/web/jsf20-intro.html[+JavaServer Faces 2.x 简介+]
 * link:../docs/web/jsf20-support.html[+JSF 2.x 支持+]
@@ -147,24 +120,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/quickstart-webapps-wicket.html[+Wicket+]
 * link:../docs/web/framework-adding-support.html[+添加对 Web 框架的支持+]
 
-*JavaScript 和 Ajax 开发*
+=== JavaScript 和 Ajax 开发
 
 * link:../docs/web/ajax-quickstart.html[+Ajax 简介+]
 * link:../docs/web/js-toolkits-jquery.html[+使用 jQuery 改善 Web 页的外观和可用性+]
 * link:../docs/web/js-toolkits-dojo.html[+使用 JSON 将 Dojo 树连接至 ArrayList+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * link:../docs/javaee/maven-primefaces-screencast.html[+使用 Maven 进行 PrimeFaces 开发+]
 * link:../docs/javaee/javaee-gettingstarted-js-screencast.html[+Java EE 中的 JavaScript 客户端开发+]
@@ -178,7 +140,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube：link:http://www.youtube.com/watch?v=wcg2SCgTL-4[+Glassfish 中的 HTML5 和 Web 套接字+]
 * YouTube：link:http://www.youtube.com/watch?v=zdYxdx3FuX0[+Java EE 6 可发挥 Java 7 和 GlassFish 3.1.1 的作用+]
 
-*启用 OSGi 的 Java EE 应用程序（作者：Arun Gupta）*(YouTube)
+=== 启用 OSGi 的 Java EE 应用程序（作者：Arun Gupta）(YouTube)
 
 * YouTube：link:http://www.youtube.com/watch?v=X7GwN4XSzfU[+父 POM 项目（第 1 部分，共 6 部分）+]
 * YouTube：link:http://www.youtube.com/watch?v=eBdLqdvOF_8[+API 和服务 OSGi 包（第 2 部分，共 6 部分）+]
@@ -187,7 +149,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * YouTube：link:http://www.youtube.com/watch?v=6WexZAUeFWM[+涉及 EJB 服务的客户端 OSGi 包（第 5 部分，共 6 部分）+]
 * YouTube：link:http://www.youtube.com/watch?v=IU4UMTnifhw[+结论和其他可能的补充内容（第 6 部分，共 6 部分）+]
 
-*Java EE 6 视频教程（作者：Arun Gupta）*(YouTube)
+=== Java EE 6 视频教程（作者：Arun Gupta）(YouTube)
 
 * link:http://www.youtube.com/watch?v=pwBNmAhtqk8[+JSP + Servlet + EJB：使用 NetBeans 6.9 的 Java EE 6 与 GlassFish 3（第 1 部分，共 5 部分）+]
 * link:http://www.youtube.com/watch?v=_D_vphsAM-Y[+Java 持久性 API 2：使用 NetBeans 6.9 的 Java EE 6 与 GlassFish 3（第 2 部分，共 5 部分）+]
@@ -195,34 +157,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.youtube.com/watch?v=D1fyKOTO5rw[+CDI 和 JSF 2：使用 NetBeans 6.9 的 Java EE 6 和 GlassFish 3（第 4 部分，共 5 部分）+]
 * link:http://www.youtube.com/watch?v=qf2Jxwpbsuo[+使用 JAX-RS 的 REST 风格的 Web 服务：使用 NetBeans 6.9 的 Java EE 6 和 GlassFish 3（第 5 部分，共 5 部分）+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 样例应用程序
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 样例应用程序 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 样例应用程序
-
-
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index.html"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+NetBeans IDE 中的分层 Web 服务开发+]，作者：Jayasurya Venug（NetBeans 电子商务教程的续本）
 * link:http://blog.mueller-bruehl.de/en/tutorial-web-development/[+教程：使用 JSF 的 Web 开发+]（作者：Michael Muller）
@@ -235,21 +170,9 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="../samples/index
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+尽可能简单的 EJB 3.1/REST (JSR 311) 组件+]，作者：Adam Bien
 * link:http://wiki.netbeans.org/DevelopAjaxJSF2App[+在 NetBeans 6.8 中使用 PrimeFaces 开发基于 Ajax 的 JSF2 应用程序+]，作者：Christopher Lam
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
-*_使用 NetBeans IDE 开发应用程序_用户指南*
+=== _使用 NetBeans IDE 开发应用程序_用户指南
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+开发企业应用程序+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1349[+使用 Java 持久性进行开发+]
@@ -258,12 +181,12 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+使用 Web 和应用程序服务器+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1138[+使用 Web 应用程序框架+]
 
-*常见问题解答*
+=== 常见问题解答
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebFrameworks[+NetBeans Web Framework 常见问题解答+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-JavaEEDevelopment[+Java EE 开发常见问题解答+]
 
-*教程和其他文档*
+=== 教程和其他文档
 
 * link:http://docs.oracle.com/javaee/7/tutorial/doc/[+Java EE 7 教程+]
 * link:http://docs.oracle.com/javaee/6/tutorial/doc/[+Java EE 6 教程+]
@@ -274,7 +197,7 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://technology.amis.nl/blog/?p=2613[+集成 Seam、Maven、NetBeans 和 GlassFish+]
 * link:http://technology.amis.nl/blog/?p=2610[+使用 Maven、NetBeans 和 GlassFish 将 Hibernate 与 Facelets 结合在一起+]
 
-*博客*
+=== 博客
 
 * link:http://www.java.net/blogs/edburns/[+Ed Burns+]
 * link:https://blogs.oracle.com/arungupta/[+Arun Gupta+]
@@ -284,4 +207,4 @@ image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netb
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga+]
 * link:http://blogs.oracle.com/theaquarium/[+The Aquarium+]
 * link:http://buttso.blogspot.com/[+The Buttso Blathers+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/java-se_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-se_ca.asciidoc
index 6987e8d..d5c2ce4 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-se_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-se_ca.asciidoc
@@ -29,43 +29,19 @@
 :description: Camí d'aprenentatge del desenvolupament general de Java - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge del desenvolupament general de Java
 
-
-==== Què és una aplicació Java SE?
+== Què és una aplicació Java SE?
 
 Una aplicació Java SE és una aplicació escrita en la plataforma Java, edició estàndard (Java SE). Les mateixes aplicacions Java SE sense modificar-se poden executar-se en la majoria d'ordinadors, tant en ordinadors amb sistemes operatius Microsoft Windows, Solaris, Linux, o MacOS X. La clau d'aquesta portabilitat d'aplicacions és l'entorn d'execució Java, el qual no és cap sobrecàrrega per a la majoria dels sistemes operatius, incloent tots els citats anteriorment.
 
 Addicionalment per a començar una aplicació d'escriptori multi-plataforma, la plataforma Java SE és la base per a altres tècniques com la plataforma Java, edició empresarial (Java EE). Per exemple, potser us podeu trobar escrivint un codi Java que proporcioni la lògica del servidor de rerefons per a una aplicació web empresarial.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started 
+== Getting Started 
 
 * link:../docs/java/quickstart.html[+Java Quick Start Tutorial+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Developing Java Applications *
+=== Developing Java Applications
 
 * link:../docs/java/javase-jdk7.html[+JDK 7 Support in NetBeans IDE 7.0+]
 * link:../docs/java/javase-deploy.html[+Packaging and Distributing Java Desktop Applications+]
@@ -76,45 +52,34 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/annotations-custom.html[+Part II: Using Own Custom Annotation Processors+]
 * link:https://netbeans.org/projects/www/downloads/download/shortcuts.pdf[+Keyboard Shortcuts Card+]
 
-*Building, Debugging, and Testing*
+=== Building, Debugging, and Testing
 
 * link:http://java.sun.com/developer/technicalArticles/java_warehouse/single_jar/[+Use NetBeans IDE to Combine JAR Files Into a Single JAR File+]
 * link:../docs/java/junit-intro.html[+Writing JUnit Tests+]
 * link:../docs/java/debug-multithreaded.html[+Debugging Multithreaded Applications+]
 
-*Maven*
+=== Maven
 
 * link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices+]
 * link:../docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+]
 
-*Profiling Source Code*
+=== Profiling Source Code
 
 * link:../docs/java/profiler-intro.html[+Introduction to Profiling Java Applications+]
 * link:../docs/java/profiler-profilingpoints.html[+Using Profiling Points+]
 * link:https://netbeans.org/community/magazine/html/04/profiler.html[+Advanced Profiling: Theory in Practice+]
 
-*Scripting Languages*
+=== Scripting Languages
 
 * link:../docs/java/groovy-quickstart.html[+Introduction to Groovy+]
 
-*JMX Monitoring and Management*
+=== JMX Monitoring and Management
 
 * link:../docs/java/jmx-getstart.html[+Getting Started with Java Management Extensions (JMX) Monitoring+]
 * link:../docs/java/jmx-tutorial.html[+Adding JMX Instrumentation to a Java Application+]
 * link:../docs/java/jmx-manager-tutorial.html[+Developing a JMX Manager and Connecting to a Remote JMX Agent+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/java/jdk7-nb70-screencast.html[+Demo: JDK 7 Support in NetBeans IDE 7.0+]
 * link:https://blogs.oracle.com/arungupta/entry/screencast_35_jdk_7_project[+Demo: JDK 7 Project Coin Features in NetBeans IDE 7.0 Beta+] (_by Arun Gupta_)
@@ -123,21 +88,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/debug-evaluator-screencast.html[+Demo: Using the Code Snippet Evaluator in the NetBeans Debugger+]
 * link:../docs/java/debug-multithreaded-screencast.html[+Demo: Multithreaded Debugging+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://wiki.netbeans.org/Integrating_ANTLR_without_learning_Ant[+Integrating ANTLR without learning Ant+] (_by Jeff Allen_)
 * link:http://wiki.netbeans.org/Splash_Screen_Beginner_Tutorial[+Adding a Splash Screen to a Java Application+] (_by Joseph Areeda_)
@@ -147,21 +98,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/Refactoring[+Refactoring Simplified+]
 * link:http://wiki.netbeans.org/LookAndFeel[+Customizing the Look and Feel of the NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ[+NetBeans User FAQs:+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Project_System_.28General.29[+General Project System+]
@@ -175,4 +112,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../../kb/articles/learn-java.html[+Learning Java - Resources+]
 * link:http://www.javapassion.com/portal/[+JavaPassion Java Intro+]
 * link:http://download.oracle.com/javase/tutorial/[+The Java Tutorials+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]  
diff --git a/netbeans.apache.org/src/content/kb/docs/java-se_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-se_ja.asciidoc
index 4cb9175..3a2bad5 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-se_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-se_ja.asciidoc
@@ -29,43 +29,19 @@
 :description: 一般的なJava開発の学習 - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, 一般的なJava開発の学習
 
-
-==== Java SEアプリケーションとは
+== Java SEアプリケーションとは
 
 Java SEアプリケーションは、Java Platform, Standard Edition (Java SE)向けに作成されたアプリケーションです。Java SEアプリケーションは、Microsoft Windows、Solaris、Linux、またはOS Xの各オペレーティング・システムが動作するコンピュータで変更せずに実行できます。このようなアプリケーションの移植性の基盤となるのがJava Runtime Environmentです。上記で述べたオペレーティング・システムを含む、ほとんどのオペレーティング・システム用のJava Runtime Environmentが無償で提供されています。
 
 Java SEプラットフォームは、マルチプラットフォーム・デスクトップ・アプリケーションのプラットフォームであるのみでなく、Java Platform, Enterprise Editionなど、他のテクノロジの基盤でもあります。Webアプリケーションとエンタープライズ・アプリケーションのバックエンド・ロジックのJavaコードを作成することもできます。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 開始 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始 
+== 開始 
 
 * link:../docs/java/quickstart.html[+Javaクイック・スタート・チュートリアル+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
-*Javaアプリケーションの開発*
+=== Javaアプリケーションの開発
 
 * link:../docs/java/javase-embedded.html[+NetBeans IDEでのOracle Java SE Embeddedのサポートの使用+]
 * link:../docs/java/javase-jdk8.html[+NetBeans IDEでのJDK 8サポートの概要+]
@@ -76,46 +52,36 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/editor-inspect-transform.html[+NetBeans IDE Javaエディタでの「検査と変換」を使用したリファクタリング+]
 * link:https://netbeans.org/projects/usersguide/downloads/download/shortcuts-80.pdf[+キーボード・ショートカットのカード+]
 
-*ビルド、デバッグ、およびテスト*
+=== ビルド、デバッグ、およびテスト
 
 * link:../docs/java/debug-visual.html[+ビジュアル・デバッガの使用+]
 * link:../docs/java/junit-intro.html[+JUnitテストの作成+]
 * link:../docs/java/debug-multithreaded.html[+マルチスレッド・アプリケーションのデバッグ+]
 
-*Maven*
+=== Maven
 
 * link:http://wiki.netbeans.org/MavenBestPractices[+Mavenのベスト・プラクティス+]
 * link:../docs/java/maven-hib-java-se.html[+Hibernateを使用したMaven Swingアプリケーションの作成+]
 
-*ソース・コードのプロファイリング*
+=== ソース・コードのプロファイリング
 
 * link:../docs/java/profiler-intro.html[+Javaアプリケーションのプロファイリング入門+]
 * link:../docs/java/profiler-profilingpoints.html[+プロファイリング・ポイントの使用+]
 * link:../../../community/magazine/html/04/profiler.html[+詳細なプロファイリング: 実行理論+]
 * link:../../../competition/win-with-netbeans/case-study-nb-profiler.html[+NetBeansプロファイラのケース・スタディ+]
 
-*スクリプト作成言語*
+=== スクリプト作成言語
 
 * link:../docs/java/groovy-quickstart.html[+Groovyの概要+]
 
-*JMXのモニタリングおよび管理*
+=== JMXのモニタリングおよび管理
 
 * link:../docs/java/jmx-getstart.html[+JMX (Java Management Extensions)モニタリングについて+]
 * link:../docs/java/jmx-tutorial.html[+JavaアプリケーションへのJMXインストゥルメントの追加+]
 * link:../docs/java/jmx-manager-tutorial.html[+JMXマネージャとリモートJMXエージェントへの接続の開発+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * YouTube: link:https://www.youtube.com/watch?v=N8HsVgUDCn8[+JDK 8へのスマート移行+](_Geertjan Wielenga_)
 * YouTube: link:http://www.youtube.com/watch?v=LoOeetb2ifQ&list=PLKCk3OyNwIzv6qi-LuJkQ0tGjF7gZTpqo&index=2[+ラムダについて+](_Oracle Learning Library作成_)
@@ -128,21 +94,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/debug-visual-screencast.html[+デモ: ビジュアル・デバッガの使用+]
 * link:../docs/java/debug-evaluator-screencast.html[+デモ: NetBeansデバッガのコード・スニペット評価の使用+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://java.dzone.com/articles/using-lambda-expression-sort[+Netbeansのラムダ・サポートを使用したJava 8でのラムダ式によるリストのソート+](_Mohamed Sanaulla著_)
 * link:http://wiki.netbeans.org/CompactProfiles[+NetBeans IDEでのコンパクト・プロファイル+](_Tomas Zezula著_)
@@ -150,21 +102,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/TaT_ConfigNetBeansUsingBatchFiles[+バッチ・ファイルを使用したNetBeansの構成+]
 * link:http://wiki.netbeans.org/Refactoring[+リファクタリングの単純化+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/se-embeddocs/index.html[+Java SE Embeddedドキュメント+]
 * _NetBeans IDEによるアプリケーションの開発_のlink:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG366[+Javaプロジェクトの作成+]
@@ -182,4 +120,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mysql.com/why-mysql/java/[+MySQL and Java - Resources +]
 * link:http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql[+MySQLのオンデマンドWebセミナー+]
 * link:../../kb/articles/learn-java.html[+Javaの学習 - リソース+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]  
diff --git a/netbeans.apache.org/src/content/kb/docs/java-se_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-se_pt_BR.asciidoc
index a3e2204..d0aa7d4 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-se_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-se_pt_BR.asciidoc
@@ -29,43 +29,19 @@
 :description: Trilha do Aprendizado do Desenvolvimento Geral em Java - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Trilha do Aprendizado do Desenvolvimento Geral em Java
 
-
-==== O que é uma Aplicação Java SE?
+== O que é uma Aplicação Java SE?
 
 A aplicação Java SE é uma aplicação escrita na Plataforma Java, Standard Edition (Java SE). As mesmas aplicações Java SE não modificadas podem ser executadas praticamente em qualquer computador, qualquer que seja o sistema operacional, Microsoft Windows, Solaris, Linux ou OS X. O segredo da portabilidade dessa aplicação é o Java Runtime Environment, que está disponível gratuitamente para a maioria dos sistemas operacionais, incluindo os acima mencionados.
 
 Além de ser uma plataforma para aplicações de desktop em várias plataformas, a Java SE é a base de outras tecnologias, como a Plataforma Java, Enterprise Edition. Você pode se descobrir criando código Java que forneça lógica secundária para aplicações Web e enterprise.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Conceitos Básicos 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Conceitos Básicos  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Conceitos Básicos 
+== Conceitos Básicos 
 
 * link:../docs/java/quickstart.html[+Tutorial de Início Rápido do Java+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Desenvolvendo Aplicações Java *
+=== Desenvolvendo Aplicações Java
 
 * link:../docs/java/javase-embedded.html[+Usando o Suporte do Oracle Java SE Embedded no NetBeans IDE+]
 * link:../docs/java/javase-jdk8.html[+Visão Geral do Suporte a JDK 8 no NetBeans IDE+]
@@ -76,46 +52,35 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/editor-inspect-transform.html[+Refatoração com Inspecionar e Transformar no Editor Java do NetBeans IDE+]
 * link:https://netbeans.org/projects/usersguide/downloads/download/shortcuts-80.pdf[+Cartão de Atalhos do Teclado+]
 
-*Construindo, Depurando e Testando*
+=== Construindo, Depurando e Testando
 
 * link:../docs/java/debug-visual.html[+Usando o Depurador Visual+]
 * link:../docs/java/junit-intro.html[+Escrevendo Testes JUnit+]
 * link:../docs/java/debug-multithreaded.html[+Depurando Aplicações Multithread+]
 
-*Maven*
+=== Maven
 
 * link:http://wiki.netbeans.org/MavenBestPractices[+Melhores Práticas do Maven+]
 * link:../docs/java/maven-hib-java-se.html[+Criando uma Aplicação Maven Swing Usando Hibernate+]
 
-*Criando Perfil do Código-fonte*
+=== Criando Perfil do Código-fonte
 
 * link:../docs/java/profiler-intro.html[+Introdução à Criação de Perfil de Aplicações Java+]
 * link:../docs/java/profiler-profilingpoints.html[+Usando Pontos de Criação de Perfil+]
 * link:../../../community/magazine/html/04/profiler.html[+Criação Avançada de Perfil: Teoria na Prática+]
 * link:../../../competition/win-with-netbeans/case-study-nb-profiler.html[+Estudo de Caso do Determinador de Perfil do NetBeans+]
 
-*Linguagens de Script*
+=== Linguagens de Script
 
 * link:../docs/java/groovy-quickstart.html[+Introdução ao Groovy+]
 
-*Monitoramento e Gerenciamento do JMX*
+=== Monitoramento e Gerenciamento do JMX
 
 * link:../docs/java/jmx-getstart.html[+Introdução ao Monitoramento do Java Management Extensions (JMX)+]
 * link:../docs/java/jmx-tutorial.html[+Adicionando Instrumentação JMX a uma Aplicação Java+]
 * link:../docs/java/jmx-manager-tutorial.html[+Desenvolvendo um Gerenciador JMX e Conectando a um Agente JMX Remoto+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * YouTube: link:https://www.youtube.com/watch?v=N8HsVgUDCn8[+Migração Inteligente para JDK 8+] (_por Geertjan Wielenga_)
 * YouTube: link:http://www.youtube.com/watch?v=LoOeetb2ifQ&list=PLKCk3OyNwIzv6qi-LuJkQ0tGjF7gZTpqo&index=2[+Getting Started with Lambda (Conceito Básicos sobre Lambda) +] (_por Oracle Learning Library_)
@@ -128,21 +93,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/debug-visual-screencast.html[+Demonstração: Usando o Depurador Visual+]
 * link:../docs/java/debug-evaluator-screencast.html[+Demonstração: Usando o Avaliador de Snippet do Código no Depurador do NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * link:http://java.dzone.com/articles/using-lambda-expression-sort[+Using Lambda Expression to sort a List in Java 8 using Netbeans Lambda Support+] (_por Mohamed Sanaulla_)
 * link:http://wiki.netbeans.org/CompactProfiles[+Compact Profiles in NetBeans IDE+] (_por Tomas Zezula _)
@@ -150,21 +101,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/TaT_ConfigNetBeansUsingBatchFiles[+Configurar o NetBeans usando Arquivos Batch+]
 * link:http://wiki.netbeans.org/Refactoring[+Refatoração Simplificada+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/se-embeddocs/index.html[+Java SE Embedded Documentation+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG366[+Criando Projetos Java+] em _Desenvolvendo Aplicações com o NetBeans IDE_
@@ -182,4 +119,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mysql.com/why-mysql/java/[+MySQL e Java: Recursos+]
 * link:http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql[+Seminários Web Sob Demanda Sobre o MySQL+]
 * link:../../kb/articles/learn-java.html[+Aprendendo Java: Recursos+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]  
diff --git a/netbeans.apache.org/src/content/kb/docs/java-se_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-se_ru.asciidoc
index 207d244..b28396a 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-se_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-se_ru.asciidoc
@@ -30,42 +30,19 @@
 :keywords: Apache NetBeans, Tutorials, Учебная карта по общим сведениям о разработке на Java
 
 
-==== Общее представление о приложении на базе Java SE
+== Общее представление о приложении на базе Java SE
 
 Приложение на базе Java SE – это приложение, написанное на платформе Java Standard Edition (Java SE). Одни и те же немодифицированные приложения Java SE можно запускать практически на любом компьютере с операционной системой Microsoft Windows, Solaris, Linux или OS X. Ключ к такой переносимости приложений – среда Java Runtime Environment, бесплатная для большинства операционных систем, в том числе операционных систем, упомянутых выше.
 
 Являясь платформой для создания многоплатформенных приложений рабочей среды, платформа Java SE является также основой для других технологий, таких как Java Platform Enterprise Edition. Написанный код Java может обеспечивать серверную логику и для веб-приложений, а также для приложений уровня предприятия.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Начало работы 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы 
+== Начало работы 
 
 * link:../docs/java/quickstart.html[+Краткий учебный курс по работе с Java+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
-*Разработка приложений на Java *
+=== Разработка приложений на Java
 
 * link:../docs/java/javase-embedded.html[+Использование поддержки Oracle Java SE Embedded в NetBeans IDE+]
 * link:../docs/java/javase-jdk8.html[+Обзор поддержки JDK 8 в IDE NetBeans+]
@@ -76,46 +53,35 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/editor-inspect-transform.html[+Реорганизация при проверке и пребразовании в редакторе Java IDE NetBeans+]
 * link:https://netbeans.org/projects/usersguide/downloads/download/shortcuts-80.pdf[+Таблица сочетаний клавиш+]
 
-*Сборка, отладка и тестирование*
+=== Сборка, отладка и тестирование
 
 * link:../docs/java/debug-visual.html[+Использование визуального отладчика+]
 * link:../docs/java/junit-intro.html[+Написание тестов JUnit+]
 * link:../docs/java/debug-multithreaded.html[+Отладка многопоточных приложений+]
 
-*Maven*
+=== Maven
 
 * link:http://wiki.netbeans.org/MavenBestPractices[+Практические рекомендации по использованию Maven+]
 * link:../docs/java/maven-hib-java-se.html[+Создание приложения Maven Swing с использованием Hibernate+]
 
-*Профилирование исходного кода*
+=== Профилирование исходного кода
 
 * link:../docs/java/profiler-intro.html[+Введение в профилирование приложений, написанных на Java+]
 * link:../docs/java/profiler-profilingpoints.html[+Использование точек профилирования+]
 * link:../../../community/magazine/html/04/profiler.html[+Расширенное профилирование: теория на практике+]
 * link:../../../competition/win-with-netbeans/case-study-nb-profiler.html[+Пример использования профилировщика NetBeans+]
 
-*Языки написания сценариев*
+=== Языки написания сценариев
 
 * link:../docs/java/groovy-quickstart.html[+Введение в Groovy+]
 
-*Наблюдение и управление с помощью среды JMX*
+=== Наблюдение и управление с помощью среды JMX
 
 * link:../docs/java/jmx-getstart.html[+Начало работы по наблюдению с помощью среды Java Management Extensions (JMX)+]
 * link:../docs/java/jmx-tutorial.html[+Добавление инструментов JMX к приложению, написанному на Java+]
 * link:../docs/java/jmx-manager-tutorial.html[+Разработка диспетчера JMX и подключение к удаленному агенту JMX+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * Видео на YouTube: link:https://www.youtube.com/watch?v=N8HsVgUDCn8[+Эффективная миграция на JDK 8+] (_автор: Гиртжан Виленга (Geertjan Wielenga)_)
 * YouTube: link:http://www.youtube.com/watch?v=LoOeetb2ifQ&list=PLKCk3OyNwIzv6qi-LuJkQ0tGjF7gZTpqo&index=2[+Начало работы с лямбда-функциями +] (_из библиотеки Oracle Learning Library_)
@@ -128,21 +94,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/debug-visual-screencast.html[+Демонстрация: использование визуального отладчика+]
 * link:../docs/java/debug-evaluator-screencast.html[+Демонстрация: использование блока оценки фрагмента кода в отладчике NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://java.dzone.com/articles/using-lambda-expression-sort[+Сортировка списков в Java 8 с использованием лямбда-выражений и поддержки лямбда-функций в Netbeans+] (_Автор: Мохамед Санаулла (Mohamed Sanaulla)_)
 * link:http://wiki.netbeans.org/CompactProfiles[+Компактные профили в IDE NetBeans+] (_Автор: Томас Зезула (Tomas Zezula) _)
@@ -150,21 +102,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/TaT_ConfigNetBeansUsingBatchFiles[+Настройка NetBeans с помощью пакетных файлов+]
 * link:http://wiki.netbeans.org/Refactoring[+Упрощение реорганизации+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/se-embeddocs/index.html[+Документация по Java SE Embedded+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG366[+Создание проектов Java+] в документе _Разработка приложений в IDE NetBeans_
@@ -182,4 +120,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mysql.com/why-mysql/java/[+Материалы по MySQL и Java+]
 * link:http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql[+Веб-семинары MySQL по требованию+]
 * link:../../kb/articles/learn-java.html[+Материалы для изучения Java+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]  
diff --git a/netbeans.apache.org/src/content/kb/docs/java-se_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/java-se_zh_CN.asciidoc
index debc9d2..421673a 100644
--- a/netbeans.apache.org/src/content/kb/docs/java-se_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/java-se_zh_CN.asciidoc
@@ -30,42 +30,19 @@
 :keywords: Apache NetBeans, Tutorials, 常规 Java 开发学习资源
 
 
-==== 什么是 Java SE 应用程序？
+== 什么是 Java SE 应用程序？
 
 Java SE 应用程序是在 Java Platform, Standard Edition (Java SE) 中编写的应用程序。相同的 Java SE 应用程序无需任何修改便可在几乎所有计算机上运行，无论这台计算机使用 Microsoft Windows、Solaris、Linux 还是 OS X 操作系统。这种应用程序可移植性的关键因素是 Java 运行时环境，它免费针对大多数操作系统开放，包括上面提到的所有操作系统。
 
 除了支持开发多平台桌面应用程序之外，Java SE 平还是许多其他技术的基础，比如说 Java Platform, Enterprise Edition。在 Java SE 平台中编写的代码还可为 Web 和企业应用程序提供后台逻辑。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南 
+== 入门指南 
 
 * link:../docs/java/quickstart.html[+Java 快速入门教程+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
-*开发 Java 应用程序*
+=== 开发 Java 应用程序
 
 * link:../docs/java/javase-embedded.html[+在 NetBeans IDE 中使用 Oracle Java SE 嵌入式支持+]
 * link:../docs/java/javase-jdk8.html[+NetBeans IDE 中的 JDK 8 支持概述+]
@@ -76,46 +53,35 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/editor-inspect-transform.html[+在 NetBeans IDE Java 编辑器中通过“检查并转换”重构+]
 * link:https://netbeans.org/projects/usersguide/downloads/download/shortcuts-80.pdf[+快捷键列表+]
 
-*编译、调试和测试*
+=== 编译、调试和测试
 
 * link:../docs/java/debug-visual.html[+使用可视调试器+]
 * link:../docs/java/junit-intro.html[+编写 JUnit 测试+]
 * link:../docs/java/debug-multithreaded.html[+调试多线程应用程序+]
 
-*Maven*
+=== Maven
 
 * link:http://wiki.netbeans.org/MavenBestPractices[+Maven 最佳实践+]
 * link:../docs/java/maven-hib-java-se.html[+使用 Hibernate 创建 Maven Swing 应用程序+]
 
-*对源代码进行性能分析*
+=== 对源代码进行性能分析
 
 * link:../docs/java/profiler-intro.html[+分析 Java 应用程序简介+]
 * link:../docs/java/profiler-profilingpoints.html[+使用性能分析点+]
 * link:../../../community/magazine/html/04/profiler.html[+高级性能分析：理论应用实践+]
 * link:../../../competition/win-with-netbeans/case-study-nb-profiler.html[+NetBeans 分析器的案例研究+]
 
-*脚本语言*
+=== 脚本语言
 
 * link:../docs/java/groovy-quickstart.html[+Groovy 简介+]
 
-*JMX 监控和管理*
+=== JMX 监控和管理
 
 * link:../docs/java/jmx-getstart.html[+Java 管理扩展 (JMX) 监控入门指南+]
 * link:../docs/java/jmx-tutorial.html[+将 JMX 分析添加到 Java 应用程序中+]
 * link:../docs/java/jmx-manager-tutorial.html[+开发一个 JMX 管理器并连接到远程 JMX 代理+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * YouTube：link:https://www.youtube.com/watch?v=N8HsVgUDCn8[+智能迁移至 JDK 8+]（_作者：Geertjan Wielenga_）
 * YouTube：link:http://www.youtube.com/watch?v=LoOeetb2ifQ&list=PLKCk3OyNwIzv6qi-LuJkQ0tGjF7gZTpqo&index=2[+Lambda 入门指南+]（_Oracle 学习库提供_）
@@ -128,21 +94,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/debug-visual-screencast.html[+演示：使用可视调试器+]
 * link:../docs/java/debug-evaluator-screencast.html[+演示：在 NetBeans 调试器中使用代码片段计算器+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://java.dzone.com/articles/using-lambda-expression-sort[+在 Java 8 中通过 Netbeans Lambda 支持使用 Lambda 表达式对列表排序+]（_作者：Mohamed Sanaulla_）
 * link:http://wiki.netbeans.org/CompactProfiles[+NetBeans IDE 中的精简配置文件+]（_作者：Tomas Zezula_）
@@ -150,21 +102,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/TaT_ConfigNetBeansUsingBatchFiles[+使用批处理文件配置 NetBeans+]
 * link:http://wiki.netbeans.org/Refactoring[+简化重构+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/se-embeddocs/index.html[+Java SE 嵌入式文档+]
 * _使用 NetBeans IDE 开发应用程序_中的link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG366[+创建 Java 项目+]
@@ -182,4 +120,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mysql.com/why-mysql/java/[+MySQL 和 Java - 资源+]
 * link:http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql[+MySQL 按需 Web 研讨会+]
 * link:../../kb/articles/learn-java.html[+了解 Java - 资源+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]  
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse.asciidoc b/netbeans.apache.org/src/content/kb/docs/matisse.asciidoc
index 668f1cd..ad0b6a4 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Java GUI Applications Learning Trail
 
 
-==== What are Java GUI applications?
+== What are Java GUI applications?
 
 A Java GUI application uses the standard Java components GUI component set, Swing, and is deployed to the desktop.
 
@@ -38,54 +38,31 @@ The Swing GUI Builder in NetBeans IDE simplifies the GUI development process and
 
 link:http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn[+JavaFX+] is a rich set of graphics and media packages that enables developers to design, create, test, debug, and deploy rich client applications (RIAs) that behave consistently across multiple platforms.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started
+== Getting Started
 
 * link:http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm[+Getting Started with JavaFX+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*JavaFX 8 Developer Preview*
+=== JavaFX 8 Developer Preview
 
 * link:http://docs.oracle.com/javafx/8/3d_graphics/jfxpub-3d_graphics.htm[+Getting Started with JavaFX 3D Graphics+]
 * link:http://docs.oracle.com/javafx/8/embed_swing/jfxpub-embed_swing.htm[+Embedding Swing Content in JavaFX Applications+]
 * link:http://docs.oracle.com/javafx/8/webview/jfxpub-webview.htm[+Adding HTML Content to JavaFX Applications+]
 
-*Getting Started with JavaFX*
+=== Getting Started with JavaFX
 
 * link:http://docs.oracle.com/javafx/2/overview/jfxpub-overview.htm[+What Is JavaFX?+]
 * link:http://docs.oracle.com/javafx/2/deployment/whatsnew_deployment.htm[+Deploying JavaFX Applications: Getting Started+]
 
-*JavaFX Scene Builder *
+=== JavaFX Scene Builder
 
 * link:http://docs.oracle.com/javafx/scenebuilder/1/overview/jsbpub-overview.htm[+Overview of JavaFX Scene Builder+]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/get_started/jsbpub-get_started.htm[+Getting Started with JavaFX Scene Builder 1.1 +]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/user_guide/jsbpub-user_guide.htm[+JavaFX Scene Builder User Guide+]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/use_java_ides/sb-with-nb.htm#CIHDHEFE[+Using Scene Builder with NetBeans IDE+]
 
-*JavaFX Application Logic *
+=== JavaFX Application Logic
 
 * link:http://docs.oracle.com/javafx/2/architecture/jfxpub-architecture.htm[+JavaFX Architecture+]
 * link:http://docs.oracle.com/javafx/2/scenegraph/jfxpub-scenegraph.htm[+Working with the JavaFX Scene Graph+]
@@ -94,7 +71,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://docs.oracle.com/javafx/2/threads/jfxpub-threads.htm[+Concurrency in JavaFX+]
 * link:http://docs.oracle.com/javafx/2/best_practices/jfxpub-best_practices.htm[+Implementing JavaFX Best Practices+]
 
-*JavaFX User Interface *
+=== JavaFX User Interface
 
 * link:http://docs.oracle.com/javafx/2/layout/jfxpub-layout.htm[+Working With Layouts in JavaFX +]
 * link:http://docs.oracle.com/javafx/2/text/jfxpub-text.htm[+Using Text and Text Effects in JavaFX+]
@@ -108,34 +85,23 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://docs.oracle.com/javafx/2/canvas/jfxpub-canvas.htm[+Working with Canvas+]
 * link:http://docs.oracle.com/javafx/2/image_ops/jfxpub-image_ops.htm[+Using the Image Ops API+]
 
-*JavaFX Effects, Animation, and Media*
+=== JavaFX Effects, Animation, and Media
 
 * link:http://docs.oracle.com/javafx/2/visual_effects/jfxpub-visual_effects.htm[+Creating Visual Effects in JavaFX+]
 * link:http://docs.oracle.com/javafx/2/transformations/jfxpub-transformations.htm[+Applying Transformations in JavaFX+]
 * link:http://docs.oracle.com/javafx/2/animations/jfxpub-animations.htm[+Creating Transitions and Timeline Animation in JavaFX +]
 * link:http://docs.oracle.com/javafx/2/media/jfxpub-media.htm[+Incorporating Media Assets Into JavaFX Applications +]
 
-*JavaFX Deployment and More*
+=== JavaFX Deployment and More
 
 * link:http://docs.oracle.com/javafx/2/deployment/jfxpub-deployment.htm[+Deploying JavaFX Applications +]
 * link:http://docs.oracle.com/javafx/2/swing/jfxpub-swing.htm[+JavaFX for Swing Developers+]
 * link:http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm[+JavaFX Interoperability with SWT+]
 * link:http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm[+Using a Doclet with JavaFX+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Getting Started with Swing*
+=== Getting Started with Swing
 
 * link:../docs/java/native_pkg.html[+Native Packaging in NetBeans IDE+]
 * link:../docs/java/gui-functionality.html[+Introduction to Java GUI Building+]
@@ -148,69 +114,30 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/gui-gaps.html[+Gap Editing Support in the NetBeans GUI Builder+]
 * link:../docs/java/debug-visual.html[+Using the Visual Debugger+]
 
-*Java Persistence and Beans Binding*
+=== Java Persistence and Beans Binding
 
 * link:../docs/java/gui-binding.html[+Binding Beans and Data in a Java Application+]
 * link:../docs/java/hibernate-java-se.html[+Using Hibernate in a Java Swing Application+]
 * link:../docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+]
 
-*Internationalization*
+=== Internationalization
 
 * link:../docs/java/gui-automatic-i18n.html[+Internationalizing a GUI Form+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:http://www.youtube.com/watch?v=ddJpDi5SWFc[+JavaFX Graphics Tips and Tricks+]
 * link:https://blogs.oracle.com/geertjan/entry/thanks_javafx_wysiwyg_html_editor[+Thanks JavaFX: WYSIWYG HTML Editor for NetBeans IDE +]
 * link:../docs/java/nb_fx_screencast.html[+Demo: JavaFX Support in NetBeans IDE+]
 * link:../docs/java/gui-builder-screencast.html[+Designing a Swing GUI in NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans-part3[+How to Integrate JavaFX into a NetBeans Platform Wizard (Part 1)+] (_by Sean Phillips_)
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans[+How to Integrate JavaFX into the NetBeans Platform Menu bar+] (_by Geertjan Wielenga_)
 * link:http://wiki.netbeans.org/UsingNetbeansMatisseAndEclipseInParallel[+Using Netbeans Matisse And Eclipse In Parallel+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
 * link:http://download.oracle.com/javafx/[+JavaFX Documentation+]
 * link:http://wiki.netbeans.org/JavaFX[+NetBeans wiki page on JavaFX support+]
@@ -221,4 +148,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+Implementing Java GUIs+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245[+Developing with Java Persistence+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188[+Internationalizing Source Code+] in _Developing Applications with NetBeans IDE_
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/matisse_ca.asciidoc
index 46c2947..e1d6b56 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse_ca.asciidoc
@@ -29,8 +29,7 @@
 :description: Camí d'aprenentatge de les GUI d'aplicacions Java i JavaFX - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge de les GUI d'aplicacions Java i JavaFX
 
-
-==== Què són les GUI d'aplicacions Java i Java FX?
+== Què són les GUI d'aplicacions Java i Java FX?
 
 Una aplicació gràfica Java utilitza el conjunt de components GUI estàndards de Java, Swing, i es desplega a l'escriptori. Com en altres aplicacions Java, les aplicacions gràfiques (GUI) Java poden desplegar-se a Microsoft Windows, Linux, Mac OS, OpenSolaris i qualsevol altre sistema operatiu que contingui l'entorn d'execució de Java (JRE).
 
@@ -38,36 +37,13 @@ El constructor GUI en l'IDE NetBeans us permet crear aplicacions GUI Java de for
 
 JavaFX és una plataforma de client rica per a construcció d'aplicacions i de continguts en dispositius encreuats. La plataforma JavaFX inclou un llenguatge declaratiu sincer anomenat JavaFX Script que fa realment senzilla la definició d'interfícies d'usuari eloqüents. Hi ha un conjunt de complements a l'IDE NetBeans IDE, gràfics, biblioteques de suport medis i sons, i entorns d'execució que permeten la construcció de RIAs (rich internet applications) amb una aparença i aspecte consistent [...]
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started
+== Getting Started
 
 * link:../docs/java/gui-functionality.html[+Introduction to Java GUI Building+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Designing Java GUIs*
+=== Designing Java GUIs
 
 * link:../docs/java/quickstart-gui.html[+GUI Building in NetBeans IDE+]
 * link:../docs/java/quickstart-gui-legend.html[+NetBeans IDE GUI Builder Visual Feedback Legend+]
@@ -76,47 +52,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/gbcustomizer-basic.html[+Designing a Basic Java Form Using the GridBag Customizer+]
 * link:../docs/java/gbcustomizer-advanced.html[+Designing an Advanced Java Form Using the GridBag Customizer+]
 
-*Java Database Applications, Beans Binding, and Persistence*
+=== Java Database Applications, Beans Binding, and Persistence
 
 * link:../70/java/gui-db.html[+Building a Java Desktop Database Application+]
 * link:../docs/java/gui-binding.html[+Binding Beans and Data in a Desktop Application+]
 * link:../docs/java/hibernate-java-se.html[+Using Hibernate in a Java Swing Application+]
 * link:../docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+]
 
-*Internationalization*
+=== Internationalization
 
 * link:../docs/java/gui-automatic-i18n.html[+Internationalizing a GUI Form+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/java/gui-builder-screencast.html[+Designing a Swing GUI in NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/nb-ckeditor-javamail-tutorial[+How to Send Email via Java Mail 1.4.3 &amp; CKEditor with NetBeans IDE+] (by Robert Pieśnikowski)
 * link:http://wiki.netbeans.org/SDIAppNetBeans[+Building an SDI Application with NetBeans+]
@@ -124,23 +75,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/UsingNetbeansMatisseAndEclipseInParallel[+Using Netbeans Matisse And Eclipse In Parallel+]
 * link:http://wiki.netbeans.org/UsingGUIEditor[+Using the GUI Editor+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#GUI_Editor_.28Matisse.29[+GUI Editor FAQs+]
 * link:http://download.oracle.com/javase/tutorial/uiswing/index.html[+ download.oracle.com Swing Tutorial+]
 * link:https://netbeans.org/community/magazine/html/03/matisse/[+NetBeans Magazine: UI Design in NetBeans+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/matisse_ja.asciidoc
index 7c2b16a..c859e91 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse_ja.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Java GUIアプリケーションの学習
 
 
-==== Java GUIアプリケーションとは
+== Java GUIアプリケーションとは
 
 Java GUIアプリケーションは、Java標準コンポーネントのGUIコンポーネント・セットであるSwingを使用するアプリケーションで、デスクトップにデプロイします。
 
@@ -38,54 +38,31 @@ NetBeans IDEのSwing GUIビルダーを使用すると、GUI開発プロセス
 
 link:http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn[+JavaFX+]は、開発者による複数のプラットフォームで同様に動作するリッチ・インターネット・アプリケーション(RIA)の設計、作成、テスト、デバッグおよびデプロイを可能にする多彩なグラフィックスおよびメディア・パッケージのセットです。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 開始
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始
+== 開始
 
 * link:http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm[+JavaFXの開始+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
-*JavaFX 8 Developer Preview*
+=== JavaFX 8 Developer Preview
 
 * link:http://docs.oracle.com/javafx/8/3d_graphics/jfxpub-3d_graphics.htm[+JavaFX 3Dグラフィックスの開始+]
 * link:http://docs.oracle.com/javafx/8/embed_swing/jfxpub-embed_swing.htm[+JavaFXアプリケーションへのSwingコンテンツの埋込み+]
 * link:http://docs.oracle.com/javafx/8/webview/jfxpub-webview.htm[+JavaFXアプリケーションへのHTMLコンテンツの追加+]
 
-*JavaFXの開始*
+=== JavaFXの開始
 
 * link:http://docs.oracle.com/javafx/2/overview/jfxpub-overview.htm[+JavaFXとは+]
 * link:http://docs.oracle.com/javafx/2/deployment/whatsnew_deployment.htm[+JavaFXアプリケーションのデプロイ: 概要+]
 
-*JavaFX Scene Builder *
+=== JavaFX Scene Builder
 
 * link:http://docs.oracle.com/javafx/scenebuilder/1/overview/jsbpub-overview.htm[+JavaFX Scene Builderの概要+]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/get_started/jsbpub-get_started.htm[+JavaFX Scene Builder 1.1の概要+]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/user_guide/jsbpub-user_guide.htm[+JavaFX Scene Builderユーザーズ・ガイド+]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/use_java_ides/sb-with-nb.htm#CIHDHEFE[+Scene BuilderとNetBeans IDEを組み合せた使用+]
 
-*JavaFXアプリケーション・ロジック*
+=== JavaFXアプリケーション・ロジック
 
 * link:http://docs.oracle.com/javafx/2/architecture/jfxpub-architecture.htm[+JavaFXアーキテクチャ+]
 * link:http://docs.oracle.com/javafx/2/scenegraph/jfxpub-scenegraph.htm[+JavaFX Sceneグラフの操作+]
@@ -94,7 +71,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://docs.oracle.com/javafx/2/threads/jfxpub-threads.htm[+JavaFXでの同時実行+]
 * link:http://docs.oracle.com/javafx/2/best_practices/jfxpub-best_practices.htm[+JavaFXベスト・プラクティスの実装+]
 
-*JavaFXユーザー・インタフェース *
+=== JavaFXユーザー・インタフェース
 
 * link:http://docs.oracle.com/javafx/2/layout/jfxpub-layout.htm[+JavaFXでのレイアウトの使用 +]
 * link:http://docs.oracle.com/javafx/2/text/jfxpub-text.htm[+JavaFXでのテキストおよびテキスト・エフェクトの使用+]
@@ -108,34 +85,23 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://docs.oracle.com/javafx/2/canvas/jfxpub-canvas.htm[+キャンバスでの作業+]
 * link:http://docs.oracle.com/javafx/2/image_ops/jfxpub-image_ops.htm[+イメージOps APIの使用+]
 
-*JavaFXエフェクト、アニメーションおよびメディア*
+=== JavaFXエフェクト、アニメーションおよびメディア
 
 * link:http://docs.oracle.com/javafx/2/visual_effects/jfxpub-visual_effects.htm[+JavaFXでのビジュアル・エフェクトの作成+]
 * link:http://docs.oracle.com/javafx/2/transformations/jfxpub-transformations.htm[+JavaFXでの変換の適用+]
 * link:http://docs.oracle.com/javafx/2/animations/jfxpub-animations.htm[+JavaFXでの移行およびタイムライン・アニメーションの作成+]
 * link:http://docs.oracle.com/javafx/2/media/jfxpub-media.htm[+JavaFXアプリケーションへのメディア・アセットの組込み +]
 
-*JavaFXデプロイメントなど*
+=== JavaFXデプロイメントなど
 
 * link:http://docs.oracle.com/javafx/2/deployment/jfxpub-deployment.htm[+JavaFXアプリケーションのデプロイ +]
 * link:http://docs.oracle.com/javafx/2/swing/jfxpub-swing.htm[+Swing開発者向けのJavaFX+]
 * link:http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm[+SWTとのJavaFX相互運用性+]
 * link:http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm[+JavaFXでのドックレットの使用+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
-*Swingの開始*
+=== Swingの開始
 
 * link:../docs/java/native_pkg.html[+NetBeans IDEでのネイティブ・パッケージング+]
 * link:../docs/java/gui-functionality.html[+Java GUIビルドの概要+]
@@ -148,69 +114,30 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/gui-gaps.html[+NetBeans GUIビルダーでのギャップ編集機能のサポート+]
 * link:../docs/java/debug-visual.html[+ビジュアル・デバッガの使用+]
 
-*Java PersistenceおよびBeansのバインディング*
+=== Java PersistenceおよびBeansのバインディング
 
 * link:../docs/java/gui-binding.html[+JavaアプリケーションでのBeansとデータのバインディング+]
 * link:../docs/java/hibernate-java-se.html[+Java SwingアプリケーションでのHibernateの使用+]
 * link:../docs/java/maven-hib-java-se.html[+Hibernateを使用したMaven Swingアプリケーションの作成+]
 
-*国際化*
+=== 国際化
 
 * link:../docs/java/gui-automatic-i18n.html[+GUIフォームの国際化+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * link:http://www.youtube.com/watch?v=ddJpDi5SWFc[+JavaFXグラフィックスのヒントとテクニック集+]
 * link:https://blogs.oracle.com/geertjan/entry/thanks_javafx_wysiwyg_html_editor[+JavaFXによるNetBeans IDE用WYSIWYG HTMLエディタ+]
 * link:../docs/java/nb_fx_screencast.html[+デモ: NetBeans IDEでのJavaFXサポート+]
 * link:../docs/java/gui-builder-screencast.html[+NetBeans IDEでのSwing GUIのデザイン+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans-part3[+NetBeansプラットフォーム・ウィザードへのJavaFXの統合方法(パート1)+](_Sean Phillips著_)
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans[+NetBeansプラットフォーム・メニュー・バーへのJavaFXの統合方法+](_Geertjan Wielenga著_)
 * link:http://wiki.netbeans.org/UsingNetbeansMatisseAndEclipseInParallel[+Netbeans MatisseとEclipseの並行使用+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
 * link:http://download.oracle.com/javafx/[+JavaFXドキュメント+]
 * link:http://wiki.netbeans.org/JavaFX[+JavaFXサポートに関するNetBeans Wikiページ+]
@@ -221,4 +148,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * _NetBeans IDEによるアプリケーションの開発_のlink:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+Java GUIの実装+]
 * _NetBeans IDEによるアプリケーションの開発_のlink:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245[+Java Persistenceを使用した開発+]
 * _NetBeans IDEによるアプリケーションの開発_のlink:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188[+ソース・コードの実装+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/matisse_pt_BR.asciidoc
index 47b449e..a24f9ad 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse_pt_BR.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Trilha de Aprendizado das Aplicações de GUI do Java
 
 
-==== O que são Aplicações de GUI do Java?
+== O que são Aplicações de GUI do Java?
 
 Uma aplicação de GUI do Java usa o componente GUI de componentes Java padrão, o Swing e é implantada na desktop.
 
@@ -38,71 +38,37 @@ O Swing GUI Builder no NetBeans IDE simplifica o processo de desenvolvimento da
 
 link:http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn[+JavaFX+] é um conjunto avançado de gráficos e pacotes de mídia que permite aos desenvolvedores projetar, criar, testar, depurar e implantar aplicações clientes ricas (RIAs) que se comportam de forma consistente em várias plataformas.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Introdução
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Introdução - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Introdução
+== Introdução
 
 * link:http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm[+Conceitos Básicos sobre JavaFX+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Visualização do Desenvolvedor JavaFX 8*
+=== Visualização do Desenvolvedor JavaFX 8
 
 * link:http://docs.oracle.com/javafx/8/3d_graphics/jfxpub-3d_graphics.htm[+Conceitos Básicos sobre Gráficos 3D JavaFX+]
 
-*Conceitos Básicos sobre JavaFX*
+=== Conceitos Básicos sobre JavaFX
 
 
-*JavaFX Scene Builder *
+=== JavaFX Scene Builder 
 
 
-*Lógica da Aplicação JavaFX *
+=== Lógica da Aplicação JavaFX 
 
 
-*Interface do Usuário JavaFX *
+=== Interface do Usuário JavaFX 
 
 
-*Efeitos, Animação e Mídia JavaFX*
+=== Efeitos, Animação e Mídia JavaFX
 
 
-*Implantação JavaFX e Mais*
+=== Implantação JavaFX e Mais
 
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Conceitos Básicos sobre Swing*
+=== Conceitos Básicos sobre Swing
 
 * link:../docs/java/native_pkg.html[+Encapsulamento Nativo no NetBeans IDE+]
 * link:../docs/java/gui-functionality.html[+Introdução à Construção de GUIs do Java+]
@@ -115,69 +81,30 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/gui-gaps.html[+Suporte de Edição da Lacuna no NetBeans GUI Builder+]
 * link:../docs/java/debug-visual.html[+Usando o Depurador Visual+]
 
-*Java Persistence e Vinculação de Beans*
+=== Java Persistence e Vinculação de Beans
 
 * link:../docs/java/gui-binding.html[+Vinculação de Beans e Dados em uma Aplicação Java+]
 * link:../docs/java/hibernate-java-se.html[+Usando Hibernate em uma Aplicação Java Swing+]
 * link:../docs/java/maven-hib-java-se.html[+Criando uma Aplicação Maven Swing Usando Hibernate+]
 
-*Internacionalização*
+=== Internacionalização
 
 * link:../docs/java/gui-automatic-i18n.html[+Internacionalizando um Form GUI+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:http://www.youtube.com/watch?v=ddJpDi5SWFc[+Dicas e Truques de Gráficos JavaFX+]
 * link:https://blogs.oracle.com/geertjan/entry/thanks_javafx_wysiwyg_html_editor[+Thanks JavaFX: WYSIWYG HTML Editor para NetBeans IDE +]
 * link:../docs/java/nb_fx_screencast.html[+Demonstração: Suporte ao JavaFX no NetBeans IDE+]
 * link:../docs/java/gui-builder-screencast.html[+Projetando uma GUI Swing no NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans-part3[+Como Integrar JavaFX em um Assistente de Plataforma do NetBeans (Parte 1)+] (_por Sean Phillips_)
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans[+Como Integrar JavaFX em uma barra de Menu da Plataforma do NetBeans+] (_por Geertjan Wielenga_)
 * link:http://wiki.netbeans.org/UsingNetbeansMatisseAndEclipseInParallel[+Utilizando Netbeans Matisse e Eclipse em Paralelo+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
 * link:http://download.oracle.com/javafx/[+Documentação do JavaFX+]
 * link:http://wiki.netbeans.org/JavaFX[+Página wiki do NetBeans sobre suporte a JavaFX+]
@@ -188,4 +115,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+Implementando GUIs de Java+] em _Desenvolvendo Aplicações com o NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245[+Desenvolvendo Java Persistence+] em _Desenvolvendo Aplicações com o NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188[+Internacionalizando Código-fonte+] em _Desenvolvendo Aplicações com o NetBeans IDE_
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/matisse_ru.asciidoc
index a3a8973..bad8a60 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse_ru.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Учебная карта по приложениям с графическим интерфейсом на языке Java
 
 
-==== Что такое приложения с графическим интерфейсом на языке Java?
+== Что такое приложения с графическим интерфейсом на языке Java?
 
 В приложении с графическим интерфейсом на языке Java используются стандартные компоненты Java из набора компонентов для построения графических интерфейсов, Swing, и оно развертывается в рабочей среде.
 
@@ -38,34 +38,11 @@
 
 link:http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn[+JavaFX+] предоставляет обширный набор графических пакетов и медиапакетов, который позволяет разработчикам проектировать, создавать, тестировать, выполнять отладку и развертывание толстых клиентов (RIA), стабильно функционирующих на различных платформах.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Начало работы
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы
+== Начало работы
 
 * link:http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm[+Общие сведения о JavaFX+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
 *Предварительный обзор JavaFX 8 для разработчиков*
 
@@ -121,19 +98,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://docs.oracle.com/javafx/2/swing/jfxpub-swing.htm[+JavaFX для разработчиков Swing+]
 * link:http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm[+Взаимосовместимость JavaFX и SWT+]
 * link:http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm[+Использование доклетов в JavaFX+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
 *Общие сведения о Swing*
 
@@ -157,60 +123,21 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 *Интернационализация*
 
 * link:../docs/java/gui-automatic-i18n.html[+Интернационализация формы графического интерфейса +]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * link:http://www.youtube.com/watch?v=ddJpDi5SWFc[+Советы и рекомендации по работе с графикой в JavaFX+]
 * link:https://blogs.oracle.com/geertjan/entry/thanks_javafx_wysiwyg_html_editor[+Благодарим JavaFX: HTML-редактор WYSIWYG для IDE NetBeans+]
 * link:../docs/java/nb_fx_screencast.html[+Демонстрация: поддержка JavaFX в IDE NetBeans+]
 * link:../docs/java/gui-builder-screencast.html[+Разработка Swing GUI в IDE NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans-part3[+Интеграция JavaFX в мастер платформ NetBeans (Часть 1)+] (_Автор: Шон Филипс (Sean Phillips)_)
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans[+Интеграция JavaFX в строку меню платформ в NetBeans+] (_Автор: Гиртжан Виленга (Geertjan Wielenga)_)
 * link:http://wiki.netbeans.org/UsingNetbeansMatisseAndEclipseInParallel[+Параллельное использование Matisse в NetBeans и Eclipse+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
 * link:http://download.oracle.com/javafx/[+Документация JavaFX+]
 * link:http://wiki.netbeans.org/JavaFX[+Страница wiki NetBeans по поддержке JavaFX+]
@@ -221,4 +148,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+Реализация графических интерфейсов Java+] в документе _Разработка приложений в IDE NetBeans_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245[+Разработка с использованием Java Persistence+] в документе _Разработка приложений в IDE NetBeans_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188[+Интернационализация исходного кода+] в документе _Разработка приложений в IDE NetBeans_
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/matisse_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/matisse_zh_CN.asciidoc
index 68d1957..058aba9 100644
--- a/netbeans.apache.org/src/content/kb/docs/matisse_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/matisse_zh_CN.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Java GUI 应用程序学习资源
 
 
-==== 什么是 Java GUI 应用程序？
+== 什么是 Java GUI 应用程序？
 
 Java GUI 应用程序使用标准的 Java 组件 GUI 组件集 Swing，并且会部署到桌面上。
 
@@ -38,54 +38,31 @@ NetBeans IDE 中的 Swing GUI 构建器简化了 GUI 开发过程，并且使您
 
 link:http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn[+JavaFX+] 是一组丰富的图形和媒体包，使开发人员能够设计、创建、测试、调试和部署在多个平台之间运行一致的丰富客户端应用程序 (RIA)。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南
+== 入门指南
 
 * link:http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm[+JavaFX 入门指南+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
-*JavaFX 8 开发者预览*
+=== JavaFX 8 开发者预览
 
 * link:http://docs.oracle.com/javafx/8/3d_graphics/jfxpub-3d_graphics.htm[+JavaFX 3D 图形入门指南+]
 * link:http://docs.oracle.com/javafx/8/embed_swing/jfxpub-embed_swing.htm[+在 JavaFX 应用程序中嵌入 Swing 内容+]
 * link:http://docs.oracle.com/javafx/8/webview/jfxpub-webview.htm[+将 HTML 内容添加到 JavaFX 应用程序+]
 
-*JavaFX 入门指南*
+=== JavaFX 入门指南
 
 * link:http://docs.oracle.com/javafx/2/overview/jfxpub-overview.htm[+什么是 JavaFX？+]
 * link:http://docs.oracle.com/javafx/2/deployment/whatsnew_deployment.htm[+部署 JavaFX 应用程序：入门指南+]
 
-*JavaFX 场景构建器 *
+=== JavaFX 场景构建器
 
 * link:http://docs.oracle.com/javafx/scenebuilder/1/overview/jsbpub-overview.htm[+JavaFX 场景构建器概述+]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/get_started/jsbpub-get_started.htm[+JavaFX 场景构建器 1.1 入门指南 +]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/user_guide/jsbpub-user_guide.htm[+JavaFX 场景构建器用户指南+]
 * link:http://docs.oracle.com/javafx/scenebuilder/1/use_java_ides/sb-with-nb.htm#CIHDHEFE[+将场景构建器与 NetBeans IDE 一起使用+]
 
-*JavaFX 应用程序逻辑 *
+=== JavaFX 应用程序逻辑
 
 * link:http://docs.oracle.com/javafx/2/architecture/jfxpub-architecture.htm[+JavaFX 体系结构+]
 * link:http://docs.oracle.com/javafx/2/scenegraph/jfxpub-scenegraph.htm[+使用 JavaFX 场景图形+]
@@ -94,7 +71,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://docs.oracle.com/javafx/2/threads/jfxpub-threads.htm[+JavaFX 并发+]
 * link:http://docs.oracle.com/javafx/2/best_practices/jfxpub-best_practices.htm[+实现 JavaFX 最佳实践+]
 
-*JavaFX 用户界面 *
+=== JavaFX 用户界面 
 
 * link:http://docs.oracle.com/javafx/2/layout/jfxpub-layout.htm[+在 JavaFX 中使用布局 +]
 * link:http://docs.oracle.com/javafx/2/text/jfxpub-text.htm[+在 JavaFX 中使用文本和文本效果+]
@@ -108,34 +85,23 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://docs.oracle.com/javafx/2/canvas/jfxpub-canvas.htm[+使用画布+]
 * link:http://docs.oracle.com/javafx/2/image_ops/jfxpub-image_ops.htm[+使用图像操作 API+]
 
-*JavaFX 效果、动画和媒体*
+=== JavaFX 效果、动画和媒体
 
 * link:http://docs.oracle.com/javafx/2/visual_effects/jfxpub-visual_effects.htm[+在 JavaFX 中创建可视效果+]
 * link:http://docs.oracle.com/javafx/2/transformations/jfxpub-transformations.htm[+在 JavaFX 中应用转换+]
 * link:http://docs.oracle.com/javafx/2/animations/jfxpub-animations.htm[+在 JavaFX 中创建转换和时间线动画 +]
 * link:http://docs.oracle.com/javafx/2/media/jfxpub-media.htm[+将媒体资产并入 JavaFX 应用程序 +]
 
-*JavaFX 部署及更多内容*
+=== JavaFX 部署及更多内容
 
 * link:http://docs.oracle.com/javafx/2/deployment/jfxpub-deployment.htm[+部署 JavaFX 应用程序 +]
 * link:http://docs.oracle.com/javafx/2/swing/jfxpub-swing.htm[+面向 Swing 开发者的 JavaFX+]
 * link:http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm[+JavaFX 与 SWT 的互操作性+]
 * link:http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm[+将 Doclet 与 JavaFX 一起使用+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
-*Swing 入门指南*
+=== Swing 入门指南
 
 * link:../docs/java/native_pkg.html[+NetBeans IDE 中的本机打包+]
 * link:../docs/java/gui-functionality.html[+构建 Java GUI 应用程序简介+]
@@ -148,69 +114,30 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/java/gui-gaps.html[+NetBeans GUI 构建器中的间距编辑支持+]
 * link:../docs/java/debug-visual.html[+使用可视调试器+]
 
-*Java 持久性和 Bean 绑定*
+=== Java 持久性和 Bean 绑定
 
 * link:../docs/java/gui-binding.html[+在 Java 应用程序中绑定 Bean 和数据+]
 * link:../docs/java/hibernate-java-se.html[+在 Java Swing 应用程序中使用 Hibernate+]
 * link:../docs/java/maven-hib-java-se.html[+使用 Hibernate 创建 Maven Swing 应用程序+]
 
-*国际化*
+=== 国际化
 
 * link:../docs/java/gui-automatic-i18n.html[+国际化 GUI 窗体+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * link:http://www.youtube.com/watch?v=ddJpDi5SWFc[+JavaFX 图形提示和技巧+]
 * link:https://blogs.oracle.com/geertjan/entry/thanks_javafx_wysiwyg_html_editor[+借助 JavaFX：NetBeans IDE 的 WYSIWYG HTML 编辑器+]
 * link:../docs/java/nb_fx_screencast.html[+演示：NetBeans IDE 中的 JavaFX 支持+]
 * link:../docs/java/gui-builder-screencast.html[+在 NetBeans IDE 中设计 Swing GUI+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans-part3[+如何将 JavaFX 集成到 NetBeans 平台向导（第 1 部分）+]（_作者：Sean Phillips_）
 * link:http://netbeans.dzone.com/articles/how-integrate-javafx-netbeans[+如何将 JavaFX 集成到 NetBeans 平台菜单栏+]（_作者：Geertjan Wielenga_）
 * link:http://wiki.netbeans.org/UsingNetbeansMatisseAndEclipseInParallel[+并行使用 Netbeans Matisse 和 Eclipse+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
 * link:http://download.oracle.com/javafx/[+JavaFX 文档+]
 * link:http://wiki.netbeans.org/JavaFX[+关于 JavaFX 支持的 NetBeans wiki 页+]
@@ -221,4 +148,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * _使用 NetBeans IDE 开发应用程序_中的link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG920[+实现 Java GUI+]
 * _使用 NetBeans IDE 开发应用程序_中的link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245[+使用 Java 持久性进行开发+]
 * _使用 NetBeans IDE 开发应用程序_中的link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188[+国际化源代码+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility.asciidoc b/netbeans.apache.org/src/content/kb/docs/mobility.asciidoc
index 42e175c..b93f429 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility.asciidoc
@@ -30,112 +30,46 @@
 :keywords: Apache NetBeans, Tutorials, Java ME Embedded and Java Card Application Technology Trail
 
 
-==== What is a Mobile Application? 
+== What is a Mobile Application? 
 
 Most mobile applications use the Java Micro Edition (Java ME) platform, which was developed for small devices like mobile phones, but is now used on a wide variety of devices. Java ME uses scaled down subsets of Java SE components, virtual machines and APIs. It also defines APIs that are specifically targeted at consumer mobile and embedded devices. NetBeans IDE supports link:http://www.oracle.com/us/technologies/java/embedded/micro-edition/overview/index.html[+Oracle Java ME Embedded+]  [...]
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started
+== Getting Started
 
 * link:../docs/javame/imp-ng.html[+Creating, Debugging, and Profiling a Mobile Embedded Application+]
 * link:../docs/javame/java-card.html[+NetBeans Java Card Development Quick Start Guide+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Developing Java Card Applications
-*
+=== Developing Java Card Applications
 
 * link:../docs/javame/javacard.html[+Java Card Quick Start Article+]
 * link:http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html[+Deploying Servlets on Smart Cards: Portable Web Servers with Java Card 3.0+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/javame/nb_me8_screencast.html[+Demo: NetBeans IDE Support for Java ME 8+]
 * link:../docs/javame/nb_me_plugins_screencast.html[+Demo: Installing and Using Java ME SDK 8.0 Plugins in NetBeans IDE+]
 * YouTube: link:http://youtu.be/_1PPSt2AwpM[+ Introduction into Java Micro Edition (ME) 8+] (_by Terrence Bar_)
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://plugins.netbeans.org/PluginPortal/faces/PluginDetailPage.jsp?pluginid=11194[+Installing the Blackberry RIM Plugin for NetBeans IDE+]
 * link:http://nbandroid.org/wiki/index.php/Installation[+How to Install the Android Plugin into NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
 * link:http://wiki.netbeans.org/JavaMESDKSupport[+NetBeans wiki page on Java ME SDK Support+]
 * link:http://docs.oracle.com/javame/config/cldc/rel/8/rpi/html/getstart_rpi/debugging.htm#sthref31[+ Using NetBeans with the Raspberry Pi Board+] in _Oracle® Java ME Embedded Getting Started Guide for the Reference Platform (Raspberry Pi) Release 8 EA 2_
 * link:http://docs.oracle.com/javame/config/cldc/rel/3.3/win/gs/html/getstart_win32/setup_nbenv.htm[+ Using the Oracle Java ME SDK Software with NetBeans+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+ Developing Java ME Applications+] in _Developing Applications with NetBeans IDE_
 
-*NetBeans Mobility Community Resources 
-*
+=== NetBeans Mobility Community Resources
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Java_ME.2FMobility[+NetBeans Mobility FAQs+]
 * link:http://forums.netbeans.org/javame-users.html[+NetBeans Java ME User Forum+]
 
-*Java ME Related Sites
-*
+=== Java ME Related Sites
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html[+Java ME Embedded Documentation+]
 * link:http://www.oracle.com/technetwork/java/javame/index.html[+Oracle Technology Network - Java ME Landing Page+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/mobility_ca.asciidoc
index efb136a..9a5bbac 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility_ca.asciidoc
@@ -29,8 +29,7 @@
 :description: Camí d'aprenentatge per a tecnologies d'aplicacions Java ME i JavaFX per a dispositius mòbils - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge per a tecnologies d'aplicacions Java ME i JavaFX per a dispositius mòbils
 
-
-==== [[Què és una aplicació mòbil?]] 
+== [[Què és una aplicació mòbil?]] 
 
 La majoria de les aplicacions mòbils utilitzen la plataforma Java ME (Java Micro Edition), la qual va ser desenvolupada per a petits dispositius com els telèfons i els aparells pel damunt del televisor (STP, de l'anglès set-top boxes). Java ME utilitza un subconjunt inferior, escalat dels components de Java SE, màquines virtuals i APIs. Aquest també defineix APIs que són especifiques segons el fabricant dels dispositius mòbils i empotrats. NetBeans Java ME suporta les dos bases de config [...]
 
@@ -39,38 +38,14 @@ La majoria de les aplicacions mòbils utilitzen la plataforma Java ME (Java Micr
 
 Addicionalment, també podeu desenvolupar aplicacions per a la nova plataforma JavaFX per a proporcionar experiències d'usuari similars a les de l'escriptori, la web, els telèfons, els televisors, i altres dispositius. Podeu aprendre quant al desenvolupament d'aplicacions JavaFX en l'IDE NetBeans al link:http://wiki.netbeans.org/JavaFX[+Centre de desenvolupadors JavaFX+] i donant un cop d'ull als següent exemples JavaFX.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Com començar
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Com començar - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Com començar
+== Com començar
 
 * link:../docs/javame/quickstart.html[+Guia d'inici ràpid pel desenvolupament MIDP en Java ME a NetBeans+]
 * link:../docs/javame/cdc-quickstart.html[+Guia d'inici ràpid pel desenvolupament de CDC en Java ME a NetBeans+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Guies d'aprenentatge i Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Guies d'aprenentatge i Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Guies d'aprenentatge i Articles
+== Guies d'aprenentatge i Articles
 
-*Utilitzant components personalitzats pel dissenyador visual mòbil
-*
+=== Utilitzant components personalitzats pel dissenyador visual mòbil
 
 * link:../71/javame/svgtouch.html[+Creant una interfície d'usuari SVG tàctil per a dispositius Java ME+]
 * link:../71/javame/filebrowser.html[+Creant un navegador de fitxers en un dispositiu mòbil+]
@@ -82,127 +57,67 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../71/javame/waitscreen.html[+Utilitzant pantalles d'espera en aplicacions Java ME+]
 * link:http://wiki.netbeans.org/VisualMobileDesignerPalatteReference[+Referència: Guia de la paleta de disseny visual mòbil+]
 
-*Afegint JavaFX a aplicacions Mòbil
-*
+=== Afegint JavaFX a aplicacions Mòbil
 
 * link:http://javafx.com/docs/articles/midlet/[+Ressalta el teu MIDlet amb la tecnologia JavaFX+]
 * link:http://javafx.com/docs/techtips/ria_buttons/[+Ressaltant els botons d'opció MIDP+]
 
-*Desenvolupant aplicacions Java ME/CDC
-*
+=== Desenvolupant aplicacions Java ME/CDC
 
 * link:../docs/javame/cdcemulator-setup.html[+Guia de configuració de la plataforma d'emulació CDC+]
 * link:http://java.sun.com/developer/technicalArticles/javame/bluray/[+Desenvolupament d'aplicacions amb discs Blu-ray amb Java ME+]
 
-*Creant jocs Java ME
-*
+=== Creant jocs Java ME
 
 * link:http://wiki.netbeans.org/CreatingJavaMEGamesWithGameBuilder[+Creant jocs mòbils amb el constructor de jocs de Java ME+]
-* link:http://developers.sun.com/events/techdays/downloads/pdfs/6400_MobileGame_labdoc.pdf
-[+Creeu el vostre joc mòbil: JavaOne 2008 Hands On Lab - 6400+] (descarregar PDF)
+* link:http://developers.sun.com/events/techdays/downloads/pdfs/6400_MobileGame_labdoc.pdf[+Creeu el vostre joc mòbil: JavaOne 2008 Hands On Lab - 6400+] (descarregar PDF)
 * link:http://wiki.netbeans.org/DarkstarSupport[+Guia de suport del projecte Darkstar per a jocs en línia i connectats al desenvolupament d'aplicacions.+]
 
-*Dissenyant aplicacions per a diversos dispositius
-*
+=== Dissenyant aplicacions per a diversos dispositius
 
 * link:../articles/mobiledistillery-celsius-porting.html[+Article: Gestionant la fragmentació del dispositiu amb la Suite de portabilitat automàtica Celsius+]
 
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/javame/gamebuilder-screencast.html[+Creant jocs mòbils utilitzant el constructor de jocs de l'IDE NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
+== Aplicacions d'exemple
 
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Aplicacions d'exemple
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Aplicacions d'exemple - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Aplicacions d'exemple
-
-*Java ME*
+=== Java ME
 
 * link:../samples/mobile-game-builder.html[+Constructor de jocs mòbils+]
 * link:../samples/mobile-svg.html[+Llistat de contactes SVG+]
 * link:http://developers.sun.com/events/techdays/downloads/labs/6400_mobilegame.zip[+Projecte de joc mòbil des de JavaOne 2008 Hands On Lab - 6400+] (zip del projecte)
 * link:http://blogs.oracle.com/mobility_techtips/entry/mixing_midi_tone_and_sampled[+Barrejant MIDI, Tons, i àudio mostrejat utilitzant MMAPI+]
 
-*JavaFX*
+=== JavaFX
 
 * link:http://javafx.com/samples/LocalSearch/[+Cerca d'un restaurant basada amb la localització+]
 * link:http://www.javafx.com/samples/Carousel/[+Anell d'imatges+]
 * link:http://www.javafx.com/samples/SpringAnimation/[+Animacions elàstiques i rebotants+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Documents aportats per la comunitat
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documents aportats per la comunitat - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documents aportats per la comunitat
+== Documents aportats per la comunitat
 
 * link:http://kenai.com/projects/nbandroid/pages/Install[+Com instal·lar el complement Android a NetBeans+]
 * link:http://nbandroid.org/wiki/index.php/Installation[+Introducció al desenvolupament Android amb NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Altres recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Altres recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Altres recursos
+== Altres recursos
 
-*Recursos de la comunitat mòbil de NetBeans 
-*
+=== Recursos de la comunitat mòbil de NetBeans 
 
 * link:http://wiki.netbeans.org/wiki/view/NetBeansUserFAQ#section-NetBeansUserFAQ-JavaMEMobility[+PMF de la mobilitat a NetBeans+]
 * link:http://forums.netbeans.org/javame-users.html[+Fòrum d'usuaris Java ME de NetBeans+] pregunteu i obtingueu respostes quant a al desenvolupament d'aplicacions mòbils utilitzant NetBeans.
 * link:http://wiki.netbeans.org/MobilityDesignerHome[+Comunitat de desenvolupadors de dispositius mòbils a NetBeans+] per als desenvolupadors que vulguin contribuir amb codi font de l'IDE.
 
-*Blogs de desenvolupadors de Java ME
-*
+=== Blogs de desenvolupadors de Java ME
 
 * link:http://blogs.oracle.com/kharezlak/[+Blog de mobilitat NetBeans dins del blog de Karol Harezlak+]
 * link:http://weblog.cenriqueortiz.com/java-me-midp-articles-tech-tips-source-code/[+Blog de Java mòbil de C. Enrique Ortiz+]
 * link:http://blogs.oracle.com/hinkmond/category/Java+ME+and+J2ME[+Blog Java ME de Hinkmond Wong+]
 * link:http://weblogs.java.net/blog/terrencebarr/[+Blog d'empotrats i de mòbils de Terrence Barr+]
 
-*Llocs relacionats amb Java ME
-*
+=== Llocs relacionats amb Java ME
 
 * link:http://community.java.net/mobileandembedded/[+Comunitat d'empotrats i mòbils de Java ME+]
 * link:http://java.sun.com/javame/index.jsp[+Xarca de desenvolupadors de Sun+] - Pàgina web principal de Java ME
 * link:http://developers.sun.com/techtopics/mobility/[+Centre de tecnologia mòbil de la xarxa de desenvolupadors de Sun +] - Informació quant a la creació, testeig i certificació d'aplicacions mòbils.
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/mobility_ja.asciidoc
index 61699d6..bcc781d 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility_ja.asciidoc
@@ -30,113 +30,47 @@
 :keywords: Apache NetBeans, Tutorials, Java ME EmbeddedおよびJava Cardアプリケーション・テクノロジの学習
 
 
-==== モバイル・アプリケーションとは 
+== モバイル・アプリケーションとは 
 
 モバイル・アプリケーションのほとんどはJava Micro Edition (Java ME)プラットフォームを使用します。Java MEプラットフォームは携帯電話などの小型デバイス用に開発されましたが、現在では様々なデバイスで使用されています。Java MEでは、縮小されたJava SEコンポーネントのサブセット、仮想マシン、およびAPIを使用します。また、消費者向けのモバイル機器や組込みデバイスに特化したAPIを定義します。NetBeans IDEでは、link:http://www.oracle.com/us/technologies/java/embedded/micro-edition/overview/index.html[+Oracle Java ME Embedded+]およびlink:http://www.oracle.com/technetwork/java/javame/javacard/overview/getstarted/index.html[+Java Cardプラットフォーム+]がサポートされます。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 開始
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始
+== 開始
 
 * link:../docs/javame/imp-ng.html[+モバイル埋込みアプリケーションの作成、デバッグおよびプロファイリング+]
 * link:../docs/javame/java-card.html[+Java Card開発のクイック・スタート・ガイド+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
-*Java Cardアプリケーションの開発
-*
+*Java Cardアプリケーションの開発*
 
 * link:../docs/javame/javacard.html[+Java Cardクイック・スタートの記事+]
 * link:http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html[+スマート・カード上でのサーブレットのデプロイ: ポータブルWebサーバーとJava Card 3.0+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * link:../docs/javame/nb_me8_screencast.html[+デモ: Java ME 8に対するNetBeans IDEのサポート+]
 * YouTube: link:http://youtu.be/_1PPSt2AwpM[+Java Micro Edition (ME) 8の概要+](_Terrence Bar作成_)
 * link:../docs/javame/nb_mesdk_screencast.html[+デモ: Windowsでのモバイル開発用のNetBeans IDEの設定+]
 * link:../docs/javame/imp-ng-screencast.html[+デモ: NetBeans IDEでのIMP-NGプロファイルのサポート+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://plugins.netbeans.org/PluginPortal/faces/PluginDetailPage.jsp?pluginid=11194[+NetBeans IDE用Blackberry RIMプラグインのインストール+]
 * link:http://nbandroid.org/wiki/index.php/Installation[+NetBeansへのアンドロイド・プラグインのインストール方法+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
 * link:http://wiki.netbeans.org/JavaMESDKSupport[+Java ME SDKサポートに関するNetBeans Wikiページ+]
 * _Oracle® Java ME Embeddedリファレンス・プラットフォーム(Raspberry Pi)スタート・ガイド リリース8 EA 2_のlink:http://docs.oracle.com/javame/config/cldc/rel/8/rpi/html/getstart_rpi/debugging.htm#sthref31[+Raspberry Pi基板でのNetBeansの使用+]に関する項
 * link:http://docs.oracle.com/javame/config/cldc/rel/3.3/win/gs/html/getstart_win32/setup_nbenv.htm[+Oracle Java ME SDKソフトウェアとNetBeansを組み合せた使用+]
 * _NetBeans IDEによるアプリケーションの開発_のlink:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+Java MEアプリケーションの開発+]
 
-*NetBeans Mobilityコミュニティのリソース
-*
+*NetBeans Mobilityコミュニティのリソース*
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Java_ME.2FMobility[+NetBeans MobilityのFAQ+]
 * link:http://forums.netbeans.org/javame-users.html[+NetBeans Java MEユーザー・フォーラム User Forum+]
 
-*Java ME関連サイト
-*
+*Java ME関連サイト*
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html[+Java ME Embeddedドキュメント+]
 * link:http://www.oracle.com/technetwork/java/javame/index.html[+Oracle Technology Network - Java MEランディング・ページ+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/mobility_pt_BR.asciidoc
index 43c768c..bd09805 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility_pt_BR.asciidoc
@@ -29,114 +29,47 @@
 :description: Trilha de Tecnologia de Aplicações Java ME Embedded e Java Card - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Trilha de Tecnologia de Aplicações Java ME Embedded e Java Card
 
-
-==== O que é uma Aplicação Móvel? 
+== O que é uma Aplicação Móvel? 
 
 A maioria das aplicações móveis utiliza a plataforma Java Micro Edition (Java ME), que foi desenvolvida para pequenos dispositivos, como celulares, mas agora é utilizada em uma ampla variedade de dispositivos. O Java ME usa subconjuntos escalonados de componentes Java SE, máquinas virtuais e APIs. Ele também define APIs que são especificamente orientadas aos dispositivos móveis de consumidores e incorporados. O NetBeans IDE suporta link:http://www.oracle.com/us/technologies/java/embedded [...]
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Introdução
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Introdução - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Introdução
+== Introdução
 
 * link:../docs/javame/imp-ng.html[+Criando, Depurando e Criando Perfil em uma Aplicação Incorporada Móvel+]
 * link:../docs/javame/java-card.html[+Guia de Início Rápido do Desenvolvimento de Java Card no NetBeans+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Desenvolvendo Aplicações Java Card
-*
+=== Desenvolvendo Aplicações Java Card
 
 * link:../docs/javame/javacard.html[+Artigo de Início Rápido do Java Card+]
 * link:http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html[+Implantando Servlets em Cartões Inteligentes: Servidores da Web Portáteis com Java Card 3.0+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/javame/nb_me8_screencast.html[+Demonstração: Suporte do NetBeans IDE para Java ME 8+]
 * YouTube: link:http://youtu.be/_1PPSt2AwpM[+ Introduction into Java Micro Edition (ME) 8 (Introdução a Java Micro Edition (ME) 8)+] (_por Terrence Bar_)
 * link:../docs/javame/nb_mesdk_screencast.html[+Demonstração: Configurando o NetBeans IDE para Desenvolvimento Móvel no Windows+]
 * link:../docs/javame/imp-ng-screencast.html[+Demonstração: Suporte para Perfil IMP-NG no NetBeans IDE+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * link:http://plugins.netbeans.org/PluginPortal/faces/PluginDetailPage.jsp?pluginid=11194[+Instalando o Plug-in Blackberry RIM para o NetBeans IDE+]
 * link:http://nbandroid.org/wiki/index.php/Installation[+Como Instalar o Plug-in do Android no NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
 * link:http://wiki.netbeans.org/JavaMESDKSupport[+Página Wiki do NetBeans no Suporte a Java ME SDK+]
 * link:http://docs.oracle.com/javame/config/cldc/rel/8/rpi/html/getstart_rpi/debugging.htm#sthref31[+ Usando o NetBeans com o Raspberry Pi Board+] no _Guia de Conceitos Básicos sobre Oracle® Java ME Embedded para a Plataforma de Referência (Raspberry Pi) Release 8 EA 2_
 * link:http://docs.oracle.com/javame/config/cldc/rel/3.3/win/gs/html/getstart_win32/setup_nbenv.htm[+ Usando o Software Oracle Java ME SDK com NetBeans+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+Desenvolvendo Aplicações Java ME+] em _Desenvolvendo Aplicações com o NetBeans IDE_
 
-*Recursos da Comunidade do NetBeans Mobility
-*
+=== Recursos da Comunidade do NetBeans Mobility
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Java_ME.2FMobility[+Perguntas Frequentes do NetBeans Mobility+]
 * link:http://forums.netbeans.org/javame-users.html[+Fórum do Usuário do NetBeans Java ME+]
 
-*Sites Relacionados ao Java ME
-*
+=== Sites Relacionados ao Java ME
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html[+Documentação Incorporada do Java ME+]
 * link:http://www.oracle.com/technetwork/java/javame/index.html[+Oracle Technology Network - Página Inicial do Java ME +]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/mobility_ru.asciidoc
index b83b413..837aa8f 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility_ru.asciidoc
@@ -29,114 +29,47 @@
 :description: Технологическая карта по приложениям Java ME Embedded и Java Card - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Технологическая карта по приложениям Java ME Embedded и Java Card
 
-
-==== Общее представление о мобильном приложении 
+== Общее представление о мобильном приложении 
 
 В большинстве мобильных приложений используется платформа Java Micro Edition (Java ME), разработанная для небольших устройств, таких как мобильные телефоны, но используемая на широком спектре устройств. В платформе Java ME используются сокращенные подмножества компонентов Java SE, виртуальных машин и интерфейсов API. В ней также определены интерфейсы API, которые предназначены специально для мобильных и встроенных устройств. IDE NetBeans поддерживает платформы link:http://www.oracle.com/ [...]
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Начало работы
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы
+=== Начало работы
 
 * link:../docs/javame/imp-ng.html[+Создание, отладка и профилирование мобильных встроенных приложений+]
 * link:../docs/javame/java-card.html[+Краткое руководство пользователя по разработке приложений Java Card в среде NetBeans+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
-*Разработка приложений Java Card
-*
+=== Разработка приложений Java Card
 
 * link:../docs/javame/javacard.html[+Статья о начале работы с Java Card+]
 * link:http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html[+Развертывание сервлетов на смарт-картах: переносные веб-серверы с Java Card 3.0+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * link:../docs/javame/nb_me8_screencast.html[+Демонстрация: поддержка NetBeans IDE для Java ME 8+]
 * YouTube: link:http://youtu.be/_1PPSt2AwpM[+ Введение в Java Micro Edition (ME) 8+] (_Автор: Терренс Бар (Terrence Bar)_)
 * link:../docs/javame/nb_mesdk_screencast.html[+Демонстрация: настройка IDE NetBeans для разработки мобильных приложений в Windows+]
 * link:../docs/javame/imp-ng-screencast.html[+Демонстрационная версия: поддержка профиля IMP-NG в IDE NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://plugins.netbeans.org/PluginPortal/faces/PluginDetailPage.jsp?pluginid=11194[+Установка подключаемого модуля Blackberry RIM для IDE NetBeans+]
 * link:http://nbandroid.org/wiki/index.php/Installation[+Установка подключаемого модуля Android в среду NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
 * link:http://wiki.netbeans.org/JavaMESDKSupport[+Страница wiki NetBeans по поддержке Java ME SDK+]
 * link:http://docs.oracle.com/javame/config/cldc/rel/8/rpi/html/getstart_rpi/debugging.htm#sthref31[+ Использование NetBeans с платой Raspberry Pi+] в _Кратком руководстве Oracle® Java ME Embedded для эталонной платформы (Raspberry Pi) версии 8 EA 2_
 * link:http://docs.oracle.com/javame/config/cldc/rel/3.3/win/gs/html/getstart_win32/setup_nbenv.htm[+ Использование ПО Oracle Java ME SDK с NetBeans+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+Разработка приложений Java ME+] в документе _Разработка приложений в IDE NetBeans_
 
-*Источники сообщества NetBeans Mobility 
-*
+=== Источники сообщества NetBeans Mobility 
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Java_ME.2FMobility[+Часто задаваемые вопросы по NetBeans Mobility+]
 * link:http://forums.netbeans.org/javame-users.html[+Форум пользователей NetBeans Java ME+]
 
-*Сайты с информацией по Java ME
-*
+=== Сайты с информацией по Java ME
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html[+Документация по Java ME Embedded+]
 * link:http://www.oracle.com/technetwork/java/javame/index.html[+Oracle Technology Network - целевая страница Java ME+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/mobility_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/mobility_zh_CN.asciidoc
index 3e24b0d..b391f09 100644
--- a/netbeans.apache.org/src/content/kb/docs/mobility_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/mobility_zh_CN.asciidoc
@@ -30,113 +30,47 @@
 :keywords: Apache NetBeans, Tutorials, Java ME 嵌入式和 Java Card 应用程序技术资源
 
 
-==== 什么是 Mobile 应用程序？ 
+== 什么是 Mobile 应用程序？ 
 
 大多数 Mobile 应用程序使用 Java Micro Edition (Java ME) 平台，该平台是为移动电话之类的小型设备开发的，但现在可用于多种设备。Java ME 使用向下扩展的 Java SE 组件、虚拟机和 API 所组成的子集。它也定义分别以客户移动设备和嵌入设备为目标的 API。NetBeans IDE 支持 link:http://www.oracle.com/us/technologies/java/embedded/micro-edition/overview/index.html[+Oracle Java ME 嵌入式+]和 link:http://www.oracle.com/technetwork/java/javame/javacard/overview/getstarted/index.html[+Java Card 平台+]。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南
+== 入门指南
 
 * link:../docs/javame/imp-ng.html[+创建、调试 Mobile 嵌入式应用程序并进行性能分析+]
 * 《link:../docs/javame/java-card.html[+NetBeans Java Card 开发快速入门指南+]》
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
-*开发 Java Card 应用程序
-*
+=== 开发 Java Card 应用程序
 
 * link:../docs/javame/javacard.html[+Java Card 快速入门文章+]
 * link:http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html[+在智能卡上部署 Servlet：具有 Java Card 3.0 的可移植 Web 服务器+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * link:../docs/javame/nb_me8_screencast.html[+演示：NetBeans IDE 对 Java ME 8 的支持+]
 * YouTube：link:http://youtu.be/_1PPSt2AwpM[+Java Micro Edition (ME) 8 简介+]（_作者：Terrence Bar_）
 * link:../docs/javame/nb_mesdk_screencast.html[+演示：在 Windows 上设置 NetBeans IDE 以进行 Mobile 开发+]
 * link:../docs/javame/imp-ng-screencast.html[+演示：NetBeans IDE 中的 IMP-NG 配置文件支持+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://plugins.netbeans.org/PluginPortal/faces/PluginDetailPage.jsp?pluginid=11194[+安装适用于 NetBeans IDE 的 Blackberry RIM 插件+]
 * link:http://nbandroid.org/wiki/index.php/Installation[+如何将 Android 插件安装到 NetBeans 中+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
 * link:http://wiki.netbeans.org/JavaMESDKSupport[+关于 Java ME SDK 支持的 NetBeans WiKi 页+]
 * _适用于引用平台 (Raspberry Pi) 发行版 8 EA 2 的 Oracle® Java ME 嵌入式入门指南_中的link:http://docs.oracle.com/javame/config/cldc/rel/8/rpi/html/getstart_rpi/debugging.htm#sthref31[+将 NetBeans 与 Raspberry Pi Board 一起使用+]
 * link:http://docs.oracle.com/javame/config/cldc/rel/3.3/win/gs/html/getstart_win32/setup_nbenv.htm[+ 将 Oracle Java ME SDK 软件与 NetBeans 一起使用+]
 * _使用 NetBeans IDE 开发应用程序_中的link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1552[+开发 Java ME 应用程序+]
 
-*NetBeans Mobility 社区资源 
-*
+=== NetBeans Mobility 社区资源 
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Java_ME.2FMobility[+NetBeans Mobility 常见问题解答+]
 * link:http://forums.netbeans.org/javame-users.html[+NetBeans Java ME 用户论坛+]
 
-*Java ME 相关站点
-*
+=== Java ME 相关站点
 
 * link:http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html[+Java ME Embedded 文档+]
 * link:http://www.oracle.com/technetwork/java/javame/index.html[+Oracle 技术网 - Java ME 登录页+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/php.asciidoc b/netbeans.apache.org/src/content/kb/docs/php.asciidoc
index f61bbc2..fdca504 100644
--- a/netbeans.apache.org/src/content/kb/docs/php.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php.asciidoc
@@ -31,19 +31,7 @@
 
 Below are some resources using the NetBeans IDE to develop PHP applications and HTML5 applications. NetBeans IDE support for these technologies is rapidly evolving. Please see the link:http://blogs.oracle.com/netbeansphp/[+NetBeans for PHP blog+] and link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans WebClient blog+] for the latest information.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started 
+== Getting Started 
 
 * link:../docs/webclient/html5-gettingstarted.html[+Getting Started with HTML5 Applications+]
 * link:../docs/php/quickstart.html[+NetBeans IDE PHP Quick Start Tutorial+]
@@ -51,21 +39,10 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../kb/docs/php/ajax-quickstart.html[+Introduction to Ajax in PHP Applications+]
 * link:../docs/webclient/ojet-gettingstarted.html[+Getting Started with Oracle JET Applications+]
 * link:../docs/webclient/cordova-gettingstarted.html[+Getting Started with Cordova Applications+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Basic Oracle JET Development*
+=== Basic Oracle JET Development
 
 * link:../docs/webclient/ojet-settingup.html[+Setting Up an Oracle JET Application+]
 * link:../docs/webclient/ojet-working.html[+Working with Oracle JET Applications+]
@@ -74,7 +51,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/webclient/ojet-porting.html[+Porting an Application to Oracle JET+]
 * link:../docs/webclient/ojet-gettingstarted.html[+Getting Started with Oracle JET in NetBeans IDE+]
 
-*Common Scenarios for Oracle JET Development*
+=== Common Scenarios for Oracle JET Development
 
 * link:../docs/webclient/ojet-intermodular.html[+Strategies for Intermodular Communication+]
 * link:../docs/webclient/ojet-crud.html[+CRUD Application Development+]
@@ -86,7 +63,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * Theming
 * Internationalization
 
-*HTML5 and JavaScript Project Development*
+=== HTML5 and JavaScript Project Development
 
 * link:../docs/webclient/html5-editing-css.html[+Working with CSS Stylesheets in HTML5 Applications+]
 * link:../docs/webclient/html5-js-support.html[+Debugging and Testing JavaScript in HTML5 Applications+]
@@ -95,7 +72,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/js-toolkits-dojo.html[+Connecting a Dojo Tree to an ArrayList using JSON+]
 * link:https://blogs.oracle.com/geertjan/entry/html5_front_end_for_an[+HTML5 Front End for an Existing Java EE Application+] (Geertjan's blog)
 
-*Configuring Your Environment for PHP Development*
+=== Configuring Your Environment for PHP Development
 
 * link:../docs/php/configure-php-environment-windows.html[+Configuring the Environment in Windows+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Configuring the MySQL Database Server in Windows+]
@@ -103,13 +80,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/configure-php-environment-mac-os.html[+Configuring the Environment in Mac OS X+]
 * link:http://wiki.netbeans.org/HowToConfigureXDebug[+How To Configure XDebug (Wiki)+]
 
-*Testing and Debugging*
+=== Testing and Debugging
 
 * link:../../kb/docs/php/debugging.html[+Debugging PHP Source Code in the NetBeans IDE+]
 * link:../docs/php/phpunit.html[+Testing with PHPUnit and Selenium+]
 * link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+NetBeans for PHP Blog: Path Mapping for Remote Debugging+]
 
-*Frameworks*
+=== Frameworks
 
 * link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+Developing a Zend Framework Application With Oracle Database 11g and NetBeans IDE+]
 * link:http://www.tiplite.com/cakephp-support-in-netbeans/[+TipLite blog: CakePHP Support in NetBeans+]
@@ -118,17 +95,14 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+My Beloved PHP blog: Netbeans: Code Completion for the Kohana Framework+]
 * See also: Symfony and Zend framework support documents in the Screencasts and Community Contributions sections.
 
-*General PHP Tutorials*
+== General PHP Tutorials
 
 * link:../docs/php/code-templates.html[+Code Templates in NetBeans IDE for PHP+]
 * link:../docs/php/remote-hosting-and-ftp-account.html[+Deploying a PHP Application on a Remote Web Server+]
 
-*Creating a Database Driven Application With PHP*
+=== Creating a Database Driven Application With PHP
 
 * link:../docs/php/wish-list-tutorial-main-page.html[+Main Page: Creating a Database Driven Application With PHP+]
-* 
-Part 1: Creating the Database
-
 * link:../docs/php/wish-list-lesson1.html[+1a: Creating a MySQL Database+]
 * link:../docs/php/wish-list-oracle-lesson1.html[+1b: Creating Oracle Database Tables+]
 * link:../docs/php/wish-list-lesson2.html[+Part 2: Designing the Application. Reading from the Database+]
@@ -139,19 +113,8 @@ Part 1: Creating the Database
 * link:../docs/php/wish-list-lesson7.html[+Part 7: Updating and Deleting Entries In the Database+]
 * link:../docs/php/wish-list-lesson8.html[+Part 8: Making the Application Look Better Using CSS+]
 * link:../docs/php/wish-list-lesson9.html[+Part 9: Deploying the Application on a Remote Web Server+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * (YouTube) link:https://www.youtube.com/watch?v=gIEBo2AUDkA[+Backbone.js Meets Java EE in Maven +]
 * link:../docs/web/html5-cordova-screencast.html[+Getting Started with Cordova in NetBeans IDE+]
@@ -172,54 +135,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/flickr-screencast.html[+Building a PHP Demo in Flickr+]
 * link:../docs/php/php-variables-screencast.html[+Declaring Variables in Comments and Related Code Completion Features+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="/community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/php-project-api-generator[+DZone: APIGen Plugin: PHP Project API Generator+]
 * link:http://wiki.netbeans.org/NB68symfony[+Symfony on Windows in NetBeans 6.8+]
 * link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+Configuring a NetBeans IDE Project for WordPress+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
+== Other Resources
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
-
-*_Developing Applications with NetBeans IDE_ User's Guide*
+=== _Developing Applications with NetBeans IDE_ User's Guide
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1532[+Developing PHP Applications+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1525[+Developing HTML5 Applications+]
 
-*Online Magazine Articles*
+=== Online Magazine Articles
 
 * link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+NetBeans Zone: Generate Constructor, Getters and Setters in NetBeans PHP IDE+]
 * link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+NetBeans Zone: NetBeans Project-Specific PHP Interpreter+]
 * link:http://jaxenter.com/from-database-to-restful-web-service-to-html5-in-10-minutes-46064.html[+Jax Magazine: From database to RESTful web service to HTML5 in 10 minutes+]
 
-*The IDE, Databases, and Versioning*
+=== The IDE, Databases, and Versioning
 
 * link:../docs/ide/oracle-db.html[+Connecting to Oracle Database+]
 * link:../../features/ide/index.html[+Base IDE Features+]
@@ -228,8 +163,8 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../features/ide/collaboration.html[+Version Control and Developer Collaboration+]
 * link:http://nbdrupalsupport.dev.java.net/[+NetBeans IDE Support for Drupal 6.x+]
 
-*Weblogs*
+=== Weblogs
 
 * link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+NetBeans for PHP blog+]
 * link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans Web Client blog+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/php/quickstart_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/php/quickstart_ru.asciidoc
index 1e7865b..6227d49 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/quickstart_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/quickstart_ru.asciidoc
@@ -95,7 +95,9 @@ image::images/getting-started-open-new-project.png[]
 
  echo "Hello, world! This is my first PHP project!";
 ----
-4. Для выполнения этого проекта поместите курсор на узел NewPHPProject и в контекстном меню выберите команду "Выполнить". На рисунке ниже показано, что должно отобразиться в окне браузера.
+
+[start=4]
+1. Для выполнения этого проекта поместите курсор на узел NewPHPProject и в контекстном меню выберите команду "Выполнить". На рисунке ниже показано, что должно отобразиться в окне браузера.
 image::images/getting-started-browser-hello-world.png[]
 Поздравляем! Программа работает!
 
@@ -116,19 +118,14 @@ image::images/getting-started-browser-hello-world.png[]
 
 В это же время для поиска информации, связанной с типом разрабатываемых приложений, используйте учебные карты IDE NetBeans для этого типа приложения. Каждая учебная карта содержит ряд учебных курсов и руководств различных уровней сложности. Доступны следующие учебные карты:
 
-|===
-|* link:../../trails/php.html[+Программирование на PHP+]
+* link:../../trails/php.html[+Программирование на PHP+]
 * link:../../trails/java-se.html[+Базовое программирование на Java+]
 * link:../../trails/matisse.html[+Приложения на Java с графическим интерфейсом+]
 * link:../../trails/web.html[+Приложения веб-служб+]
 * link:../../trails/java-ee.html[+Приложения Java EE и веб-приложения Java+]
- |
-
 * link:../../trails/mobility.html[+Мобильные приложения+]
 * link:../../trails/platform.html[+Подключаемые модули NetBeans и функционально насыщенные клиентские приложения+]
 * link:../../trails/cnd.html[+Приложения на C/C+++]
- 
-|===
 
 
 link:/about/contact_form.html?to=3&subject=Feedback:%20PHP%20Quickstart[+Отправить отзыв по этому учебному курсу+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.asciidoc b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.asciidoc
index 5b4b4bf..f099b67 100644
--- a/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php/wish-list-lesson9.asciidoc
@@ -17,17 +17,6 @@
 //     under the License.
 //
 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Creating a Database Driven Application With PHP - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Creating a Database Driven Application With PHP
-
 = Lesson 9: Deploying the Application on a Remote Web Server
 :jbake-type: tutorial
 :jbake-tags: tutorials 
@@ -40,36 +29,6 @@
 :description: Lesson 9: Deploying the Application on a Remote Web Server - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Lesson 9: Deploying the Application on a Remote Web Server
 
-
-Tutorial contents:
-
-1. link:wish-list-tutorial-main-page.html[+Creating a Database Driven Application With PHP - Main page+]
-2. 
-Creating the Database
-
-1. link:wish-list-lesson1.html[+Creating a MySQL Database+]
-2. link:wish-list-oracle-lesson1.html[+Creating Oracle Database Tables+]
-3. 
-link:wish-list-lesson2.html[+Designing the Application. Reading from the Database+]
-
-4. link:wish-list-lesson3.html[+Creating a New Application User +]
-5. link:wish-list-lesson4.html[+Optimizing the Code+]
-6. link:wish-list-lesson5.html[+Adding Security. Implementing Application User Logon+]
-7. link:wish-list-lesson6.html[+ Adding a New Wish to the Database+]
-8. link:wish-list-lesson7.html[+Updating and Deleting Entries in the Database+]
-9. link:wish-list-lesson8.html[+ Making the Application Look Better Using the CSS Technology+]
-10. 
-*=>Deploying the Application on a Remote Web Server*
-
-* <<previousLessonSourceCode,Application Source Code from the Previous Lesson>>
-* <<registerEmailAccount,Registering an Email Account>>
-* <<registerHostingAccount,Registering a Hosting Account>>
-* <<registeringFTPAccount,Registering an FTP Account>>
-* <<creatingRemoteDatabase,Creating a Remote Database>>
-* <<settingUpPHPProjectWithSources,Setting Up a PHP Project with Existing Sources>>
-* <<updatingClassWishDB,Updating the Class WishDB>>
-* <<nextSteps,Next Steps>>
-
 Normally, a real-life PHP application is run on a remote server and is accessed through a File Transfer Protocol (FTP). To deploy your CRUD application on a remote server, you will need to register an account on a hosting provider, register an FTP account, and create a remote database.
 
 You can use any hosting you like. The current document describes the deployment procedure on the X10HOSTING free hosting. This hosting includes a MySQL but not an Oracle database server.
@@ -86,8 +45,6 @@ In this lesson you learn how to do the following:
 
 The current document is a part of the Creating a CRUD Application in the NetBeans IDE for PHP tutorial.
 
-
-
 == Application Source Code from the Previous Lesson
 
 MySQL users: Click link:https://netbeans.org/files/documents/4/1934/lesson8.zip[+ here+] to download the source code that reflects the project state after the previous lesson is completed.
@@ -147,12 +104,12 @@ Because the CRUD application uses a database you will also need to deploy the  `
 
 == Setting Up a PHP Project with Existing Sources and Remote Web Site Run Configuration
 
-1. <<previousLessonSourceCode,Download the source files>> that correspond to the state of the application after the previous lesson is completed. Extract the files.
-2. Save the source files in the  ``htdocs``  folder.
-3. Create a link:project-setup.html#importSources[+PHP project with existing sources+]:
-* Specify the location of the downloaded sources in the Source folder
-* Choose the link:project-setup.html#remiteWebSite[+Remote Web Site+] run configuration and configure the FTP connection
-4. Complete the project creation.
+* <<previousLessonSourceCode,Download the source files>> that correspond to the state of the application after the previous lesson is completed. Extract the files.
+* Save the source files in the  ``htdocs``  folder.
+* Create a link:project-setup.html#importSources[+PHP project with existing sources+]:
+** Specify the location of the downloaded sources in the Source folder
+** Choose the link:project-setup.html#remiteWebSite[+Remote Web Site+] run configuration and configure the FTP connection
+* Complete the project creation.
 
 
 == Updating the Class WishDB
@@ -162,30 +119,27 @@ So far you have developed and run the Wish List application on the local web ser
 1. Open the file  ``db.php`` .
 2. Change the variables of the class  ``WishDB`` :
 
-[source,java]
+[source,php]
 ----
-
-    var $user = "<the name of the remote database user>";        
-    var $pass = "<the password of the remote database user>";
-    var $dbName = "<the name of the remote database>";
-    var $dbHost = "<the account username specified during the hosting account creation>";
-
+var $user = "<the name of the remote database user>";        
+var $pass = "<the password of the remote database user>";
+var $dbName = "<the name of the remote database>";
+var $dbHost = "<the account username specified during the hosting account creation>";
 ----
+
 In this example the variables will be updated as follows:
 
-[source,java]
+[source,php]
 ----
-
-    var $user = "phpuser";        
-    var $pass = "phpuserpw";
-    var $dbName = "wishlist";
-    var $dbHost = "phpuser";
-
+var $user = "phpuser";        
+var $pass = "phpuserpw";
+var $dbName = "wishlist";
+var $dbHost = "phpuser";
 ----
 
 
 == Next Steps
 
-link:wish-list-lesson8.html[+<< Previous lesson+]
+- link:wish-list-lesson8.html[+<< Previous lesson+]
+- link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
 
-link:wish-list-tutorial-main-page.html[+Back to the Tutorial main page+]
diff --git a/netbeans.apache.org/src/content/kb/docs/php_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/php_ca.asciidoc
index f8dc28d..61c69b1 100644
--- a/netbeans.apache.org/src/content/kb/docs/php_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php_ca.asciidoc
@@ -30,41 +30,18 @@
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge PHP
 
 
-==== Desenvolupant aplicacions PHP en l'IDE NetBeans
+== Desenvolupant aplicacions PHP en l'IDE NetBeans
 
 A sota hi han alguns recursos que utilitzen l'IDE NetBeans per a desenvolupar aplicacions PHP. El suport de l'IDE NetBeans per al desenvolupament PHP està evolucionant de forma ràpida. Vegeu el link:http://blogs.oracle.com/netbeansphp/[+Blog de NetBeans per a PHP+] per a l'última informació.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started 
+== Getting Started 
 
 * link:../../kb/docs/php/quickstart.html[+NetBeans IDE PHP Quick Start Tutorial+]
 * link:../../kb/docs/php/project-setup.html[+Setting Up a PHP Project+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Configuring Your Environment for PHP Development*
+=== Configuring Your Environment for PHP Development
 
 * link:../../kb/docs/php/configure-php-environment-windows.html[+Configuring the Environment in Windows+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Configuring the MySQL Database Server in Windows+]
@@ -72,13 +49,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../../kb/docs/php/configure-php-environment-mac-os.html[+Configuring the Environment in Mac OS X+]
 * link:http://wiki.netbeans.org/HowToConfigureXDebug[+How To Configure XDebug (Wiki)+]
 
-*Testing and Debugging*
+=== Testing and Debugging
 
 * link:../../kb/docs/php/debugging.html[+Debugging PHP Source Code in the NetBeans IDE+]
 * link:../docs/php/phpunit.html[+Testing with PHPUnit and Selenium+]
 * link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+NetBeans for PHP Blog: Path Mapping for Remote Debugging+]
 
-*Frameworks*
+=== Frameworks
 
 * link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+Developing a Zend Framework Application With Oracle Database 11g and NetBeans IDE+]
 * link:http://www.tiplite.com/cakephp-support-in-netbeans/[+TipLite blog: CakePHP Support in NetBeans+]
@@ -87,18 +64,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+My Beloved PHP blog: Netbeans: Code Completion for the Kohana Framework+]
 * See also: Symfony and Zend framework support documents in the Screencasts and Community Contributions sections.
 
-*General PHP Tutorials*
+=== General PHP Tutorials
 
 * link:../docs/php/code-templates.html[+Code Templates in NetBeans IDE for PHP+]
 * link:../../kb/docs/php/remote-hosting-and-ftp-account.html[+Deploying a PHP Application on a Remote Web Server+]
 
-*Creating a Database Driven Application With PHP*
+=== Creating a Database Driven Application With PHP
 
 * link:../../kb/docs/php/wish-list-tutorial-main-page.html[+Main Page: Creating a Database Driven Application With PHP+]
-* 
-Part 1: Creating the Database
-
-* link:../../kb/docs/php/wish-list-lesson1.html[+1a: Creating a MySQL Database+]
+* Part 1: Creating the Database link:../../kb/docs/php/wish-list-lesson1.html[+1a: Creating a MySQL Database+]
 * link:../docs/php/wish-list-oracle-lesson1.html[+1b: Creating Oracle Database Tables+]
 * link:../../kb/docs/php/wish-list-lesson2.html[+Part 2: Designing the Application. Reading from the Database+]
 * link:../../kb/docs/php/wish-list-lesson3.html[+Part 3: Creating a New Application User+]
@@ -108,19 +82,8 @@ Part 1: Creating the Database
 * link:../../kb/docs/php/wish-list-lesson7.html[+Part 7: Updating and Deleting Entries In the Database+]
 * link:../../kb/docs/php/wish-list-lesson8.html[+Part 8: Making the Application Look Better Using CSS+]
 * link:../../kb/docs/php/wish-list-lesson9.html[+Part 9: Deploying the Application on a Remote Web Server+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/php/screencast-phpdoc.html[+Generating PHP Documentation With NetBeans IDE+]
 * link:../docs/php/screencast-rename-refactoring.html[+Rename Refactoring and Other Editor Improvements in NetBeans IDE 7.0 for PHP+]
@@ -129,48 +92,20 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/flickr-screencast.html[+Building a PHP Demo in Flickr+]
 * link:../docs/php/php-variables-screencast.html[+Declaring Variables in Comments and Related Code Completion Features+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/php-project-api-generator[+DZone: APIGen Plugin: PHP Project API Generator+]
 * link:http://wiki.netbeans.org/NB68symfony[+Symfony on Windows in NetBeans 6.8+]
 * link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+Configuring a NetBeans IDE Project for WordPress+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
-*Online Magazine Articles*
+=== Online Magazine Articles
 
 * link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+NetBeans Zone: Generate Constructor, Getters and Setters in NetBeans PHP IDE+]
 * link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+NetBeans Zone: NetBeans Project-Specific PHP Interpreter+]
 
-*The IDE, Databases, and Versioning*
+=== The IDE, Databases, and Versioning
 
 * link:../docs/ide/oracle-db.html[+Connecting to Oracle Database+]
 * link:../../features/ide/index.html[+Base IDE Features+]
@@ -179,7 +114,6 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../features/ide/collaboration.html[+Version Control and Developer Collaboration+]
 * link:http://nbdrupalsupport.dev.java.net/[+NetBeans IDE Support for Drupal 6.x+]
 
-*Weblogs*
+=== Weblogs
 
 * link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+NetBeans for PHP blog+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/php_fr.asciidoc b/netbeans.apache.org/src/content/kb/docs/php_fr.asciidoc
index 6421af8..29ba8dd 100644
--- a/netbeans.apache.org/src/content/kb/docs/php_fr.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php_fr.asciidoc
@@ -29,42 +29,18 @@
 :description: Parcours d'Apprentissage PHP - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Parcours d'Apprentissage PHP
 
-
-==== Développer des applications PHP dans l'IDE NetBeans
+== Développer des applications PHP dans l'IDE NetBeans
 
 vous trouvez ci-bas quelques ressources sur l'utilisation de l'EDI NetBeans dans le développement d'applications PHP. Le support du PHP dans l'EDI NetBans évolue rapidement, les ressources sur cette page sont destinées pour la version 6.5 de NetBeans
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started 
+== Getting Started 
 
 * link:../../kb/docs/php/quickstart.html[+NetBeans IDE PHP Quick Start Tutorial+]
 * link:../../kb/docs/php/project-setup.html[+Setting Up a PHP Project+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*Configuring Your Environment for PHP Development*
+=== Configuring Your Environment for PHP Development
 
 * link:../../kb/docs/php/configure-php-environment-windows.html[+Configuring the Environment in Windows+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Configuring the MySQL Database Server in Windows+]
@@ -72,13 +48,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../../kb/docs/php/configure-php-environment-mac-os.html[+Configuring the Environment in Mac OS X+]
 * link:http://wiki.netbeans.org/HowToConfigureXDebug[+How To Configure XDebug (Wiki)+]
 
-*Testing and Debugging*
+=== Testing and Debugging
 
 * link:../../kb/docs/php/debugging.html[+Debugging PHP Source Code in the NetBeans IDE+]
 * link:../docs/php/phpunit.html[+Testing with PHPUnit and Selenium+]
 * link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+NetBeans for PHP Blog: Path Mapping for Remote Debugging+]
 
-*Frameworks*
+=== Frameworks
 
 * link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+Developing a Zend Framework Application With Oracle Database 11g and NetBeans IDE+]
 * link:http://www.tiplite.com/cakephp-support-in-netbeans/[+TipLite blog: CakePHP Support in NetBeans+]
@@ -87,18 +63,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+My Beloved PHP blog: Netbeans: Code Completion for the Kohana Framework+]
 * See also: Symfony and Zend framework support documents in the Screencasts and Community Contributions sections.
 
-*General PHP Tutorials*
+=== General PHP Tutorials
 
 * link:../docs/php/code-templates.html[+Code Templates in NetBeans IDE for PHP+]
 * link:../../kb/docs/php/remote-hosting-and-ftp-account.html[+Deploying a PHP Application on a Remote Web Server+]
 
-*Creating a Database Driven Application With PHP*
+=== Creating a Database Driven Application With PHP
 
 * link:../../kb/docs/php/wish-list-tutorial-main-page.html[+Main Page: Creating a Database Driven Application With PHP+]
-* 
-Part 1: Creating the Database
-
-* link:../../kb/docs/php/wish-list-lesson1.html[+1a: Creating a MySQL Database+]
+* Part 1: Creating the Database link:../../kb/docs/php/wish-list-lesson1.html[+1a: Creating a MySQL Database+]
 * link:../docs/php/wish-list-oracle-lesson1.html[+1b: Creating Oracle Database Tables+]
 * link:../../kb/docs/php/wish-list-lesson2.html[+Part 2: Designing the Application. Reading from the Database+]
 * link:../../kb/docs/php/wish-list-lesson3.html[+Part 3: Creating a New Application User+]
@@ -108,19 +81,8 @@ Part 1: Creating the Database
 * link:../../kb/docs/php/wish-list-lesson7.html[+Part 7: Updating and Deleting Entries In the Database+]
 * link:../../kb/docs/php/wish-list-lesson8.html[+Part 8: Making the Application Look Better Using CSS+]
 * link:../../kb/docs/php/wish-list-lesson9.html[+Part 9: Deploying the Application on a Remote Web Server+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/php/screencast-phpdoc.html[+Generating PHP Documentation With NetBeans IDE+]
 * link:../docs/php/screencast-rename-refactoring.html[+Rename Refactoring and Other Editor Improvements in NetBeans IDE 7.0 for PHP+]
@@ -129,48 +91,20 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/flickr-screencast.html[+Building a PHP Demo in Flickr+]
 * link:../docs/php/php-variables-screencast.html[+Declaring Variables in Comments and Related Code Completion Features+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/php-project-api-generator[+DZone: APIGen Plugin: PHP Project API Generator+]
 * link:http://wiki.netbeans.org/NB68symfony[+Symfony on Windows in NetBeans 6.8+]
 * link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+Configuring a NetBeans IDE Project for WordPress+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
-*Online Magazine Articles*
+=== Online Magazine Articles
 
 * link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+NetBeans Zone: Generate Constructor, Getters and Setters in NetBeans PHP IDE+]
 * link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+NetBeans Zone: NetBeans Project-Specific PHP Interpreter+]
 
-*The IDE, Databases, and Versioning*
+=== The IDE, Databases, and Versioning
 
 * link:../docs/ide/oracle-db.html[+Connecting to Oracle Database+]
 * link:../../features/ide/index.html[+Base IDE Features+]
@@ -179,7 +113,6 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../features/ide/collaboration.html[+Version Control and Developer Collaboration+]
 * link:http://nbdrupalsupport.dev.java.net/[+NetBeans IDE Support for Drupal 6.x+]
 
-*Weblogs*
+=== Weblogs
 
 * link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+NetBeans for PHP blog+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/php_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/php_ja.asciidoc
index 34c3cd2..e0f171a 100644
--- a/netbeans.apache.org/src/content/kb/docs/php_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php_ja.asciidoc
@@ -31,40 +31,17 @@
 
 次に示すのは、NetBeans IDEを使用してPHPアプリケーションやHTML5アプリケーションを開発するためのリソースです。NetBeans IDEによるこれらのテクノロジのサポートは急速に進化しています。最新情報については、link:http://blogs.oracle.com/netbeansphp/[+NetBeans for PHPブログ+]とlink:https://blogs.oracle.com/netbeanswebclient/[+NetBeans WebClientブログ+]を参照してください。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 開始 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始 
+== 開始 
 
 * link:../docs/webclient/html5-gettingstarted.html[+HTML5アプリケーションの開始+]
 * link:../docs/php/quickstart.html[+NetBeans IDE PHPクイック・スタート・チュートリアル+]
 * link:../docs/php/project-setup.html[+PHPプロジェクトの設定+]
 * link:../../kb/docs/php/ajax-quickstart.html[+PHPアプリケーションでのAjax入門+]
 * link:../docs/webclient/cordova-gettingstarted.html[+Cordovaアプリケーションの作成の開始+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
-*HTML5およびJavaScriptのプロジェクト開発*
+=== HTML5およびJavaScriptのプロジェクト開発
 
 * link:../docs/webclient/html5-editing-css.html[+HTML5アプリケーションでのCSSスタイル・シートの操作+]
 * link:../docs/webclient/html5-js-support.html[+HTML5アプリケーションでのJavaScriptのデバッグとテスト+]
@@ -73,7 +50,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/js-toolkits-dojo.html[+JSONを使用したDojoツリーのArrayListへの接続+]
 * link:https://blogs.oracle.com/geertjan/entry/html5_front_end_for_an[+既存のJava EEアプリケーションのHTML5フロント・エンド+](Geertjanのブログ)
 
-*PHP開発のための環境の構成*
+=== PHP開発のための環境の構成
 
 * link:../docs/php/configure-php-environment-windows.html[+Windowsでの環境の構成+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+WindowsでのMySQLデータベース・サーバーの構成+]
@@ -81,13 +58,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/configure-php-environment-mac-os.html[+Mac OS Xでの環境の構成+]
 * link:http://wiki.netbeans.org/HowToConfigureXDebug[+XDebugの構成方法(Wiki)+]
 
-*テストとデバッグ*
+=== テストとデバッグ
 
 * link:../../kb/docs/php/debugging.html[+NetBeans IDEでのPHPソース・コードのデバッグ+]
 * link:../docs/php/phpunit.html[+PHPUnitとSeleniumを使用したテスト+]
 * link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+NetBeans for PHPブログ: リモート・デバッグ用のパス・マッピング+]
 
-*フレームワーク*
+=== フレームワーク
 
 * link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+Oracle Database 11gとNetBeans IDEを使用したZendフレームワーク・アプリケーションの開発+]
 * link:http://www.tiplite.com/cakephp-support-in-netbeans/[+TipLiteブログ: NetBeansでのCakePHPのサポート+]
@@ -96,18 +73,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+My Beloved PHPブログ: NetBeans: Kohanaフレームワークのコード補完+]
 * 関連項目: 「スクリーンキャスト」および「コミュニティの寄稿」セクションのSymfonyおよびZendフレームワーク・サポート・ドキュメント
 
-*全般的なPHPチュートリアル*
+=== 全般的なPHPチュートリアル
 
 * link:../docs/php/code-templates.html[+PHP向けのNetBeans IDEのコード・テンプレート+]
 * link:../docs/php/remote-hosting-and-ftp-account.html[+リモートWebサーバーへのPHPアプリケーションのデプロイ+]
 
-*PHPを使用するデータベース駆動型アプリケーションの作成*
+=== PHPを使用するデータベース駆動型アプリケーションの作成
 
 * link:../docs/php/wish-list-tutorial-main-page.html[+メイン・ページ: PHPを使用するデータベース駆動型アプリケーションの作成+]
-* 
-パート1: データベースの作成
-
-* link:../docs/php/wish-list-lesson1.html[+1a: MySQLデータベースの作成+]
+* パート1: データベースの作成 link:../docs/php/wish-list-lesson1.html[+1a: MySQLデータベースの作成+]
 * link:../docs/php/wish-list-oracle-lesson1.html[+1b: Oracleデータベース表の作成+]
 * link:../docs/php/wish-list-lesson2.html[+パート2: アプリケーションの設計。データベースからの読取り+]
 * link:../docs/php/wish-list-lesson3.html[+パート3: 新規アプリケーション・ユーザーの作成+]
@@ -117,19 +91,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/wish-list-lesson7.html[+パート7: データベース内のエントリの更新および削除+]
 * link:../docs/php/wish-list-lesson8.html[+パート8: CSSを使用したアプリケーションの外観の改良+]
 * link:../docs/php/wish-list-lesson9.html[+パート9: リモートWebサーバーへのアプリケーションのデプロイ+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * (YouTube) link:https://www.youtube.com/watch?v=gIEBo2AUDkA[+MavenでのBackbone.jsとJava EE+]
 * link:../docs/web/html5-cordova-screencast.html[+NetBeans IDEでのCordovaの開始+]
@@ -150,54 +113,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/flickr-screencast.html[+FlickrでのPHPデモのビルド+]
 * link:../docs/php/php-variables-screencast.html[+コメント内での変数の宣言および関連するコード補完機能+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="/community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://netbeans.dzone.com/php-project-api-generator[+DZone: APIGenプラグイン: PHPプロジェクトAPIジェネレータ+]
 * link:http://wiki.netbeans.org/NB68symfony[+WindowsでのNetBeans 6.8のSymfony+]
 * link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+WordPress用のNetBeans IDEプロジェクトの構成+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
-*_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド*
+===_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1532[+PHPアプリケーションの開発+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1525[+HTML5アプリケーションの開発+]
 
-*オンライン・マガジンの記事*
+=== オンライン・マガジンの記事
 
 * link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+NetBeans Zone: NetBeans PHP IDEでのコンストラクタ、取得メソッド、設定メソッドの生成+]
 * link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+NetBeans Zone: NetBeansプロジェクト特有のPHPインタプリタ+]
 * link:http://jaxenter.com/from-database-to-restful-web-service-to-html5-in-10-minutes-46064.html[+Jax Magazine: 10分でデータベースからRESTful Webサービス、HTML5へ+]
 
-*IDE、データベース、およびバージョン管理*
+=== IDE、データベース、およびバージョン管理
 
 * link:../docs/ide/oracle-db.html[+Oracleデータベースへの接続+]
 * link:../../features/ide/index.html[+基本IDEの機能+]
@@ -206,8 +141,7 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../features/ide/collaboration.html[+バージョン管理と開発者間のコラボレーション+]
 * link:http://nbdrupalsupport.dev.java.net/[+NetBeans IDEのDrupal 6.xのサポート+]
 
-*ブログ*
+=== ブログ
 
 * link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+PHP向けのNetBeansブログ+]
 * link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans Webクライアント・ブログ+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/php_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/php_pt_BR.asciidoc
index dcffa1c..bdf34f8 100644
--- a/netbeans.apache.org/src/content/kb/docs/php_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php_pt_BR.asciidoc
@@ -31,19 +31,7 @@
 
 A seguir estão descritos alguns recursos que utilizam o NetBeans IDE para desenvolver aplicações em PHP e HTML5. O suporte ao NetBeans IDE para essas tecnologias evolui rapidamente. Consulte o link:http://blogs.oracle.com/netbeansphp/[+blog NetBeans para PHP+] e o link:https://blogs.oracle.com/netbeanswebclient/[+blog do NetBeans WebClient+] para obter as informações mais recentes.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Conceitos Básicos 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Conceitos Básicos  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Conceitos Básicos 
+== Conceitos Básicos 
 
 * link:../docs/webclient/html5-gettingstarted.html[+Conceitos Básicos sobre Aplicações em HTML5+]
 * link:../docs/php/quickstart.html[+Tutorial para Início Rápido em PHP do NetBeans IDE+]
@@ -52,19 +40,9 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/webclient/cordova-gettingstarted.html[+Conceitos Básicos sobre Criação de Aplicações Cordova+]
 image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Desenvolvimento de Projeto em HTML5 e JavaScript*
+=== Desenvolvimento de Projeto em HTML5 e JavaScript
 
 * link:../docs/webclient/html5-editing-css.html[+Trabalhando com Folhas de Estilo de CSS em Aplicações em HTML5+]
 * link:../docs/webclient/html5-js-support.html[+Depurando e Testando JavaScript em Aplicações em HTML5+]
@@ -73,7 +51,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/js-toolkits-dojo.html[+Conectando uma Árvore Dojo a uma ArrayList utilizando JSON+]
 * link:https://blogs.oracle.com/geertjan/entry/html5_front_end_for_an[+HTML5 Front End for an Existing Java EE Application (Front-End de HTML5 para uma Aplicação Java EE Existente)+] (blog de Geertjan)
 
-*Configurando o Ambiente para o Desenvolvimento em PHP*
+=== Configurando o Ambiente para o Desenvolvimento em PHP
 
 * link:../docs/php/configure-php-environment-windows.html[+Configurando o Ambiente no Windows+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Configurando o Servidor de Banco de Dados MySQL no Windows+]
@@ -81,13 +59,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/configure-php-environment-mac-os.html[+Configurando o Ambiente no Mac OS X+]
 * link:http://wiki.netbeans.org/HowToConfigureXDebug[+Como Configurar o XDebug (Wiki)+]
 
-*Testando e Depurando*
+=== Testando e Depurando
 
 * link:../../kb/docs/php/debugging.html[+Depurando o Código-Fonte do PHP no NetBeans IDE+]
 * link:../docs/php/phpunit.html[+Testando com PHPUnit e Selenium+]
 * link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+Blog NetBeans para PHP: Mapeamento de Caminho para Depuração Remota+]
 
-*Frameworks*
+=== Frameworks
 
 * link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+Desenvolvendo uma Aplicação Zend Framework com Banco de Dados 11g Oracle e NetBeans IDE+]
 * link:http://www.tiplite.com/cakephp-support-in-netbeans/[+Blog TipLite: Suporte a CakePHP no NetBeans+]
@@ -96,18 +74,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+Blog My Beloved PHP: Netbeans: Autocompletar Código para o Kohana Framework+]
 * Consulte também: documentos de suporte a Symfony e Zend Framework nas seções Screencasts e Contribuições da Comunidade.
 
-*Tutoriais Gerais de PHP*
+=== Tutoriais Gerais de PHP
 
 * link:../docs/php/code-templates.html[+Modelos de Códigos em NetBeans IDE para PHP+]
 * link:../docs/php/remote-hosting-and-ftp-account.html[+Implantando uma Aplicação PHP em um Servidor Web Remoto+]
 
-*Criando uma Aplicação Direcionada a Banco de Dados com PHP*
+=== Criando uma Aplicação Direcionada a Banco de Dados com PHP
 
 * link:../docs/php/wish-list-tutorial-main-page.html[+Página Principal: Criando uma Aplicação Direcionada a Banco de Dados com PHP+]
-* 
-Parte 1: Criando o Banco de Dados
-
-* link:../docs/php/wish-list-lesson1.html[+1a: Criando um Banco de Dados MySQL+]
+* Parte 1: Criando o Banco de Dados link:../docs/php/wish-list-lesson1.html[+1a: Criando um Banco de Dados MySQL+]
 * link:../docs/php/wish-list-oracle-lesson1.html[+1b: Criando Tabelas de Banco de Dados Oracle+]
 * link:../docs/php/wish-list-lesson2.html[+Parte 2: Criando a Aplicação. Lendo do Banco de Dados+]
 * link:../docs/php/wish-list-lesson3.html[+Parte 3: Criando um Novo Usuário de Aplicação+]
@@ -117,19 +92,8 @@ Parte 1: Criando o Banco de Dados
 * link:../docs/php/wish-list-lesson7.html[+Parte 7: Atualizando e Deletando Entradas no Banco de Dados+]
 * link:../docs/php/wish-list-lesson8.html[+Parte 8: Melhorando a Aparência da Aplicação com CSS+]
 * link:../docs/php/wish-list-lesson9.html[+Parte 9: Implantando a Aplicação em um Servidor Web Remoto+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * (YouTube) link:https://www.youtube.com/watch?v=gIEBo2AUDkA[+Backbone.js Meets Java EE in Maven (Backbone.js Encontra Java EE no Maven) +]
 * link:../docs/web/html5-cordova-screencast.html[+Conceitos Básicos sobre Cordova no NetBeans IDE+]
@@ -150,54 +114,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/flickr-screencast.html[+Construindo uma Demonstração de PHP no Flickr+]
 * link:../docs/php/php-variables-screencast.html[+Declarando Variáveis em Comentários e Funcionalidades Relacionadas a Autocompletar Código+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="/community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * link:http://netbeans.dzone.com/php-project-api-generator[+DZone: Plug-in APIGen: Gerador de API do Projeto PHP+]
 * link:http://wiki.netbeans.org/NB68symfony[+Symfony em Windows no NetBeans 6.8+]
 * link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+Configurando um Projeto NetBeans IDE para WordPress+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
-*_Desenvolvendo Aplicações com o NetBeans IDE_ Guia do Usuário*
+=== _Desenvolvendo Aplicações com o NetBeans IDE_ Guia do Usuário
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1532[+Desenvolvendo Aplicações PHP+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1525[+Desenvolvendo Aplicações HTML5+]
 
-*Artigos de Revistas On-Line*
+=== Artigos de Revistas On-Line
 
 * link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+Regiões no NetBeans: Gerar Construtor, Getters e Setters no PHP do NetBeans IDE+]
 * link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+Regiões no NetBeans: Intérprete de PHP Específico para Projetos do NetBeans+]
 * link:http://jaxenter.com/from-database-to-restful-web-service-to-html5-in-10-minutes-46064.html[+Revista Jax: Do banco de dados para o web service RESTful para HTML5 em 10 minutos+]
 
-*O IDE, Bancos de Dados e Controle de Versão*
+=== O IDE, Bancos de Dados e Controle de Versão
 
 * link:../docs/ide/oracle-db.html[+Conectando a Banco de Dados Oracle+]
 * link:../../features/ide/index.html[+Funcionalidades do IDE Base+]
@@ -206,8 +142,7 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../features/ide/collaboration.html[+Controle de Versão e Colaboração do Desenvolvedor+]
 * link:http://nbdrupalsupport.dev.java.net/[+Suporte NetBeans IDE para Drupal 6.x+]
 
-*Weblogs*
+=== Weblogs
 
 * link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+Blog sobre NetBeans para PHP+]
 * Blog link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans Web Client (Cliente Web do NetBeans)+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/php_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/php_ru.asciidoc
index 4742eb4..0ec8d7d 100644
--- a/netbeans.apache.org/src/content/kb/docs/php_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php_ru.asciidoc
@@ -31,40 +31,17 @@
 
 Ниже перечислены ресурсы, используемые IDE NetBeans для разработки приложений PHP и приложений HTML5. Поддержка IDE NetBeans для этих технологий постоянно расширяется. Ознакомьтесь с блогом link:http://blogs.oracle.com/netbeansphp/[+NetBeans для PHP+] и блогом link:https://blogs.oracle.com/netbeanswebclient/[+Веб-клиент NetBeans+]для получения последних сведений.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Начало работы 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы 
+== Начало работы 
 
 * link:../docs/webclient/html5-gettingstarted.html[+Начало работы с приложениями HTML5+]
 * link:../docs/php/quickstart.html[+Быстрое учебное руководство по PHP IDE NetBeans+]
 * link:../docs/php/project-setup.html[+Настройка проекта PHP+]
 * link:../../kb/docs/php/ajax-quickstart.html[+Введение в Ajax в приложениях PHP +]
 * link:../docs/webclient/cordova-gettingstarted.html[+Общие сведения о создании приложений Cordova+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
-*Разработка проектов на HTML5 и JavaScript*
+=== Разработка проектов на HTML5 и JavaScript
 
 * link:../docs/webclient/html5-editing-css.html[+Работа со страницами стилей CSS в приложениях HTML5+]
 * link:../docs/webclient/html5-js-support.html[+Отладка и тестирование JavaScript в приложениях HTML5+]
@@ -73,7 +50,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/js-toolkits-dojo.html[+Подключение дерева Dojo к списку ArrayList с помощью JSON+]
 * link:https://blogs.oracle.com/geertjan/entry/html5_front_end_for_an[+Интерфейс HTML5 для существующих приложений Java EE+] (блог Гиртжана)
 
-*Настройка среды для разработки на языке PHP*
+=== Настройка среды для разработки на языке PHP
 
 * link:../docs/php/configure-php-environment-windows.html[+Настройка среды в Windows+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Настройка сервера баз данных MySQL в Windows+]
@@ -81,13 +58,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/configure-php-environment-mac-os.html[+Настройка среды в Mac OS X+]
 * link:http://wiki.netbeans.org/HowToConfigureXDebug[+Настройка XDebug (вики-страница)+]
 
-*Тестирование и отладка*
+=== Тестирование и отладка
 
 * link:../../kb/docs/php/debugging.html[+Отладка исходного кода PHP в IDE NetBeans+]
 * link:../docs/php/phpunit.html[+Тестирование с помощью PHPUnit и Selenium+]
 * link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+Блог "NetBeans для PHP": отображение пути для удаленной отладки+]
 
-*Платформы*
+=== Платформы
 
 * link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+Разработка приложения платформы Zend с помощью Oracle Database 11g и IDE NetBeans+]
 * link:http://www.tiplite.com/cakephp-support-in-netbeans/[+Блог "TipLite": поддержка CakePHP в среде NetBeans+]
@@ -96,17 +73,14 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+Блог "Мой любимый PHP": Netbeans: автозавершение кода для платформы Kohana+]
 * См. также: документация по поддержке платформ Symfony и Zend в разделах "Экранные демонстрации" и "Вклад в сообщество".
 
-*Учебные курсы по работе с PHP*
+=== Учебные курсы по работе с PHP
 
 * link:../docs/php/code-templates.html[+Шаблоны кода в IDE NetBeans для PHP+]
 * link:../docs/php/remote-hosting-and-ftp-account.html[+Развертывание приложения PHP на удаленном веб-сервере+]
 
-*Создание приложения на основе базы данных с помощью языка PHP*
+=== Создание приложения на основе базы данных с помощью языка PHP
 
 * link:../docs/php/wish-list-tutorial-main-page.html[+Главная страница: создание приложения на основе базы данных с помощью языка PHP+]
-* 
-Часть 1. Создание базы данных
-
 * link:../docs/php/wish-list-lesson1.html[+1а: создание базы данных MySQL+]
 * link:../docs/php/wish-list-oracle-lesson1.html[+1б: Создание таблиц базы данных Oracle+]
 * link:../docs/php/wish-list-lesson2.html[+Часть 2. Проектирование приложения. Чтение из базы данных+]
@@ -117,19 +91,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/wish-list-lesson7.html[+Часть 7. Обновление и удаление записей в базе данных+]
 * link:../docs/php/wish-list-lesson8.html[+Часть 8. Усовершенствование внешнего облика приложения с использованием CSS+]
 * link:../docs/php/wish-list-lesson9.html[+Часть 9. Развертывание приложения на удаленном веб-сервере+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * (YouTube) link:https://www.youtube.com/watch?v=gIEBo2AUDkA[+Backbone.js и Java EE в Maven +]
 * link:../docs/web/html5-cordova-screencast.html[+Начало работы с Cordova в IDE NetBeans+]
@@ -150,54 +113,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/flickr-screencast.html[+Создание демонстрации PHP в Flickr+]
 * link:../docs/php/php-variables-screencast.html[+Объявление переменных в функциях автозавершения комментариев и связанного кода+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="/community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://netbeans.dzone.com/php-project-api-generator[+DZone: подключаемый модуль APIGen: генератор API-интерфейса проекта PHP+]
 * link:http://wiki.netbeans.org/NB68symfony[+Symfony в системе Windows и среде NetBeans 6.8+]
 * link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+Настройка проектов IDE NetBeans для WordPress+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
+== Другие источники
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
-
-*_Разработка приложений в IDE NetBeans_ - Руководство пользователя*
+=== _Разработка приложений в IDE NetBeans_ - Руководство пользователя
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1532[+Разработка приложений PHP+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1525[+Разработка приложений HTML5+]
 
-*Статьи сетевого журнала*
+=== Статьи сетевого журнала
 
 * link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+NetBeans Zone: создание конструктора, методов получения и установки в среде IDE NetBeans PHP+]
 * link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+NetBeans Zone: интерпретатор языка PHP специально для проектов NetBeans+]
 * link:http://jaxenter.com/from-database-to-restful-web-service-to-html5-in-10-minutes-46064.html[+Журнал Jax Magazine: от базы данных до веб-службы RESTful и HTML5 за 10 минут+]
 
-*Среда IDE, базы данных и управление версиями*
+=== Среда IDE, базы данных и управление версиями
 
 * link:../docs/ide/oracle-db.html[+Подключение к Oracle Database+]
 * link:../../features/ide/index.html[+Базовые функции среды IDE+]
@@ -206,8 +141,8 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../features/ide/collaboration.html[+Управление версиями и сотрудничество разработчиков+]
 * link:http://nbdrupalsupport.dev.java.net/[+Поддержка IDE NetBeans для Drupal 6.x+]
 
-*Блоги*
+=== Блоги
 
 * link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+Блог "NetBeans для PHP"+]
 * link:https://blogs.oracle.com/netbeanswebclient/[+Блог NetBeans Web Client+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/php_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/php_zh_CN.asciidoc
index 8ade90f..9219591 100644
--- a/netbeans.apache.org/src/content/kb/docs/php_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/php_zh_CN.asciidoc
@@ -31,40 +31,17 @@
 
 下面是一些关于使用 NetBeans IDE 开发 PHP 应用程序和 HTML5 应用程序的资源。NetBeans IDE 对这些技术的支持正在快速发展。有关最新信息，请参阅 link:http://blogs.oracle.com/netbeansphp/[+NetBeans for PHP 博客+]和 link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans WebClient 博客+]。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南 
+== 入门指南 
 
 * link:../docs/webclient/html5-gettingstarted.html[+HTML5 应用程序入门+]
 * link:../docs/php/quickstart.html[+NetBeans IDE PHP 快速入门教程+]
 * link:../docs/php/project-setup.html[+设置 PHP 项目+]
 * link:../../kb/docs/php/ajax-quickstart.html[+PHP 应用程序中的 Ajax 简介+]
 * link:../docs/webclient/cordova-gettingstarted.html[+Cordova 应用程序创建入门指南+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
-*HTML5 和 JavaScript 项目开发*
+=== HTML5 和 JavaScript 项目开发
 
 * link:../docs/webclient/html5-editing-css.html[+在 HTML5 应用程序中使用 CSS 样式表+]
 * link:../docs/webclient/html5-js-support.html[+在 HTML5 应用程序中调试和测试 JavaScript+]
@@ -73,7 +50,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/web/js-toolkits-dojo.html[+使用 JSON 将 Dojo 树连接至 ArrayList+]
 * link:https://blogs.oracle.com/geertjan/entry/html5_front_end_for_an[+现有 Java EE 应用程序的 HTML5 前端+]（Geertjan 的博客）
 
-*为进行 PHP 开发配置环境*
+=== 为进行 PHP 开发配置环境
 
 * link:../docs/php/configure-php-environment-windows.html[+在 Windows 中配置环境+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+在 Windows 中配置 MySQL 数据库服务器+]
@@ -81,13 +58,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/configure-php-environment-mac-os.html[+在 Mac OS X 中配置环境+]
 * link:http://wiki.netbeans.org/HowToConfigureXDebug[+如何配置 XDebug (Wiki)+]
 
-*测试和调试*
+=== 测试和调试
 
 * link:../../kb/docs/php/debugging.html[+在 NetBeans IDE 中调试 PHP 源代码+]
 * link:../docs/php/phpunit.html[+使用 PHPUnit 和 Selenium 进行测试+]
 * link:http://blogs.oracle.com/netbeansphp/entry/path_mapping_in_php_debugger[+"NetBeans for PHP" 博客：映射路径以进行远程调试+]
 
-*框架*
+=== 框架
 
 * link:http://www.oracle.com/webfolder/technetwork/tutorials/obe/db/oow10/php_webapp/php_webapp.htm[+使用 Oracle Database 11g 和 NetBeans IDE 开发 Zend 框架应用程序+]
 * link:http://www.tiplite.com/cakephp-support-in-netbeans/[+TipLite 博客：NetBeans 中的 CakePHP 支持+]
@@ -96,18 +73,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://www.mybelovedphp.com/2009/01/27/netbeans-code-completion-for-the-kohana-framework/[+“我喜爱的 PHP”博客：Netbeans：Kohana 框架的代码完成功能+]
 * 另请参见：“截屏视频”和“社区提供的文档”部分中的 Symfony 和 Zend 框架支持文档。
 
-*常规 PHP 教程*
+=== 常规 PHP 教程
 
 * link:../docs/php/code-templates.html[+适用于 PHP 的 NetBeans IDE 中的代码模板+]
 * link:../docs/php/remote-hosting-and-ftp-account.html[+在远程 Web 服务器上部署 PHP 应用程序+]
 
-*使用 PHP 创建数据库驱动的应用程序*
+=== 使用 PHP 创建数据库驱动的应用程序
 
 * link:../docs/php/wish-list-tutorial-main-page.html[+主页：使用 PHP 创建数据库驱动的应用程序+]
-* 
-第 1 部分：创建数据库
-
-* link:../docs/php/wish-list-lesson1.html[+1a：创建 MySQL 数据库+]
+* 第 1 部分：创建数据库 link:../docs/php/wish-list-lesson1.html[+1a：创建 MySQL 数据库+]
 * link:../docs/php/wish-list-oracle-lesson1.html[+1b：创建 Oracle 数据库表+]
 * link:../docs/php/wish-list-lesson2.html[+第 2 部分：设计应用程序。从数据库读取数据+]
 * link:../docs/php/wish-list-lesson3.html[+第 3 部分：创建新应用程序用户+]
@@ -117,19 +91,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/wish-list-lesson7.html[+第 7 部分：更新和删除数据库中的条目+]
 * link:../docs/php/wish-list-lesson8.html[+第 8 部分：使用 CSS 改进应用程序的外观+]
 * link:../docs/php/wish-list-lesson9.html[+第 9 部分：将应用程序部署到远程 Web 服务器+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * (YouTube) link:https://www.youtube.com/watch?v=gIEBo2AUDkA[+Backbone.js 与 Maven 中的 Java EE+]
 * link:../docs/web/html5-cordova-screencast.html[+NetBeans IDE 中的 Cordova 入门指南+]
@@ -150,54 +113,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:../docs/php/flickr-screencast.html[+在 Flickr 中构建 PHP 演示+]
 * link:../docs/php/php-variables-screencast.html[+声明注释中的变量和相关的代码完成功能+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="/community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://netbeans.dzone.com/php-project-api-generator[+DZone：APIGen 插件：PHP 项目 API 生成器+]
 * link:http://wiki.netbeans.org/NB68symfony[+在 Windows 中，NetBeans 6.8 使用的 Symfony+]
 * link:http://wiki.netbeans.org/ConfiguringNetBeansProjectForWordPress[+针对 WordPress 配置 NetBeans IDE 项目+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
-*_使用 NetBeans IDE 开发应用程序_用户指南*
+===_使用 NetBeans IDE 开发应用程序_用户指南
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1532[+开发 PHP 应用程序+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1525[+开发 HTML5 应用程序+]
 
-*在线期刊文章*
+=== 在线期刊文章
 
 * link:http://netbeans.dzone.com/news/generate-constructor-getters-a[+NetBeans 区：在 NetBeans PHP IDE 中生成构造函数、Getter 和 Setter+]
 * link:http://netbeans.dzone.com/news/netbeans-project-specific-php-[+NetBeans 区：NetBeans 项目特定的 PHP 解释器+]
 * link:http://jaxenter.com/from-database-to-restful-web-service-to-html5-in-10-minutes-46064.html[+Jax 杂志：10 分钟内从数据库到 REST 风格的 Web 服务再到 HTML5+]
 
-*IDE、数据库和版本控制*
+=== IDE、数据库和版本控制
 
 * link:../docs/ide/oracle-db.html[+连接到 Oracle 数据库+]
 * link:../../features/ide/index.html[+基本 IDE 特性+]
@@ -206,8 +141,7 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../../features/ide/collaboration.html[+版本控制和开发者协作+]
 * link:http://nbdrupalsupport.dev.java.net/[+NetBeans IDE 的 Drupal 6.x 支持+]
 
-*博客*
+=== 博客
 
 * link:http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments[+"NetBeans for PHP" 博客+]
 * link:https://blogs.oracle.com/netbeanswebclient/[+NetBeans Web 客户端博客+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/platform.asciidoc b/netbeans.apache.org/src/content/kb/docs/platform.asciidoc
index 5345636..8f931e4 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, NetBeans Platform Learning Trail
 
 
-==== What is the NetBeans Platform?
+== What is the NetBeans Platform?
 
 The NetBeans Platform is a broad Java framework on which you can base large desktop applications. NetBeans IDE itself is link:http://platform.netbeans.org/screenshots.html[+one of the hundreds of applications+] based on the NetBeans Platform. The NetBeans Platform contains APIs that simplify the handling of windows, actions, files, and many other things typical in applications.
 
@@ -38,19 +38,7 @@ Each distinct feature in a NetBeans Platform application can be provided by a di
 
 You can also create new modules for NetBeans IDE itself. For example, you can write modules that make your favorite cutting-edge technologies available to users of NetBeans IDE. Alternatively, you might create a module to provide an additional editor feature.
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started
+== Getting Started
 
 * link:http://bits.netbeans.org/dev/javadoc/[+NetBeans API Javadoc+] (link:https://netbeans.org/downloads/zip.html[+download javadoc.zip for offline viewing+])
 * link:https://netbeans.org/projects/platform/lists/dev/archive[+NetBeans Developer Mailing List+]
@@ -59,74 +47,59 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::http
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start.html[+NetBeans Platform Quick Start+]
 * link:https://platform.netbeans.org/tutorials/nbm-dukescript.html[+NetBeans Platform Plugins with DukeScript+]
 * What's New in NetBeans Platform link:http://platform.netbeans.org/whatsnew/65.html[+6.5+], link:http://platform.netbeans.org/whatsnew/67.html[+6.7+], link:http://platform.netbeans.org/whatsnew/68.html[+6.8+], link:http://platform.netbeans.org/whatsnew/69.html[+6.9+], link:http://platform.netbeans.org/whatsnew/70.html[+7.0+], link:http://platform.netbeans.org/whatsnew/71.html[+7.1+], link:http://platform.netbeans.org/whatsnew/72.html[+7.2+], link:http://bits.netbeans.org/7.2.1/javadoc/a [...]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Porting
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Porting - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Porting
+== Porting
 
 * link:http://platform.netbeans.org/tutorials/nbm-porting-basic.html[+Porting Swing Components+]
 * link:http://platform.netbeans.org/tutorials/nbm-javafx.html[+Porting JavaFX Components+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Using the NetBeans APIs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Using the NetBeans APIs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Using the NetBeans APIs
+== Using the NetBeans APIs
 
-*NetBeans Platform Fundamentals*
+=== NetBeans Platform Fundamentals
 
 Are you new to the NetBeans Platform? If so, after following the documents in the "Getting Started" section above, please continue your learning path by reading the documents below. In particular, the book, published in 2014, "NetBeans Platform for Beginners", is very highly recommended!
 
-* NetBeans Platform for Beginners
+=== NetBeans Platform for Beginners
 
 image::../../images_www/screenshots/platform/nbp4beginners.jpg[role="left", link="https://leanpub.com/nbp4beginners"]
 
 * link:http://platform.netbeans.org/tutorials/nbm-runtime-container.html[+Runtime Container Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+Top 10 NetBeans APIs (Video)+]
 * link:http://wiki.netbeans.org/NbmIdioms[+NetBeans APIs in a Nutshell+]
-* Essential NetBeans Platform Reference Card
+
+=== Essential NetBeans Platform Reference Card
 
 image::../../images_www/screenshots/platform/refcard70.png[role="left", link="http://refcardz.dzone.com/refcardz/netbeans-platform-70"]
 
-* Quick Overviews
+==== Quick Overviews
+
 * link:http://netbeans.dzone.com/articles/netbeans-lookups-explained[+NetBeans Lookups Explained!+]
 * link:http://netbeans.dzone.com/news/netbeans-extension-points[+How Do NetBeans Extension Points Work?+]
-* Selection Management Series
+
+==== Selection Management Series
+
 * link:http://platform.netbeans.org/tutorials/nbm-selection-1.html[+Part 1: Selection Management Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-selection-2.html[+Part 2: Selection Management Tutorial II—Using Nodes+]
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi2.html[+Part 3: Nodes API Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-property-editors.html[+Part 4: Property Editor API Tutorial+]
 
-*Applications Built on the NetBeans Platform*
+=== Applications Built on the NetBeans Platform
+
+==== Applications
 
-* Applications
 * link:http://platform.netbeans.org/tutorials/nbm-paintapp.html[+Paint Application Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-feedreader.html[+Feed Reader Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-htmleditor.html[+HTML Editor Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-povray-1.html[+POV-Ray Renderer Tutorial+]
-* Common Scenarios
+
+==== Common Scenarios
+
 * link:http://platform.netbeans.org/tutorials/nbm-crud.html[+Create/Read/Update/Delete (CRUD)+]
 * link:http://platform.netbeans.org/tutorials/nbm-geospatial.html[+Geospatial+]
 * link:http://platform.netbeans.org/tutorials/nbm-workflow.html[+Workflow+]
 * link:http://platform.netbeans.org/tutorials/nbm-ide.html[+Development Environment+]
 
-*NetBeans APIs for Developing Code Editors*
+=== NetBeans APIs for Developing Code Editors
 
 * link:http://platform.netbeans.org/tutorials/nbm-filetype.html[+File Type Integration Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-javacc-lexer.html[+JavaCC Lexer Generator Integration Tutorial+]
@@ -142,7 +115,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://platform.netbeans.org/tutorials/nbm-java-hint.html[+Java Hints Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-code-template.html[+Code Templates Tutorial+]
 
-*NetBeans APIs for Visualizing Data*
+=== NetBeans APIs for Visualizing Data
 
 * link:http://platform.netbeans.org/tutorials/nbm-visual_library.html[+Visual Library Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start-visual.html[+Visual Library Tutorial for Java Applications+]
@@ -152,7 +125,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://java.dzone.com/news/how-add-resize-functionality-v[+How to Add Resize Functionality to Visual Applications in Java?+]
 * link:https://netbeans.org/community/magazine/html/04/visuallibrary.html[+Creative Uses of the Visual Library+]
 
-*Miscellaneous NetBeans Platform Tutorials*
+=== Miscellaneous NetBeans Platform Tutorials
 
 _(alphabetically ordered)_
 
@@ -168,116 +141,53 @@ _(alphabetically ordered)_
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi.html[+System Properties Module Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-wizard.html[+Wizard Module Tutorial+]
 
-*Command Line*
+=== Command Line
 
 * link:http://platform.netbeans.org/tutorials/nbm-ant.html[+Ant+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+Maven+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= YouTube: Five Simple Ways to Extend NetBeans IDE
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: YouTube: Five Simple Ways to Extend NetBeans IDE - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, YouTube: Five Simple Ways to Extend NetBeans IDE
+== YouTube: Five Simple Ways to Extend NetBeans IDE
 
-image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", link="http://www.youtube.com/watch?v=h4k5JpluJM8"]image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
+image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", link="http://www.youtube.com/watch?v=h4k5JpluJM8"]
 
-= Using Maven with the NetBeans Platform
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Using Maven with the NetBeans Platform - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Using Maven with the NetBeans Platform
+== Using Maven with the NetBeans Platform
+
+=== General Introductions
 
-* General Introductions
 * link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices in NetBeans IDE+]
 * link:http://mojo.codehaus.org/nbm-maven-plugin/[+About the NetBeans Module Maven Plugin+]
-* NetBeans Platform Tutorials
+
+=== NetBeans Platform Tutorials
+
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+NetBeans Platform Maven Command Line Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-quickstart.html[+NetBeans Platform Quick Start Using Maven+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesingle.html[+NetBeans Platform File Type Tutorial Using Maven+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesuite.html[+NetBeans Platform Selection Tutorial Using Maven+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-crud.html[+NetBeans Platform CRUD Tutorial Using Maven+]
-* Miscellaneous
+
+=== Miscellaneous
+
 * link:http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container[+Mavenized NetBeans Platform Runtime Container+]
 * link:http://netbeans.dzone.com/how-create-maven-nb-project-type[+Creating Custom Project Types with Maven and the NetBeans Platform+]
 * link:http://netbeans.dzone.com/nb-how-create-javahelp-mavenized[+Creating JavaHelp with Maven and the NetBeans Platform+]
 * link:http://netbeans.dzone.com/videos/screencast-maven-and-netbeans[+Screencast: Maven and the NetBeans Platform+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Diagnostics
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Diagnostics - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Diagnostics
+=== Diagnostics
 
 * link:http://platform.netbeans.org/tutorials/nbm-test.html[+NetBeans Platform Test Infrastructure Tutorial+]
 * link:http://platform.netbeans.org/tutorials/nbm-gesture.html[+NetBeans Platform Gesture Collection Infrastructure Tutorial+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Using OSGi with the NetBeans Platform
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Using OSGi with the NetBeans Platform - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Using OSGi with the NetBeans Platform
+== Using OSGi with the NetBeans Platform
 
 * link:http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html[+NetBeans Platform Quick Start Using OSGi+]
 * link:http://platform.netbeans.org/tutorials/nbm-emf.html[+NetBeans Platform EMF Integration Tutorial+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:http://prezi.com/b5ntwnpvu9j8/free-netbeans-platform-crash-course/[+Slides: Free NetBeans Platform Crash Course+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+Video: Top 10 NetBeans APIs+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/docs/screencasts.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://wiki.netbeans.org/wiki/view/VisualDatabaseExplorer[+A Visual Database Explorer for NetBeans+], by Toni Epple
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+DDL Visualizer: Visualize SQL Script with NetBeans+], by Damir Tesanovic
@@ -286,76 +196,37 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://wiki.netbeans.org/wiki/view/TranslateNetbeansModule[+Translate Your NetBeans Module+], by Michel Graciano
 * link:http://netbeans.dzone.com/tips/quickstart-guide-language-supp[+Quick Start: Creating Language Tools In NetBeans IDE+], by Jordi R. Cardona
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
+== Reference Material
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Reference Material
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Reference Material - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Reference Material
-
-*Official NetBeans Platform Reference Material
-*
+=== Official NetBeans Platform Reference Material
 
 * link:http://bits.netbeans.org/dev/javadoc/index.html[+NetBeans API Javadoc+]
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+Module System API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[+Window System API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[+Filesystems API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[+Datasystems API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[+Nodes API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[+Explorer API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[+Property Sheet Customization+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[+Visual Library API+]
-
 * link:http://bits.netbeans.org/netbeans/trunk/javadoc/org-openide-util/org/openide/util/doc-files/api.html[+Utilities API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/branding.html[+Branding+]
-
 * link:http://bits.netbeans.org/dev/javadoc/layers.html[+Description of Layer Registrations in NetBeans APIs+]
 * link:http://bits.netbeans.org/dev/javadoc/apichanges.html[+Latest NetBeans API Changes+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
-*Online Magazine Articles
-*
+=== Online Magazine Articles
 
 * link:http://java.sun.com/developer/technicalArticles/javase/extensible/index.html[+Creating Extensible Applications With the Java Platform+]
 * link:http://java.dzone.com/news/how-create-pluggable-photo-alb[+How to Create a Pluggable Photo Album in Java+]
 * link:https://netbeans.org/community/magazine/html/04/maven.html[+NetBeans Platform Development with Maven and Mevenide+]
 
-*NetBeans Platform Blogs
-*
+=== NetBeans Platform Blogs
 
 * link:http://blogs.oracle.com/geertjan[+Geertjan Wielenga+], link:http://eppleton.de[+Toni Epple+], link:http://www.aljoscha-rittner.de/blog/[+Aljoscha Rittner (German)+], link:http://blogs.oracle.com/scblog[+Sandip Chitale+], link:http://blogs.oracle.com/jglick[+Jesse Glick+], link:https://www.java.net/blogs/timboudreau[+Tim Boudreau+], link:http://blogs.kiyut.com/tonny/[+Tonny Kohar+].
 
-*NetBeans Platform Books
-*
+=== NetBeans Platform Books
 
 * link:https://leanpub.com/nbp4beginners[+"NetBeans Platform for Beginners"+]
 
@@ -365,4 +236,4 @@ image::../../images_www/screenshots/platform/nbp4beginners.jpg[role="left", link
 * link:https://www.packtpub.com/netbeans-platform-6-9-developers-guide/book[+"NetBeans Platform 6.9 Developer's Guide"+]
 * link:http://www.apress.com/9781430224174[+"The Definitive Guide to NetBeans Platform 6.5"+]
 * link:http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802[+"Rich Client Programming: Plugging into the NetBeans Platform"+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/platform_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/platform_ca.asciidoc
index 9f3e9e9..4e9f697 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform_ca.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge plataforma NetBeans
 
 
-==== Què és la plataforma NetBeans?
+== Què és la plataforma NetBeans?
 
 La plataforma NetBeans és un ampli framework basat en Swing, amb el qual podeu basar les vostres grans aplicacions d'escriptori. L'IDE per si mateix està basat en la plataforma NetBeans. La plataforma conté APIs que simplifiquen en maneig de finestres, accions, fitxers, i d'altres coses típiques en aplicacions.
 
@@ -38,60 +38,41 @@ Cada una de les diferents característiques de l'aplicació de la plataforma Net
 
 També podeu crear mòduls per al mateix NetBeans. Per exemple, podeu escriure els vostres mòduls que proporcionin tecnologies en estat d'art als usuaris de l'IDE NetBeans. Alternativament, podeu crear un mòdul que proporcioni característiques addicionals a l'editor.
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Com començar
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Com començar - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Com començar
+== Com començar
 
 * link:http://platform.netbeans.org/tutorials/nbm-google.html[+Inici ràpid als complements de NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start.html[+Inici ràpid a la plataforma NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-porting-basic.html[+Guia d'aprenentatge de portabilitat de la plataforma NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Guies d'aprenentatge i Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Guies d'aprenentatge i Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Guies d'aprenentatge i Articles
+== Guies d'aprenentatge i Articles
 
-*Aplicacions construïdes en la plataforma NetBeans*
+=== Aplicacions construïdes en la plataforma NetBeans
 
 * link:http://platform.netbeans.org/tutorials/nbm-crud.html[+Guia d'aprenentatge d'aplicació CRUD+]
 * link:http://platform.netbeans.org/tutorials/nbm-paintapp.html[+Guia d'aprenentatge de l'aplicació de dibuix+]
 * link:http://platform.netbeans.org/tutorials/nbm-feedreader.html[+Guia d'aprenentatge del lector de Feeds+]
 * link:http://platform.netbeans.org/tutorials/nbm-htmleditor.html[+Guia d'aprenentatge de l'editor HTML+]
 
-*Trets Fonamentals de la plataforma NetBeans*
+=== Trets Fonamentals de la plataforma NetBeans
 
 * link:http://platform.netbeans.org/tutorials/nbm-runtime-container.html[+Guia d'aprenentatge del contenidor d'execució+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+Les 10 principals APIs de NetBeans (Vídeo)+]
 * link:http://platform.netbeans.org/tutorials/nbm-idioms.html[+APIs de NetBeans en essència+]
-* Sèries introducció a resolució
+
+==== Sèries introducció a resolució
+
 * link:http://www.ssw.uni-linz.ac.at/Teaching/Lectures/SpezialLVA/TulachWielenga/part1.html[+Exemple WordApp - 1a Part+]
 * link:http://www.ssw.uni-linz.ac.at/Teaching/Lectures/SpezialLVA/TulachWielenga/part2.html[+Exemple WordApp - 2a Part+]
 * link:http://www.ssw.uni-linz.ac.at/Teaching/Lectures/SpezialLVA/TulachWielenga/part3.html[+Exemple WordApp - 3a Part+]
-* Sèries de gestió de selecció
+
+==== Sèries de gestió de selecció
+
 * link:http://platform.netbeans.org/tutorials/nbm-selection-1.html[+1a Part: Guia d'aprenentatge gestió de selecció+]
 * link:http://platform.netbeans.org/tutorials/nbm-selection-2.html[+2a Part: Guia d'aprenentatge gestió de selecció II—Utilitzant nodes+]
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi2.html[+3a Part: Guia d'aprenentatge de l'API de nodes+]
 * link:http://platform.netbeans.org/tutorials/nbm-property-editors.html[+4a Part: Guia d'aprenentatge de l'API de l'editor+]
 
-*APIS de NetBeans pel desenvolupament o expansió d'un editor*
+==== APIS de NetBeans pel desenvolupament o expansió d'un editor
 
 * link:http://wiki.netbeans.org/How_to_create_support_for_a_new_language[+Guia d'aprenentatge suport nou llenguatge+]
 * link:http://platform.netbeans.org/tutorials/nbm-filetype.html[+Guia d'aprenentatge d'integració de tipus de fitxers+]
@@ -103,7 +84,7 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://platform.netbeans.org/tutorials/nbm-java-hint.html[+Guia d'aprenentatge d'indicacions Java+]
 * link:http://platform.netbeans.org/tutorials/nbm-code-template.html[+Guia d'aprenentatge de plantilles de codi+]
 
-*APIs de NetBeans per a la visualització de dades*
+==== APIs de NetBeans per a la visualització de dades
 
 * link:http://platform.netbeans.org/tutorials/nbm-visual_library.html[+Guia d'aprenentatge de la biblioteca visual+]
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+Visualitzar Scripts SQL amb la plataforma NetBeans+]
@@ -112,7 +93,7 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://java.dzone.com/news/how-add-resize-functionality-v[+Com afegir la funcionalitat de re-dimensió a aplicacions visuals en Java?+]
 * link:https://netbeans.org/community/magazine/html/04/visuallibrary.html[+Ús creatiu de la biblioteca visual+]
 
-*APIs miscel·lànies de NetBeans*
+==== APIs miscel·lànies de NetBeans
 
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi.html[+Guia d'aprenentatge del mòdul de propietats del sistema+]
 * link:http://platform.netbeans.org/tutorials/nbm-options.html[+Guia d'aprenentatge del mòdul de finestra d'opcions+]
@@ -120,19 +101,8 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://platform.netbeans.org/tutorials/nbm-projectextension.html[+Guia d'aprenentatge del mòdul d'extensió de tipus de projecte+]
 * link:http://platform.netbeans.org/tutorials/nbm-projectsamples.html[+Guia d'aprenentatge del mòdul mostra de projecte+]
 * link:http://platform.netbeans.org/tutorials/nbm-filetemplates.html[+Guia d'aprenentatge del mòdul plantilla de fitxer+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+==== Screencasts
 
 * link:http://netbeans.dzone.com/videos/free-netbeans-platform-crash[+Vídeo: Curs gratuït de trencament de la plataforma NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+Vídeo: Les 10 APIs principals de NetBeans+]
@@ -146,41 +116,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://netbeans.tv/screencasts/Top-10-NetBeans-APIs-(Part-8)-442/[+8a Part: API paleta comú+]
 * link:http://netbeans.tv/screencasts/Top-10-NetBeans-APIs-(Part-9)-443/[+9a Part: API biblioteca visual+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/docs/screencasts.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Aplicacions d'exemple
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Aplicacions d'exemple - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Aplicacions d'exemple
+== Aplicacions d'exemple
 
 * link:http://apress.com/book/downloadfile/4393[+Exemples del llibre "La guia definitiva de la plataforma NetBeans"+]
 * link:https://netbeans.org/kb/samples/feedreader.html?me=6&su=1[+Lector de Feeds RSS+]
 * link:https://netbeans.org/kb/samples/paint-application.html?me=6&su=2[+Dibuixar+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/samples/index.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Documents aportats per la comunitat
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documents aportats per la comunitat - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documents aportats per la comunitat
+== Documents aportats per la comunitat
 
 * link:http://wiki.netbeans.org/wiki/view/VisualDatabaseExplorer[+Un explorador visual de bases de dades per a NetBeans+], per Toni Epple
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+Visualitzador DDL: Visualitzar scripts SQL amb NetBeans+], per Damir Tesanovic
@@ -189,63 +131,34 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://wiki.netbeans.org/wiki/view/TranslateNetbeansModule[+Traduïu el vostre mòdul NetBeans+], per Michel Graciano
 * link:http://netbeans.dzone.com/tips/quickstart-guide-language-supp[+Inici ràpid: Creant eines de llenguatge en l'IDE NetBeans+], per Jordi R. Cardona
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Altres recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Altres recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Altres recursos
+== Altres recursos
 
-*Recursos oficials de la plataforma NetBeans
-*
+=== Recursos oficials de la plataforma NetBeans
 
 * link:http://bits.netbeans.org/dev/javadoc/index.html[+API Javadoc NetBeans+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+API mòdul sistema+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[+API sistema de finestres+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[+API sistema de fitxers+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[+API dades del sistema+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[+API nodes+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[+API explorador+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[+Personalització del ful de propietats+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[+API biblioteca visual+]
-
 * link:http://bits.nbextras.org/netbeans/trunk/javadoc/org-openide-util/org/openide/util/doc-files/api.html[+API utilitats+]
-
 * link:http://bits.nbextras.org/dev/javadoc/layers.html[+Descripció dels registraments de les APIs de NetBeans+]
 * link:http://bits.netbeans.org/dev/javadoc/apichanges.html[+Últims canvis a les APIs de NetBeans+]
 
-*Articles de revistes en línia
-*
+=== Articles de revistes en línia
 
 * link:http://java.sun.com/developer/technicalArticles/javase/extensible/index.html[+Creant aplicacions extensibles amb la plataforma Java+]
 * link:http://java.dzone.com/news/how-create-pluggable-photo-alb[+Com crear un àlbum de fotos connectable en Java+]
 * link:https://netbeans.org/community/magazine/html/04/maven.html[+Desenvolupament de plataforma NetBeans amb Maven i Mevenide+]
 
-*Blogs de la plataforma NetBeans
-*
+=== Blogs de la plataforma NetBeans
 
 link:http://blogs.oracle.com/geertjan[+Geertjan Wielenga+],link:http://blogs.oracle.com/scblog[+Sandip Chitale+],link:http://blogs.oracle.com/jglick[+Jesse Glick+],link:http://weblogs.java.net/blog/timboudreau/[+Tim Boudreau+]link:http://blogs.kiyut.com/tonny/[+Tonny Kohar+],link:http://eppleton.com/blog/[+Toni Epple+]
 
-*Llibres de la pataforma NetBeans
-*
+=== Llibres de la pataforma NetBeans
 
 * link:http://apress.com/book/view/9781430224174[+"La guia definitiva a la plataforma NetBeans"+]
 * link:http://www.sun.com/books/catalog/rich_client_programming.xml[+"Programant un client ric: connectant-ho a la plataforma NetBeans"+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/platform_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/platform_ja.asciidoc
index f91f9d2..b010c1c 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform_ja.asciidoc
@@ -29,8 +29,7 @@
 :description: NetBeansプラットフォームの学習 - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, NetBeansプラットフォームの学習
 
-
-==== NetBeansプラットフォームとは
+== NetBeansプラットフォームとは
 
 NetBeansプラットフォームは、大規模なデスクトップ・アプリケーションの基礎にすることができる、広範なJavaフレームワークです。NetBeans IDE自体は、NetBeansプラットフォームに基づいたlink:http://platform.netbeans.org/screenshots.html[+数百のアプリケーションの1つ+]です。NetBeansプラットフォームは、ウィンドウ、アクション、ファイル、およびアプリケーションに一般的なその他の多くの処理を容易にするAPIを含んでいます。
 
@@ -38,19 +37,7 @@ NetBeansプラットフォーム・アプリケーションのそれぞれの機
 
 NetBeans IDE自体に新しいモジュールを作成することもできます。たとえば、好みの最先端技術をNetBeans IDEのユーザーが使用できるようにするモジュールを作成できます。または、追加のエディタ機能を提供するモジュールを作成することもできます。
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= 開始
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始
+== 開始
 
 * link:http://bits.netbeans.org/dev/javadoc/[+NetBeans API Javadoc+] (link:https://netbeans.org/downloads/zip.html[+オフライン表示用にjavadoc.zipをダウンロード+])
 * link:https://netbeans.org/projects/platform/lists/dev/archive[+NetBeans開発者のメーリング・リスト+]
@@ -58,44 +45,23 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::http
 * link:http://platform.netbeans.org/tutorials/nbm-google.html[+NetBeansプラグイン・クイック・スタート+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start.html[+NetBeansプラットフォームのクイック・スタート+]
 * NetBeansプラットフォームlink:http://platform.netbeans.org/whatsnew/65.html[+6.5+]、link:http://platform.netbeans.org/whatsnew/67.html[+6.7+]、link:http://platform.netbeans.org/whatsnew/68.html[+6.8+]、link:http://platform.netbeans.org/whatsnew/69.html[+6.9+]、link:http://platform.netbeans.org/whatsnew/70.html[+7.0+]、link:http://platform.netbeans.org/whatsnew/71.html[+7.1+]、link:http://platform.netbeans.org/whatsnew/72.html[+7.2+]、link:http://bits.netbeans.org/7.2.1/javadoc/apichanges.html[+7.2.1+] [...]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 移植
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 移植 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 移植
+== 移植
 
 * link:http://platform.netbeans.org/tutorials/nbm-porting-basic.html[+Swingコンポーネントの移植+]
 * link:http://platform.netbeans.org/tutorials/nbm-javafx.html[+JavaFXコンポーネントの移植+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= NetBeans APIの使用
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: NetBeans APIの使用 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, NetBeans APIの使用
+== NetBeans APIの使用
 
-*NetBeansプラットフォームの基礎*
+=== NetBeansプラットフォームの基礎
 
 NetBeansプラットフォームの初心者ですか。初心者の場合は、前述の開始の項にあるドキュメントに従った後に、次のドキュメントを読んで学習パスを続行してください。特に、次にリストされている4つの「セレクション管理シリーズ」では、NetBeansプラットフォームの様々な部分を統合する方法が示されます。
 
 * link:http://platform.netbeans.org/tutorials/nbm-runtime-container.html[+実行時コンテナのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+NetBeans APIのトップ10 (ビデオ)+]
 * link:http://wiki.netbeans.org/NbmIdioms[+NutshellでのNetBeans API+]
-* 重要なNetBeansプラットフォーム・リファレンス・カード
+
+=== 重要なNetBeansプラットフォーム・リファレンス・カード
 
 image::../../images_www/screenshots/platform/refcard70.png[role="left", link="http://refcardz.dzone.com/refcardz/netbeans-platform-70"]
 
@@ -108,21 +74,24 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi2.html[+パート3: ノードAPIのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-property-editors.html[+パート4: プロパティ・エディタAPIのチュートリアル+]
 
-*NetBeansプラットフォーム上でビルドされたアプリケーション*
+=== NetBeansプラットフォーム上でビルドされたアプリケーション
+
+==== アプリケーション
 
-* アプリケーション
 * link:http://platform.netbeans.org/tutorials/nbm-paintapp.html[+ペイント・アプリケーションのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-feedreader.html[+フィード・リーダーのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-htmleditor.html[+HTMLエディタのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-povray-1.html[+POV-Rayレンダラのチュートリアル+]
-* 一般的なシナリオ
+
+==== 一般的なシナリオ
+
 * link:http://platform.netbeans.org/tutorials/nbm-crud.html[+作成/読取り/更新/削除(CRUD)+]
 * link:http://platform.netbeans.org/tutorials/nbm-geospatial.html[+地理空間+]
 * link:http://platform.netbeans.org/tutorials/nbm-workflow.html[+ワークフロー+]
 * link:http://platform.netbeans.org/tutorials/nbm-3d.html[+3Dモデリング+]
 * link:http://platform.netbeans.org/tutorials/nbm-ide.html[+開発環境+]
 
-*コード・エディタを開発するためのNetBeans API*
+=== コード・エディタを開発するためのNetBeans API
 
 * link:http://platform.netbeans.org/tutorials/nbm-filetype.html[+ファイル・タイプ統合のチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-javacc-lexer.html[+JavaCCレクサー・ジェネレータの統合のチュートリアル+]
@@ -138,7 +107,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://platform.netbeans.org/tutorials/nbm-java-hint.html[+Javaヒントのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-code-template.html[+コード・テンプレートのチュートリアル+]
 
-*データの視覚化のためのNetBeans API*
+=== データの視覚化のためのNetBeans API
 
 * link:http://platform.netbeans.org/tutorials/nbm-visual_library.html[+ビジュアル・ライブラリのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start-visual.html[+Javaアプリケーションのビジュアル・ライブラリのチュートリアル+]
@@ -148,7 +117,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://java.dzone.com/news/how-add-resize-functionality-v[+Javaでのビジュアル・アプリケーションへのサイズ変更機能の追加方法+]
 * link:https://netbeans.org/community/magazine/html/04/visuallibrary.html[+ビジュアル・ライブラリの独創的な使用+]
 
-*NetBeansプラットフォームのその他のチュートリアル*
+=== NetBeansプラットフォームのその他のチュートリアル
 
 _(アルファベット順)_
 
@@ -164,136 +133,59 @@ _(アルファベット順)_
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi.html[+システム・プロパティ・モジュールのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-wizard.html[+ウィザード・モジュールのチュートリアル+]
 
-*コマンドライン*
+=== コマンドライン
 
 * link:http://platform.netbeans.org/tutorials/nbm-ant.html[+Ant+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+Maven+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= YouTube: NetBeans IDEを拡張する5つの簡単な方法
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: YouTube: NetBeans IDEを拡張する5つの簡単な方法 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, YouTube: NetBeans IDEを拡張する5つの簡単な方法
+== YouTube: NetBeans IDEを拡張する5つの簡単な方法
 
 image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", link="http://www.youtube.com/watch?v=h4k5JpluJM8"]image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= MavenとNetBeansプラットフォームの使用
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: MavenとNetBeansプラットフォームの使用 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, MavenとNetBeansプラットフォームの使用
+== MavenとNetBeansプラットフォームの使用
+
+=== 一般的な紹介
 
-* 一般的な紹介
 * link:http://wiki.netbeans.org/MavenBestPractices[+NetBeans IDEでのMavenのベスト・プラクティス+]
 * link:http://mojo.codehaus.org/nbm-maven-plugin/[+NetBeansモジュールのMavenプラグインについて+]
-* NetBeansプラットフォームのチュートリアル
+
+==== NetBeansプラットフォームのチュートリアル
+
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+NetBeansプラットフォームのMavenコマンドラインのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-quickstart.html[+Mavenを使用したNetBeansプラットフォームのクイック・スタート+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesingle.html[+Mavenを使用したNetBeansプラットフォームのファイル・タイプのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesuite.html[+Mavenを使用したNetBeansプラットフォームの選択のチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-crud.html[+Mavenを使用したNetBeansプラットフォームのCRUDのチュートリアル+]
-* その他
+
+==== その他
+
 * link:http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container[+Mavenized NetBeansプラットフォーム実行時コンテナ+]
 * link:http://netbeans.dzone.com/how-create-maven-nb-project-type[+MavenおよびNetBeansプラットフォームを使用したカスタム・プロジェクト・タイプの作成+]
 * link:http://netbeans.dzone.com/nb-how-create-javahelp-mavenized[+MavenおよびNetBeansプラットフォームを使用したJavaHelpの作成+]
 * link:http://netbeans.dzone.com/videos/screencast-maven-and-netbeans[+スクリーンキャスト: MavenおよびNetBeansプラットフォーム+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 診断
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 診断 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 診断
+== 診断
 
 * link:http://platform.netbeans.org/tutorials/nbm-test.html[+NetBeansプラットフォームのテスト・インフラストラクチャのチュートリアル+]
 * link:http://platform.netbeans.org/tutorials/nbm-gesture.html[+NetBeansプラットフォームのジェスチャー収集インフラストラクチャのチュートリアル+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= OSGiとNetBeansプラットフォームの使用
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: OSGiとNetBeansプラットフォームの使用 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, OSGiとNetBeansプラットフォームの使用
+== OSGiとNetBeansプラットフォームの使用
 
 * link:http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html[+OSGiを使用したNetBeansプラットフォーム・クイック・スタート+]
 * link:http://platform.netbeans.org/tutorials/nbm-emf.html[+NetBeansプラットフォームEMF統合のチュートリアル+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * link:http://netbeans.dzone.com/videos/free-netbeans-platform-crash[+ビデオ: NetBeansプラットフォームの速習講座(無料)+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+ビデオ: NetBeans APIのトップ10+]
 
-image::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/docs/screencasts.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= サンプル・アプリケーション
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: サンプル・アプリケーション - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, サンプル・アプリケーション
+== サンプル・アプリケーション
 
 * link:http://apress.com/book/downloadfile/4393[+書籍『The Definitive Guide to NetBeans Platform』のサンプル+]
 * link:https://netbeans.org/kb/samples/feedreader.html?me=6&su=1[+RSSフィード・リーダー+]
 * link:https://netbeans.org/kb/samples/paint-application.html?me=6&su=2[+ペイント+]
 
-image::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/samples/index.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://wiki.netbeans.org/wiki/view/VisualDatabaseExplorer[+NetBeansのビジュアル・データベース・エクスプローラ+]、Toni Epple著
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+DDL表示機能: NetBeansを使用したSQLスクリプトの視覚化+]、Damir Tesanovic著
@@ -302,77 +194,38 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://wiki.netbeans.org/wiki/view/TranslateNetbeansModule[+NetBeansモジュールの翻訳+]、Michel Graciano著
 * link:http://netbeans.dzone.com/tips/quickstart-guide-language-supp[+クイック・スタート: NetBeans IDEでの言語ツールの作成+]、Jordi R. Cardona著
 
-image::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
+== 参考資料
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= 参考資料
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 参考資料 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 参考資料
-
-*NetBeansプラットフォームの公式参考資料
-*
+=== NetBeansプラットフォームの公式参考資料
 
 * link:http://bits.netbeans.org/dev/javadoc/index.html[+NetBeans API Javadoc+]
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+モジュール・システムAPI+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[+ウィンドウ・システムAPI+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[+ファイル・システムAPI+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[+データ・システムAPI+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[+ノードAPI+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[+エクスプローラAPI+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[+プロパティ・シートのカスタマイズ+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[+ビジュアル・ライブラリAPI+]
-
 * link:http://bits.netbeans.org/netbeans/trunk/javadoc/org-openide-util/org/openide/util/doc-files/api.html[+ユーティリティAPI+]
-
 * link:http://bits.netbeans.org/dev/javadoc/layers.html[+NetBeans APIでのレイヤー登録の説明+]
 * link:http://bits.netbeans.org/dev/javadoc/apichanges.html[+NetBeans APIの最新の変更+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
-*オンライン・マガジンの記事
-*
+=== オンライン・マガジンの記事
 
 * link:http://java.sun.com/developer/technicalArticles/javase/extensible/index.html[+Javaプラットフォームを使用した拡張可能アプリケーションの作成+]
 * link:http://java.dzone.com/news/how-create-pluggable-photo-alb[+Javaでのプラガブルなフォト・アルバムの作成+]
 * link:https://netbeans.org/community/magazine/html/04/maven.html[+MavenとMevenideを使用したNetBeansプラットフォーム開発+]
 
-*NetBeansプラットフォームに関するブログ
-*
+=== NetBeansプラットフォームに関するブログ
 
 * link:http://blogs.oracle.com/geertjan[+Geertjan Wielenga+]、link:http://eppleton.com/blog/[+Toni Epple+]、link:http://www.aljoscha-rittner.de/blog/[+Aljoscha Rittner (ドイツ)+]、link:http://blogs.oracle.com/scblog[+Sandip Chitale+]、link:http://blogs.oracle.com/jglick[+Jesse Glick+]、link:http://weblogs.java.net/blog/timboudreau/[+Tim Boudreau+]、link:http://blogs.kiyut.com/tonny/[+Tonny Kohar+]。
 
-*NetBeansプラットフォームに関する書籍
-*
+=== NetBeansプラットフォームに関する書籍
 
 * link:http://www.apress.com/9781430241010[+The Definitive Guide to NetBeans Platform 7+]
 * link:https://www.packtpub.com/netbeans-platform-6-9-developers-guide/book[+NetBeans Platform 6.9 Developer's Guide+]
 * link:http://www.apress.com/9781430224174[+The Definitive Guide to NetBeans Platform 6.5+]
 * link:http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802[+Rich Client Programming: Plugging into the NetBeans Platform+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/platform_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/platform_pt_BR.asciidoc
index 1d60f0f..f2dc6b6 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform_pt_BR.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Trilha do Aprendizado da Plataforma NetBeans
 
 
-==== O que é a Plataforma NetBeans?
+== O que é a Plataforma NetBeans?
 
 A Plataforma NetBeans é uma ampla framework Java em que você pode basear grandes aplicações desktop. O NetBeans IDE é, em si, link:http://platform.netbeans.org/screenshots.html[+uma das centenas de aplicações+] baseadas na Plataforma NetBeans. A Plataforma NetBeans contém APIs que simplificam o tratamento de janelas, ações, arquivos e muitos outros itens típicos em aplicações.
 
@@ -38,19 +38,7 @@ Cada funcionalidade distinta em uma aplicação da Plataforma NetBeans pode ser
 
 Você também pode criar novos módulos para o próprio NetBeans IDE. Por exemplo, você pode escrever módulos que disponibilizem suas tecnologias de última geração favoritas para usuários do NetBeans IDE. Como alternativa, você pode criar um módulo para fornecer uma funcionalidade de editor adicional.
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Introdução
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Introdução - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Introdução
+== Introdução
 
 * link:http://bits.netbeans.org/dev/javadoc/[+Javadoc da API do NetBeans+] (link:https://netbeans.org/downloads/zip.html[+faça download de javadoc.zip para obter uma exibição off-line+])
 * link:https://netbeans.org/projects/platform/lists/dev/archive[+Lista de Correspondências do Desenvolvedor do NetBeans+]
@@ -58,71 +46,56 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::http
 * link:http://platform.netbeans.org/tutorials/nbm-google.html[+Início Rápido do Plug-in do NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start.html[+Início Rápido da Plataforma NetBeans+]
 * Novidades na Plataforma NetBeans link:http://platform.netbeans.org/whatsnew/65.html[+6.5+], link:http://platform.netbeans.org/whatsnew/67.html[+6.7+], link:http://platform.netbeans.org/whatsnew/68.html[+6.8+], link:http://platform.netbeans.org/whatsnew/69.html[+6.9+], link:http://platform.netbeans.org/whatsnew/70.html[+7.0+], link:http://platform.netbeans.org/whatsnew/71.html[+7.1+], link:http://platform.netbeans.org/whatsnew/72.html[+7.2+], link:http://bits.netbeans.org/7.2.1/javadoc/ [...]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Portabilidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Portabilidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Portabilidade
+== Portabilidade
 
 * link:http://platform.netbeans.org/tutorials/nbm-porting-basic.html[+Portabilidade de Componentes de Swing+]
 * link:http://platform.netbeans.org/tutorials/nbm-javafx.html[+Portabilidade de Componentes JavaFX+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Usando as APIs do NetBeans
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Usando as APIs do NetBeans - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Usando as APIs do NetBeans
+== Usando as APIs do NetBeans
 
-*Princípios Básicos da Plataforma NetBeans*
+=== Princípios Básicos da Plataforma NetBeans
 
 Você é novato na Plataforma NetBeans? Se sim, depois de seguir os documentos na seção "Introdução" acima, continue o caminho do aprendizado lento os documentos a seguir. Especificamente, a "Série de Gerenciamento de Seleção", em quatro partes, listada a seguir, mostrará como as várias partes da Plataforma NetBeans se une e se completam!
 
 * link:http://platform.netbeans.org/tutorials/nbm-runtime-container.html[+Tutorial do Contêiner de Runtime+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+As 10 Principais APIs do NetBeans (Vídeo)+]
 * link:http://wiki.netbeans.org/NbmIdioms[+APIs NetBeans em Poucas Palavras+]
-* Cartão de Referência Essencial da Plataforma NetBeans
+
+==== Cartão de Referência Essencial da Plataforma NetBeans
 
 image::../../images_www/screenshots/platform/refcard70.png[role="left", link="http://refcardz.dzone.com/refcardz/netbeans-platform-70"]
 
-* Visões Gerais Rápidas
+==== Visões Gerais Rápidas
+
 * link:http://netbeans.dzone.com/articles/netbeans-lookups-explained[+Pesquisas NetBeans Explicadas!+]
 * link:http://netbeans.dzone.com/news/netbeans-extension-points[+Como Funcionam os Pontos de Extensão do NetBeans?+]
-* Série de Gerenciamento da Seleção
+
+==== Série de Gerenciamento da Seleção
+
 * link:http://platform.netbeans.org/tutorials/nbm-selection-1.html[+Parte 1: Tutorial de Gerenciamento da Seleção+]
 * link:http://platform.netbeans.org/tutorials/nbm-selection-2.html[+Parte 2: Tutorial de Gerenciamento da Seleção Parte II—Usando Nós+]
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi2.html[+Parte 3: Tutorial das APIs dos Nós+]
 * link:http://platform.netbeans.org/tutorials/nbm-property-editors.html[+Parte 4: Tutorial das APIs do Editor de Propriedades+]
 
-*Aplicações Construídas na Plataforma NetBeans*
+=== Aplicações Construídas na Plataforma NetBeans
+
+==== Aplicações
 
-* Aplicações
 * link:http://platform.netbeans.org/tutorials/nbm-paintapp.html[+Tutorial da Aplicação Paint+]
 * link:http://platform.netbeans.org/tutorials/nbm-feedreader.html[+Tutorial do Feed Reader+]
 * link:http://platform.netbeans.org/tutorials/nbm-htmleditor.html[+Tutorial do Editor HTML+]
 * link:http://platform.netbeans.org/tutorials/nbm-povray-1.html[+Tutorial do Renderizador do POV-Ray+]
-* Cenários Comuns
+
+==== Cenários Comuns
+
 * link:http://platform.netbeans.org/tutorials/nbm-crud.html[+Create/Read/Update/Delete (CRUD)+]
 * link:http://platform.netbeans.org/tutorials/nbm-geospatial.html[+Geoespacial+]
 * link:http://platform.netbeans.org/tutorials/nbm-workflow.html[+Fluxo de trabalho+]
 * link:http://platform.netbeans.org/tutorials/nbm-3d.html[+Modelagem 3D+]
 * link:http://platform.netbeans.org/tutorials/nbm-ide.html[+Ambiente de Desenvolvimento+]
 
-*APIs NetBeans para Desenvolvimento de Editores de Código*
+=== APIs NetBeans para Desenvolvimento de Editores de Código
 
 * link:http://platform.netbeans.org/tutorials/nbm-filetype.html[+Tutorial de Integração de Tipo de Arquivo+]
 * link:http://platform.netbeans.org/tutorials/nbm-javacc-lexer.html[+Tutorial de Integração do Gerador do Java CC Lexer+]
@@ -138,7 +111,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://platform.netbeans.org/tutorials/nbm-java-hint.html[+Tutorial de Dicas Java+]
 * link:http://platform.netbeans.org/tutorials/nbm-code-template.html[+Tutorial de Modelos de Código+]
 
-*APIs NetBeans para Visualização de Dados*
+=== APIs NetBeans para Visualização de Dados
 
 * link:http://platform.netbeans.org/tutorials/nbm-visual_library.html[+Tutorial da Biblioteca Visual+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start-visual.html[+Tutorial da Biblioteca Visual para Aplicações Java+]
@@ -148,7 +121,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://java.dzone.com/news/how-add-resize-functionality-v[+Como Adicionar uma Funcionalidade de Redimensionar a Aplicações Visuais no Java?+]
 * link:https://netbeans.org/community/magazine/html/04/visuallibrary.html[+Usos Criativos da Biblioteca Visual+]
 
-*Diversos Tutoriais da Plataforma NetBeans *
+=== Diversos Tutoriais da Plataforma NetBeans
 
 _(classificados em ordem alfabética) _
 
@@ -164,136 +137,59 @@ _(classificados em ordem alfabética) _
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi.html[+Tutorial do Módulo de Propriedades do Sistema+]
 * link:http://platform.netbeans.org/tutorials/nbm-wizard.html[+Tutorial do Módulo de Assistente+]
 
-*Linha de Comando*
+=== Linha de Comando
 
 * link:http://platform.netbeans.org/tutorials/nbm-ant.html[+Ant+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+Maven+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= YouTube: Cinco Maneiras Simples de Estender o NetBeans IDE
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: YouTube: Cinco Maneiras Simples de Estender o NetBeans IDE - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, YouTube: Cinco Maneiras Simples de Estender o NetBeans IDE
+== YouTube: Cinco Maneiras Simples de Estender o NetBeans IDE
 
 image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", link="http://www.youtube.com/watch?v=h4k5JpluJM8"]image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Utilizando Maven com a Plataforma NetBeans
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Utilizando Maven com a Plataforma NetBeans - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Utilizando Maven com a Plataforma NetBeans
+== Utilizando Maven com a Plataforma NetBeans
+
+=== Introduções Gerais
 
-* Introduções Gerais
 * link:http://wiki.netbeans.org/MavenBestPractices[+Melhores Práticas do Maven no NetBeans IDE+]
 * link:http://mojo.codehaus.org/nbm-maven-plugin/[+Sobre o Plug-in Maven do Módulo NetBeans+]
-* Tutoriais da Plataforma NetBeans
+
+==== Tutoriais da Plataforma NetBeans
+
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+Tutorial da Linha de Comando Maven da Plataforma NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-quickstart.html[+Início Rápido da Plataforma NetBeans Utilizando Maven+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesingle.html[+Tutorial do Tipo de Arquivo da Plataforma NetBeans Usando Maven+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesuite.html[+Tutorial de Seleção da Plataforma NetBeans Usando Maven+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-crud.html[+Tutorial do CRUD da Plataforma NetBeans Usando Maven+]
-* Diversos
+
+==== Diversos
+
 * link:http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container[+Contêiner do Runtime da Plataforma NetBeans Mavenizada+]
 * link:http://netbeans.dzone.com/how-create-maven-nb-project-type[+Criando Tipos de Projeto Personalizados com Maven e a Plataforma NetBeans+]
 * link:http://netbeans.dzone.com/nb-how-create-javahelp-mavenized[+Criando JavaHelp com Maven e com a Plataforma NetBeans+]
 * link:http://netbeans.dzone.com/videos/screencast-maven-and-netbeans[+Screencast: Maven e a Plataforma NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Diagnóstico
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Diagnóstico - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Diagnóstico
+== Diagnóstico
 
 * link:http://platform.netbeans.org/tutorials/nbm-test.html[+Tutorial da Infraestrutura de Teste da Plataforma NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-gesture.html[+Tutorial da Infraestutura da Coleção da Gestão da Plataforma Netbeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Utilizando OSGi com a plataforma NetBeans
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Utilizando OSGi com a plataforma NetBeans - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Utilizando OSGi com a plataforma NetBeans
+== Utilizando OSGi com a plataforma NetBeans
 
 * link:http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html[+Início Rápido da Plataforma NetBeans Utilizando OSGi+]
 * link:http://platform.netbeans.org/tutorials/nbm-emf.html[+Tutorial de Integração de EMF da Plataforma NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:http://netbeans.dzone.com/videos/free-netbeans-platform-crash[+Vídeo: Curso Intensivo Grátis sobre a Plataforma NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+Vídeo: As 10 Principais APIs do NetBeans+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/docs/screencasts.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Aplicações de Amostra
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Aplicações de Amostra - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Aplicações de Amostra
+== Aplicações de Amostra
 
 * link:http://apress.com/book/downloadfile/4393[+Amostras do Livro "O Guia Definitivo da Plataforma NetBeans"+]
 * link:https://netbeans.org/kb/samples/feedreader.html?me=6&su=1[+RSS Feed Reader+]
 * link:https://netbeans.org/kb/samples/paint-application.html?me=6&su=2[+Paint+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/samples/index.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * link:http://wiki.netbeans.org/wiki/view/VisualDatabaseExplorer[+A Visual Datbase Explorer for NetBeans+], por Toni Epple
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+DDL Visualizer: Visualize Script SQL com NetBeans+], por Damir Tesanovic
@@ -302,77 +198,38 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://wiki.netbeans.org/wiki/view/TranslateNetbeansModule[+Translate Your NetBeans Module+], por Michel Graciano
 * link:http://netbeans.dzone.com/tips/quickstart-guide-language-supp[+Quick Start: Creating Language Tools In NetBeans IDE+], por Jordi R. Cardona
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Material de Referência
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Material de Referência - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Material de Referência
+== Material de Referência
 
-*Material de Referência Oficial da Plataforma NetBeans
-*
+=== Material de Referência Oficial da Plataforma NetBeans
 
 * link:http://bits.netbeans.org/dev/javadoc/index.html[+Javadoc da API do NetBeans+]
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+API do Sistema de Módulos+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[+API do Sistema de Janelas+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[+API dos Sistemas de Arquivos+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[+API dos Sistemas de Dados+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[+API de Nós+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[+API do Explorer+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[+Personalização da Folha de Propriedades+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[+API da Biblioteca Visual+]
-
 * link:http://bits.netbeans.org/netbeans/trunk/javadoc/org-openide-util/org/openide/util/doc-files/api.html[+API de Utilitários+]
-
 * link:http://bits.netbeans.org/dev/javadoc/layers.html[+Descrição de Registros de Camada nas APIs do NetBeans+]
 * link:http://bits.netbeans.org/dev/javadoc/apichanges.html[+Alterações Mais Recentes da API do NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
-*Artigos de Revistas On-Line
-*
+=== Artigos de Revistas On-Line
 
 * link:http://java.sun.com/developer/technicalArticles/javase/extensible/index.html[+Criando Aplicações Extensíveis Com a Plataforma Java+]
 * link:http://java.dzone.com/news/how-create-pluggable-photo-alb[+Como Criar um Álbum de Fotos Plugável no Java+]
 * link:https://netbeans.org/community/magazine/html/04/maven.html[+Desenvolvimento da Plataforma NetBeans com Maven e Mevenide+]
 
-*Blogs da Plataforma NetBeans
-*
+=== Blogs da Plataforma NetBeans
 
 * link:http://blogs.oracle.com/geertjan[+Geertjan Wielenga+], link:http://eppleton.com/blog/[+Toni Epple+], link:http://www.aljoscha-rittner.de/blog/[+Aljoscha Rittner (German)+], link:http://blogs.oracle.com/scblog[+Sandip Chitale+], link:http://blogs.oracle.com/jglick[+Jesse Glick+], link:http://weblogs.java.net/blog/timboudreau/[+Tim Boudreau+], link:http://blogs.kiyut.com/tonny/[+Tonny Kohar+].
 
-*Livros da Plataforma NetBeans
-*
+=== Livros da Plataforma NetBeans
 
 * link:http://www.apress.com/9781430241010[+"Guia Definitivo da Plataforma NetBeans 7"+]
 * link:https://www.packtpub.com/netbeans-platform-6-9-developers-guide/book[+"Guia do Desenvolvedor da Plataforma NetBeans 6.9"+]
 * link:http://www.apress.com/9781430224174[+"O Guia Definitivo da Plataforma NetBeans 6.5"+]
 * link:http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802[+"Programação de Rich Client: Integrando à Plataforma NetBeans"+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/platform_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/platform_ru.asciidoc
index 8b07f86..363a80f 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform_ru.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Учебная карта по платформе NetBeans
 
 
-==== Общее представление о платформе NetBeans
+== Общее представление о платформе NetBeans
 
 Платформа NetBeans – это обширная платформа Java, на которой могут базироваться крупномасштабные приложения для рабочей среды. Сама среда IDE NetBeans является link:http://platform.netbeans.org/screenshots.html[+одним из сотни приложений+] на основе платформы NetBeans. Платформа NetBeans содержит интерфейсы API, которые упрощают обработку окон, действий, файлов и многих других объектов, а также ситуаций, типичных для приложений.
 
@@ -38,19 +38,7 @@
 
 Пользователи также могут создавать новые модули для самой среды IDE NetBeans. Например, пользователи могут создавать модули, обеспечивающие доступ к наиболее популярным новейшим технологиям для пользователей IDE NetBeans. Также можно создать, например, модуль, который будет предоставлять функцию дополнительного редактора.
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Начало работы
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы
+== Начало работы
 
 * link:http://bits.netbeans.org/dev/javadoc/[+NetBeans API Javadoc+] (link:https://netbeans.org/downloads/zip.html[+загрузите javadoc.zip для просмотра в автономном режиме+])
 * link:https://netbeans.org/projects/platform/lists/dev/archive[+Списки рассылки NetBeans Developer+]
@@ -58,35 +46,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::http
 * link:http://platform.netbeans.org/tutorials/nbm-google.html[+Начало работы с подключаемыми модулями в среде NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start.html[+Руководство по началу работы с платформой NetBeans+]
 * Новые возможности платформы NetBeans link:http://platform.netbeans.org/whatsnew/65.html[+6.5+], link:http://platform.netbeans.org/whatsnew/67.html[+6.7+], link:http://platform.netbeans.org/whatsnew/68.html[+6.8+], link:http://platform.netbeans.org/whatsnew/69.html[+6.9+], link:http://platform.netbeans.org/whatsnew/70.html[+7.0+], link:http://platform.netbeans.org/whatsnew/71.html[+7.1+], link:http://platform.netbeans.org/whatsnew/72.html[+7.2+], link:http://bits.netbeans.org/7.2.1/java [...]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Перенос
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Перенос - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Перенос
+== Перенос
 
 * link:http://platform.netbeans.org/tutorials/nbm-porting-basic.html[+Перенос компонентов Swing+]
 * link:http://platform.netbeans.org/tutorials/nbm-javafx.html[+Перенос компонентов JavaFX+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Использование API NetBeans
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Использование API NetBeans - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Использование API NetBeans
+== Использование API NetBeans
 
 *Основные принципы платформы NetBeans*
 
@@ -168,33 +134,12 @@ _(упорядочены по алфавиту)_
 
 * link:http://platform.netbeans.org/tutorials/nbm-ant.html[+Ant+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+Maven+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Видео на YouTube: пять простых способов расширения NetBeans IDE
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Видео на YouTube: пять простых способов расширения NetBeans IDE - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Видео на YouTube: пять простых способов расширения NetBeans IDE
+== Видео на YouTube: пять простых способов расширения NetBeans IDE
 
 image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", link="http://www.youtube.com/watch?v=h4k5JpluJM8"]image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Использование Maven с платформой NetBeans
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Использование Maven с платформой NetBeans - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Использование Maven с платформой NetBeans
+== Использование Maven с платформой NetBeans
 
 * Введение
 * link:http://wiki.netbeans.org/MavenBestPractices[+Испытанные приемы Maven в IDE NetBeans+]
@@ -210,90 +155,29 @@ image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", l
 * link:http://netbeans.dzone.com/how-create-maven-nb-project-type[+Создание пользовательских типов проектов с помощью Maven и платформы NetBeans+]
 * link:http://netbeans.dzone.com/nb-how-create-javahelp-mavenized[+Создание JavaHelp с помощью Maven и платформы NetBeans+]
 * link:http://netbeans.dzone.com/videos/screencast-maven-and-netbeans[+Экранная демонстрация: Maven и платформа NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Диагностика
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Диагностика - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Диагностика
+== Диагностика
 
 * link:http://platform.netbeans.org/tutorials/nbm-test.html[+Учебный курс по инфраструктуре тестирования платформы NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-gesture.html[+Учебный курс по инфраструктуре набора жестов для платформы NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Использование OSGi с платформой NetBeans
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Использование OSGi с платформой NetBeans - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Использование OSGi с платформой NetBeans
+== Использование OSGi с платформой NetBeans
 
 * link:http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html[+Руководство по началу работы с платформой NetBeans с использованием OSGi+]
 * link:http://platform.netbeans.org/tutorials/nbm-emf.html[+Руководство по интеграцию EMF платформы NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * link:http://netbeans.dzone.com/videos/free-netbeans-platform-crash[+Видео: бесплатный ускоренный курс по работе с платформой NetBeans+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+Видео: 10 лучших интерфейсов API NetBeans+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/docs/screencasts.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Примеры приложений
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Примеры приложений - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Примеры приложений
+== Примеры приложений
 
 * link:http://apress.com/book/downloadfile/4393[+Примеры из книги "Полное руководство по платформе NetBeans"+]
 * link:https://netbeans.org/kb/samples/feedreader.html?me=6&su=1[+Приложение для чтения каналов RSS+]
 * link:https://netbeans.org/kb/samples/paint-application.html?me=6&su=2[+Приложение для рисования+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/samples/index.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://wiki.netbeans.org/wiki/view/VisualDatabaseExplorer[+Визуальный проводник баз данных для среды NetBeans+], Тони Эппл (Toni Epple)
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+DDL Visualizer: визуализация сценария SQL с помощью NetBeans+], Дамир Тесанович (Damir Tesanovic)
@@ -302,24 +186,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://wiki.netbeans.org/wiki/view/TranslateNetbeansModule[+Перевод модуля NetBeans+], Мишель Грачиано (Michel Graciano)
 * link:http://netbeans.dzone.com/tips/quickstart-guide-language-supp[+Быстрый запуск: создание инструментов работы с языками в IDE NetBeans+] (автор Джорди Р. (Jordi R.)) Cardona
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
+== Справочные материалы
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= Справочные материалы
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Справочные материалы - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Справочные материалы
-
-*Официальные справочные материалы по платформе NetBeans
-*
+*Официальные справочные материалы по платформе NetBeans*
 
 * link:http://bits.netbeans.org/dev/javadoc/index.html[+Документация Javadoc по интерфейсам API в среде NetBeans+]
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+Системный интерфейс API для модулей+]
@@ -342,37 +211,22 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 
 * link:http://bits.netbeans.org/dev/javadoc/layers.html[+Описание регистрации слоев в интерфейсах API среды NetBeans+]
 * link:http://bits.netbeans.org/dev/javadoc/apichanges.html[+Последние изменения в интерфейсе API NetBeans+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
-*Статьи сетевого журнала
-*
+*Статьи сетевого журнала*
 
 * link:http://java.sun.com/developer/technicalArticles/javase/extensible/index.html[+Создание расширяемых приложений с помощью платформы Java+]
 * link:http://java.dzone.com/news/how-create-pluggable-photo-alb[+Процедура создания подключаемого фотоальбома на Java+]
 * link:https://netbeans.org/community/magazine/html/04/maven.html[+Разработка платформы NetBeans с помощью Maven и Mevenide+]
 
-*Блоги по платформе NetBeans
-*
+*Блоги по платформе NetBeans*
 
 * link:http://blogs.oracle.com/geertjan[+Геерт-Ян Виленга (Geertjan Wielenga)+], link:http://eppleton.com/blog/[+Тони Эппл (Toni Epple)+], link:http://www.aljoscha-rittner.de/blog/[+Алёша Риттнер (Aljoscha Rittner) (Германия)+], link:http://blogs.oracle.com/scblog[+Сандип Читейл (Sandip Chitale)+], link:http://blogs.oracle.com/jglick[+Джесси Глик (Jesse Glick)+], link:http://weblogs.java.net/blog/timboudreau/[+Тим Будро (Tim Boudreau)+], link:http://blogs.kiyut.com/tonny/[+Тонни Кохар (T [...]
 
-*Книги по платформе NetBeans
-*
+*Книги по платформе NetBeans*
 
 * link:http://www.apress.com/9781430241010[+"Полное руководство по платформе NetBeans 7"+]
 * link:https://www.packtpub.com/netbeans-platform-6-9-developers-guide/book[+Руководство разработчика по платформе NetBeans 6.9+]
 * link:http://www.apress.com/9781430224174[+"Полное руководство по платформе NetBeans 6.5"+]
 * link:http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802[+"Программирование функционально насыщенных клиентских приложений: подключение к платформе NetBeans"+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/platform_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/platform_zh_CN.asciidoc
index f28af38..42f3e65 100644
--- a/netbeans.apache.org/src/content/kb/docs/platform_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/platform_zh_CN.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, NetBeans 平台学习资源
 
 
-==== 什么是 NetBeans 平台？
+== 什么是 NetBeans 平台？
 
 NetBeans 平台是一个广泛使用的 Java 框架，您可以以此为基础开发大型桌面应用程序。NetBeans IDE 本身也是以 NetBeans 平台为基础的link:http://platform.netbeans.org/screenshots.html[+数百个应用程序之一+]。NetBeans 平台包含了许多 API，可以简化窗口、操作、文件以及其他应用程序中常见内容的处理。
 
@@ -38,19 +38,7 @@ NetBeans 平台应用程序中每种功能都由一个 NetBeans 模块提供，N
 
 您也可以为 NetBeans IDE 本身创建新的模块。例如，您可以编写模块，使 NetBeans IDE 的用户能够使用您所喜欢的一些前沿技术。此外，您也可以创建模块提供额外的编辑器功能。
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南
+== 入门指南
 
 * link:http://bits.netbeans.org/dev/javadoc/[+NetBeans API Javadoc+]（link:https://netbeans.org/downloads/zip.html[+下载 javadoc.zip 脱机查看+]）
 * link:https://netbeans.org/projects/platform/lists/dev/archive[+NetBeans 开发者邮件列表+]
@@ -58,71 +46,55 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::http
 * link:http://platform.netbeans.org/tutorials/nbm-google.html[+NetBeans 插件快速入门+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start.html[+NetBeans 平台快速入门+]
 * NetBeans 平台 link:http://platform.netbeans.org/whatsnew/65.html[+6.5+]、link:http://platform.netbeans.org/whatsnew/67.html[+6.7+]、link:http://platform.netbeans.org/whatsnew/68.html[+6.8+]、link:http://platform.netbeans.org/whatsnew/69.html[+6.9+]、link:http://platform.netbeans.org/whatsnew/70.html[+7.0+]、link:http://platform.netbeans.org/whatsnew/71.html[+7.1+]、link:http://platform.netbeans.org/whatsnew/72.html[+7.2+]、link:http://bits.netbeans.org/7.2.1/javadoc/apichanges.html[+7.2.1+]、lin [...]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 传送
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 传送 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 传送
+== 传送
 
 * link:http://platform.netbeans.org/tutorials/nbm-porting-basic.html[+传送 Swing 组件+]
 * link:http://platform.netbeans.org/tutorials/nbm-javafx.html[+传送 JavaFX 组件+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 使用 NetBeans API
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 使用 NetBeans API - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 使用 NetBeans API
+== 使用 NetBeans API
 
-*NetBeans 平台基础知识*
+=== NetBeans 平台基础知识
 
 您不熟悉 NetBeans 平台？如果是这样，请先学习上述“入门”部分中的文档，然后再阅读下面的文档，继续您的学习历程。尤其应该阅读下面列出的“选择管理系列”的四个部分，您可以从中了解 NetBeans 平台的各个部分是如何融合在一起的！
 
 * link:http://platform.netbeans.org/tutorials/nbm-runtime-container.html[+运行时容器教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+最主要的 10 个 NetBeans API（视频）+]
 * link:http://wiki.netbeans.org/NbmIdioms[+NetBeans API 概述+]
-* 基本 NetBeans 平台参考卡
+
+==== 基本 NetBeans 平台参考卡
 
 image::../../images_www/screenshots/platform/refcard70.png[role="left", link="http://refcardz.dzone.com/refcardz/netbeans-platform-70"]
 
-* 总览
+==== 总览
 * link:http://netbeans.dzone.com/articles/netbeans-lookups-explained[+介绍了 NetBeans 查阅功能！+]
 * link:http://netbeans.dzone.com/news/netbeans-extension-points[+NetBeans 扩展点的工作原理+]
-* 选择管理系列
+
+==== 选择管理系列
+
 * link:http://platform.netbeans.org/tutorials/nbm-selection-1.html[+第 1 部分：选择管理教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-selection-2.html[+第 2 部分：选择管理教程 II - 使用节点+]。
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi2.html[+第 3 部分：节点 API 教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-property-editors.html[+第 4 部分：属性编辑器 API 教程+]
 
-*在 NetBeans 平台上构建应用程序*
+=== 在 NetBeans 平台上构建应用程序
+
+==== 应用程序
 
-* 应用程序
 * link:http://platform.netbeans.org/tutorials/nbm-paintapp.html[+绘图应用程序教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-feedreader.html[+Feed 阅读器教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-htmleditor.html[+HTML 编辑器教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-povray-1.html[+POV-Ray 呈现器教程+]
-* 常见方案
+
+==== 常见方案
+
 * link:http://platform.netbeans.org/tutorials/nbm-crud.html[+创建/读取/更新/删除 (CRUD)+]
 * link:http://platform.netbeans.org/tutorials/nbm-geospatial.html[+地理空间+]
 * link:http://platform.netbeans.org/tutorials/nbm-workflow.html[+工作流+]
 * link:http://platform.netbeans.org/tutorials/nbm-3d.html[+3D 建模+]
 * link:http://platform.netbeans.org/tutorials/nbm-ide.html[+开发环境+]
 
-*用于开发代码编辑器的 NetBeans API*
+=== 用于开发代码编辑器的 NetBeans API
 
 * link:http://platform.netbeans.org/tutorials/nbm-filetype.html[+文件类型集成教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-javacc-lexer.html[+JavaCC 词法分析器生成器集成教程+]
@@ -138,7 +110,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://platform.netbeans.org/tutorials/nbm-java-hint.html[+Java 提示教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-code-template.html[+代码模板教程+]
 
-*用于可视化数据的 NetBeans API*
+=== 用于可视化数据的 NetBeans API
 
 * link:http://platform.netbeans.org/tutorials/nbm-visual_library.html[+可视库教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-quick-start-visual.html[+针对 Java 应用程序的可视库教程+]
@@ -148,7 +120,7 @@ image::../../images_www/screenshots/platform/refcard70.png[role="left", link="ht
 * link:http://java.dzone.com/news/how-add-resize-functionality-v[+如何使用 Java 将调整大小功能添加到可视化应用程序？+]
 * link:https://netbeans.org/community/magazine/html/04/visuallibrary.html[+可视化库的妙用+]
 
-*其他 NetBeans 平台教程*
+=== 其他 NetBeans 平台教程
 
 _（按字母数字顺序排序）_
 
@@ -164,136 +136,61 @@ _（按字母数字顺序排序）_
 * link:http://platform.netbeans.org/tutorials/nbm-nodesapi.html[+系统属性模块教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-wizard.html[+向导模块教程+]
 
-*命令行*
+=== 命令行
 
 * link:http://platform.netbeans.org/tutorials/nbm-ant.html[+Ant+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+Maven+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= YouTube：五种简单的 NetBeans IDE 扩展方法
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: YouTube：五种简单的 NetBeans IDE 扩展方法 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, YouTube：五种简单的 NetBeans IDE 扩展方法
+== YouTube：五种简单的 NetBeans IDE 扩展方法
 
-image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", link="http://www.youtube.com/watch?v=h4k5JpluJM8"]image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
+image::../../images_www/screenshots/platform/five-easy-extend.png[role="left", link="http://www.youtube.com/watch?v=h4k5JpluJM8"]
 
-= 在 NetBeans 平台中使用 Maven
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 在 NetBeans 平台中使用 Maven - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 在 NetBeans 平台中使用 Maven
+== 在 NetBeans 平台中使用 Maven
+
+=== 简介
 
-* 简介
 * link:http://wiki.netbeans.org/MavenBestPractices[+NetBeans IDE 中的 Maven 最佳做法+]
 * link:http://mojo.codehaus.org/nbm-maven-plugin/[+关于 NetBeans 模块 Maven 插件+]
-* NetBeans 平台教程
+
+=== NetBeans 平台教程
+
 * link:http://platform.netbeans.org/tutorials/nbm-maven-commandline.html[+NetBeans 平台 Maven 命令行教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-quickstart.html[+在 NetBeans 平台中使用 Maven 的快速入门+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesingle.html[+在 NetBeans 平台中使用 Maven 的文件类型教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-modulesuite.html[+在 NetBeans 平台中使用 Maven 的选择教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-maven-crud.html[+在 NetBeans 平台中使用 Maven 的 CRUD 教程+]
-* 其他
+
+==== 其他
+
 * link:http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container[+在 Maven 中使用的 NetBeans 平台运行时容器+]
 * link:http://netbeans.dzone.com/how-create-maven-nb-project-type[+使用 Maven 和 NetBeans 平台创建定制项目类型+]
 * link:http://netbeans.dzone.com/nb-how-create-javahelp-mavenized[+使用 Maven 和 NetBeans 平台创建 JavaHelp+]
 * link:http://netbeans.dzone.com/videos/screencast-maven-and-netbeans[+截屏视频：Maven 和 NetBeans 平台+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 诊断
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 诊断 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 诊断
+== 诊断
 
 * link:http://platform.netbeans.org/tutorials/nbm-test.html[+NetBeans 平台测试基础结构教程+]
 * link:http://platform.netbeans.org/tutorials/nbm-gesture.html[+NetBeans 平台操作集合基础结构教程+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 在 NetBeans 平台中使用 OSGi
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 在 NetBeans 平台中使用 OSGi - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 在 NetBeans 平台中使用 OSGi
+== 在 NetBeans 平台中使用 OSGi
 
 * link:http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html[+在 NetBeans 平台中使用 OSGi 的快速入门+]
 * link:http://platform.netbeans.org/tutorials/nbm-emf.html[+NetBeans 平台 EMF 集成教程+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * link:http://netbeans.dzone.com/videos/free-netbeans-platform-crash[+视频：NetBeans 平台免费速成课程+]
 * link:http://platform.netbeans.org/tutorials/nbm-10-top-apis.html[+视频：最主要的 10 个 NetBeans API+]
 
 image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/docs/screencasts.html"]
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= 样例应用程序
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 样例应用程序 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 样例应用程序
+== 样例应用程序
 
 * link:http://apress.com/book/downloadfile/4393[+《NetBeans 平台权威指南》文章样例+]
 * link:https://netbeans.org/kb/samples/feedreader.html?me=6&su=1[+RSS Feed 阅读器+]
 * link:https://netbeans.org/kb/samples/paint-application.html?me=6&su=2[+绘图+]
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="https://netbeans.org/kb/samples/index.html"]
-
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://wiki.netbeans.org/wiki/view/VisualDatabaseExplorer[+用于 NetBeans 的可视数据库资源管理器+]，作者：Toni Epple
 * link:http://tdamir.blogspot.com/2007/12/ddl-visualizer-visualize-sql-script.html[+DDL Visualizer：使用 NetBeans 可视化 SQL 脚本+]，作者：Damir Tesanovic
@@ -302,77 +199,38 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
 * link:http://wiki.netbeans.org/wiki/view/TranslateNetbeansModule[+翻译您的 NetBeans 模块+]，作者：Michel Graciano
 * link:http://netbeans.dzone.com/tips/quickstart-guide-language-supp[+快速入门：在 NetBeans IDE 中创建语言工具+]，作者：Jordi R.Cardona
 
-image:::https://netbeans.org/images_www/v6/arrow-button1.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
+== 参考资料
 
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
-
-= 参考资料
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 参考资料 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 参考资料
-
-*官方 NetBeans 平台参考资料
-*
+=== 官方 NetBeans 平台参考资料
 
 * link:http://bits.netbeans.org/dev/javadoc/index.html[+NetBeans API Javadoc+]
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-modules/org/openide/modules/doc-files/api.html[+模块系统 API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-windows/org/openide/windows/doc-files/api.html[+窗口系统 API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-filesystems/org/openide/filesystems/doc-files/api.html[+文件系统 API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-loaders/org/openide/loaders/doc-files/api.html[+数据系统 API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-nodes/org/openide/nodes/doc-files/api.html[+节点 API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/api.html[+资源管理器 API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-openide-explorer/org/openide/explorer/doc-files/propertyViewCustomization.html[+属性表单定制+]
-
 * link:http://bits.netbeans.org/dev/javadoc/org-netbeans-api-visual/org/netbeans/api/visual/widget/doc-files/documentation.html[+可视库 API+]
-
 * link:http://bits.netbeans.org/netbeans/trunk/javadoc/org-openide-util/org/openide/util/doc-files/api.html[+实用程序 API+]
-
 * link:http://bits.netbeans.org/dev/javadoc/layers.html[+NetBeans API 中层注册的描述+]
 * link:http://bits.netbeans.org/dev/javadoc/apichanges.html[+最近的 NetBeans API 更改+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]image::https://netbeans.org/images_www/v6/trails/trails-box-tr.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[]
 
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
-*在线期刊文章
-*
+=== 在线期刊文章
 
 * link:http://java.sun.com/developer/technicalArticles/javase/extensible/index.html[+使用 Java 平台创建可扩展应用程序+]
 * link:http://java.dzone.com/news/how-create-pluggable-photo-alb[+如何使用 Java 创建可插入的相册+]
 * link:https://netbeans.org/community/magazine/html/04/maven.html[+使用 Maven 和 Mevenide 进行 NetBeans 平台开发+]
 
-*NetBeans 平台博客
-*
+=== NetBeans 平台博客
 
 * link:http://blogs.oracle.com/geertjan[+Geertjan Wielenga+]、link:http://eppleton.com/blog/[+Toni Epple+]、link:http://www.aljoscha-rittner.de/blog/[+Aljoscha Rittner（德国）+]、link:http://blogs.oracle.com/scblog[+Sandip Chitale+]、link:http://blogs.oracle.com/jglick[+Jesse Glick+]、link:http://weblogs.java.net/blog/timboudreau/[+Tim Boudreau+]、link:http://blogs.kiyut.com/tonny/[+Tonny Kohar+]。
 
-*NetBeans 平台文章
-*
+=== NetBeans 平台文章
 
 * 《link:http://www.apress.com/9781430241010[+NetBeans 平台 7 权威指南+]》
 * 《link:https://www.packtpub.com/netbeans-platform-6-9-developers-guide/book[+NetBeans 平台 6.9 开发者指南+]》
 * 《link:http://www.apress.com/9781430224174[+NetBeans 平台 6.5 权威指南+]》
 * link:http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802[+富客户端编程：插入到 NetBeans 平台+]
-image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::https://netbeans.org/images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/tools.asciidoc b/netbeans.apache.org/src/content/kb/docs/tools.asciidoc
index 03552aa..2849ff9 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools.asciidoc
@@ -31,21 +31,9 @@
 
 To facilitate development of various types of applications, the NetBeans IDE provides integration with some external tools and services. The resources listed below will help you learn how to configure and use such tools and services, for example, connect to databases, manage your source code using version control software, and use the integrated support for issue trackers.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== Tutorials and Articles
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
-
-*Databases*
+=== Databases
 
 * link:../docs/ide/oracle-db.html[+Connecting to Oracle Database from NetBeans IDE+]
 * link:../docs/ide/java-db.html[+Working with the Java DB (Derby) Database+]
@@ -53,12 +41,12 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/web/mysql-webapp.html[+Creating a Simple Web Application Using a MySQL Database+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Setting Up the MySQL Database Server in the Windows Operating System+]
 
-*Maven*
+=== Maven
 
 * link:../docs/java/maven-hib-java-se.html[+Creating a Maven Swing Application Using Hibernate+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Maven Best Practices+]
 
-*Source Code Management*
+=== Source Code Management
 
 * link:../docs/ide/mercurial-queues.html[+Using Mercurial Queues Support in NetBeans IDE+]
 * link:../docs/ide/git.html[+Using Git Support in NetBeans IDE+]
@@ -67,69 +55,27 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/ide/cvs.html[+Using CVS Support in Netbeans IDE+]
 * link:../docs/ide/clearcase.html[+Using ClearCase Support in Netbeans IDE+]
 
-*Collaborative Development *
+=== Collaborative Development
 
 * link:../docs/ide/team-servers.html[+Working With a Team Server in NetBeans IDE+]
 
-*Optimization*
+=== Optimization
 
 * link:../docs/java/profile-loadgenerator.html[+Using a Load Generator in NetBeans IDE+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/ide/github_nb_screencast.html[+Demo: Setting Up a GitHub Repository Using NetBeans IDE+]
 * link:../docs/ide/git_nb_ssh_screencast.html[+Demo: Cloning a Git Repository Using NetBeans IDE+]
 * YouTube: link:http://www.youtube.com/watch?v=mQS-CViDHBU[+FindBugs in NetBeans IDE+] (_by Geertjan Wielenga_)
 
- 
-
-
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * Geertjan's Blog: link:https://blogs.oracle.com/geertjan/entry/git_in_netbeans_ide_7[+Git with Rebase in NetBeans IDE+]
 * link:http://wiki.netbeans.org/TutorialUsingSVNLocalRepository[+Using a Subversion (SVN) Local Repository+]
 * link:http://wiki.netbeans.org/AccessMssql[+Accessing MS Access / MS SQL from NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1790[+Working and Connecting with Databases+] in _Developing Applications with NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG620[+Working with Maven in NetBeans+] in _Developing Applications with NetBeans IDE_
@@ -138,4 +84,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Version_Control_Systems[+Version Control FAQs+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Database_Connectivity[+Database Connectivity FAQs+]
 * link:http://www.mysql.com/why-mysql/java/[+MySQL and Java - Resources+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/tools_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/tools_ca.asciidoc
index 5ec1735..93077e0 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools_ca.asciidoc
@@ -31,94 +31,42 @@
 
 Per a facilitar el desenvolupament de diversos tipus d'aplicacions, l'IDE NetBeans proporciona integració amb algunes eines i serveis externs. Els recursos llistats a continuació us ajudaran a com configurar i utilitzar cada eina i servei, per exemple, connectar a bases de dades, gestionar el vostre codi font mitjançant un sistema de control de versions, i utilitzar característiques corporatives disponibles a través del projecte Kenai.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== Guies d'aprenentatge i Articles
 
-= Guies d'aprenentatge i Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Guies d'aprenentatge i Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Guies d'aprenentatge i Articles
-
-*Gestió del codi font*
+=== Gestió del codi font
 
 * link:../docs/ide/clearcase.html[+ClearCase+]
 * link:../docs/ide/subversion.html[+Subversion+]
 * link:../docs/ide/cvs.html[+Sistema de control de versions (CVS)+]
 
-*Bases de dades*
+=== Bases de dades
 
 * link:../docs/ide/install-and-configure-mysql-server.html[+Configurant el servidor MySQL al sistema operatiu Windows+]
 * link:../docs/ide/java-db.html[+Treballant amb la base de dades Java DB (Derby)+]
 * link:../docs/ide/mysql.html[+Connectant a la base de dades MySQL+]
 
-*Maven*
+=== Maven
 
 * link:../docs/java/maven-hib-java-se.html[+Creant una aplicació Swing Maven utilitzant Hibernate+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Millors pràctiques Maven+]
 
-*Optimització*
+=== Optimització
 
 * link:../docs/java/profile-loadgenerator.html[+Utilitzant un generador de càrrega en l'IDE NetBeans+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
-
- 
 
+== Screencasts
 
 image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
 
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Documents aportats per la comunitat
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documents aportats per la comunitat - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documents aportats per la comunitat
+== Documents aportats per la comunitat
 
 * link:http://wiki.netbeans.org/TutorialUsingSVNLocalRepository[+Utilitzant un repositori local Subversion (SVN)+]
 * link:http://wiki.netbeans.org/ApacheCXFonNetBeans[+Desenvolupant una aplicació de processament Loan mitjançant Apache CXF i JPA en NetBeans 6.1+]
 * link:http://wiki.netbeans.org/AccessMssql[+Accedint a MS Access / MS SQL des de NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Altres recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Altres recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Altres recursos
+== Altres recursos
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-VersionControlSystems[+PMFs del control de versions+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-DatabaseConnectivity[+PMFs de connectivitat a bases de dades+]
 * link:http://www.mysql.com/why-mysql/java/[+MySQL i Java - Recursos+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/tools_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/tools_ja.asciidoc
index 03b5392..7e0352e 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools_ja.asciidoc
@@ -31,21 +31,9 @@
 
 様々なタイプのアプリケーションの開発を容易にするため、NetBeans IDEでは、いくつかの外部ツールおよびサービスとの統合が提供されています。次に一覧表示するリソースでは、そのようなツールやサービスを構成および使用する方法を学習でき、たとえば、データベースへの接続、バージョン管理ソフトウェアを使用したソース・コードの管理、統合された問題トラッカのサポートの使用などがあります。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== チュートリアルおよび記事
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
-
-*データベース*
+=== データベース
 
 * link:../docs/ide/oracle-db.html[+NetBeans IDEからのOracleデータベースへの接続+]
 * link:../docs/ide/java-db.html[+Java DB (Derby)データベースの操作+]
@@ -53,12 +41,12 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/web/mysql-webapp.html[+MySQLデータベースを使用した単純なWebアプリケーションの作成+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Windowsオペレーティング・システムでのMySQLデータベース・サーバーの設定+]
 
-*Maven*
+=== Maven
 
 * link:../docs/java/maven-hib-java-se.html[+Hibernateを使用したMaven Swingアプリケーションの作成+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Mavenのベスト・プラクティス+]
 
-*ソース・コードの管理*
+=== ソース・コードの管理
 
 * link:../docs/ide/mercurial-queues.html[+NetBeans IDEでのMercurial Queuesサポートの使用+]
 * link:../docs/ide/git.html[+NetBeans IDEでのGitサポートの使用+]
@@ -67,69 +55,27 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/ide/cvs.html[+Netbeans IDEでのCVSサポートの使用+]
 * link:../docs/ide/clearcase.html[+Netbeans IDEでのClearCaseサポートの使用+]
 
-*共同開発*
+=== 共同開発
 
 * link:../docs/ide/team-servers.html[+NetBeans IDEでのチーム・サーバーの操作+]
 
-*最適化*
+=== 最適化
 
 * link:../docs/java/profile-loadgenerator.html[+NetBeans IDEでの負荷ジェネレータの使用+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * link:../docs/ide/github_nb_screencast.html[+デモ: NetBeans IDEを使用したGitHubリポジトリの設定+]
 * link:../docs/ide/git_nb_ssh_screencast.html[+デモ: NetBeans IDEを使用したGitリポジトリのクローン+]
 * YouTube: link:http://www.youtube.com/watch?v=mQS-CViDHBU[+NetBeans IDEでのFindBugs+] (_Geertjan Wielenga作成_)
 
- 
-
-
-image::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * Geertjanのブログ: link:https://blogs.oracle.com/geertjan/entry/git_in_netbeans_ide_7[+NetBeans IDEでのGitとリベース+]
 * link:http://wiki.netbeans.org/TutorialUsingSVNLocalRepository[+Subversion (SVN)ローカル・リポジトリの使用+]
 * link:http://wiki.netbeans.org/AccessMssql[+NetBeansからのMS Access/MS SQLへのアクセス+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
 * _NetBeans IDEによるアプリケーションの開発_のlink:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1790[+データベースの使用と接続+]
 * _NetBeans IDEによるアプリケーションの開発_のlink:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG620[+NetBeansでのMavenの使用+]
@@ -138,4 +84,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Version_Control_Systems[+バージョン管理のFAQ+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Database_Connectivity[+データベース接続のFAQ+]
 * link:http://www.mysql.com/why-mysql/java/[+MySQLとJava - リソース+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/tools_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/tools_pt_BR.asciidoc
index 2f1f2dc..32027d7 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools_pt_BR.asciidoc
@@ -31,21 +31,9 @@
 
 Para facilitar o desenvolvimento de vários tipos de aplicações, o NetBeans IDE oferece a integração com alguns serviços e ferramentas externos. Os recursos listados abaixo o ajudarão a aprender como configurar e usar tais ferramentas e serviços, por exemplo, como conectar ao banco de dados, gerenciar seu código-fonte usando software de controle de versão e usar o suporte integrado dos rastreadores de problemas.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== Tutoriais e Artigos
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
-
-*Bancos de Dados*
+=== Bancos de Dados
 
 * link:../docs/ide/oracle-db.html[+Conectando-se a um Banco de Dados Oracle a partir do NetBeans IDE+]
 * link:../docs/ide/java-db.html[+Trabalhando com o Banco de Dados Java DB (Derby)+]
@@ -53,12 +41,12 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/web/mysql-webapp.html[+Criando uma Aplicação Web Simples Usando um Banco de Dados MySQL+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Configurando o Servidor de Banco de Dados MySQL no Sistema Operacional Windows+]
 
-*Maven*
+=== Maven
 
 * link:../docs/java/maven-hib-java-se.html[+Criando uma Aplicação Maven Swing Usando Hibernate+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Melhores Práticas do Maven+]
 
-*Gerenciamento de Código-Fonte*
+=== Gerenciamento de Código-Fonte
 
 * link:../docs/ide/mercurial-queues.html[+Usando Suporte às Filas do Mercurial no NetBeans IDE+]
 * link:../docs/ide/git.html[+Usando Suporte Git no NetBeans IDE+]
@@ -67,69 +55,27 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/ide/cvs.html[+Usando Suporte ao CVS no NetBeans IDE+]
 * link:../docs/ide/clearcase.html[+Usando o Suporte de ClearCase no NetBeans IDE+]
 
-*Desenvolvimento Colaborativo*
+=== Desenvolvimento Colaborativo
 
 * link:../docs/ide/team-servers.html[+Trabalhando com um Servidor de Equipe no NetBeans IDE+]
 
-*Otimização*
+=== Otimização
 
 * link:../docs/java/profile-loadgenerator.html[+Usando um Gerador de Carga no NetBeans IDE+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/ide/github_nb_screencast.html[+ Demonstração: Configurando um Repositório GitHub Usando o NetBeans IDE+]
 * link:../docs/ide/git_nb_ssh_screencast.html[+Demonstração: Clonando um Repositório Git Usando o NetBeans IDE+]
 * YouTube: link:http://www.youtube.com/watch?v=mQS-CViDHBU[+FindBugs in NetBeans IDE (FindBugs no NetBeans IDE)+] (_por Geertjan Wielenga_)
 
- 
-
-
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+== Documentos de Contribuição da Comunidade
 
 * Blog de Geertjan: link:https://blogs.oracle.com/geertjan/entry/git_in_netbeans_ide_7[+Git with Rebase in NetBeans IDE (Git com Rebase no NetBeans IDE)+]
 * link:http://wiki.netbeans.org/TutorialUsingSVNLocalRepository[+ Utilizando um Repositório Local do Subversion (SVN)+]
 * link:http://wiki.netbeans.org/AccessMssql[+Acessando o MS Access/MS SQL a Partir do NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1790[+Trabalhando e Conectando-se aos Bancos de Dados+] em _Desenvolvendo Aplicações com o NetBeans IDE_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG620[+Trabalhando com Maven no NetBeans+] em _Desenvolvendo Aplicações com o NetBeans IDE_
@@ -138,4 +84,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Version_Control_Systems[+Perguntas Frequentes sobre Controle de Versão+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Database_Connectivity[+Perguntas Frequentes sobre Conectividade de Banco de Dados+]
 * link:http://www.mysql.com/why-mysql/java/[+MySQL e Java - Recursos+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/tools_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/tools_ru.asciidoc
index a2e8660..f22f0c0 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools_ru.asciidoc
@@ -31,21 +31,9 @@
 
 Чтобы упростить разработку различных типов приложений, в IDE NetBeans реализована интеграция с различными внешними средствами и службами. Перечисленные ниже ресурсы помогут вам узнать, как настроить и использовать такие средства и службы, например, как подключиться к базам данных, управлять исходным кодом с помощью ПО для управления версиями или использовать встроенные средства отслеживания ошибок.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== Учебные курсы и статьи
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
-
-*Базы данных*
+=== Базы данных
 
 * link:../docs/ide/oracle-db.html[+Соединение с базой данных Oracle из IDE NetBeans+]
 * link:../docs/ide/java-db.html[+Работа с базой данных Java DB (Derby)+]
@@ -53,12 +41,12 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/web/mysql-webapp.html[+Создание простого веб-приложения, использующего базу данных MySQL+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+Настройка сервера баз данных MySQL в операционной системе Windows+]
 
-*Maven*
+=== Maven
 
 * link:../docs/java/maven-hib-java-se.html[+Создание приложения Maven Swing с использованием Hibernate+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Практические рекомендации по использованию Maven+]
 
-*Управление исходным кодом*
+=== Управление исходным кодом
 
 * link:../docs/ide/mercurial-queues.html[+Использование поддержки Mercurial Queues в IDE NetBeans+]
 * link:../docs/ide/git.html[+Использование поддержки Git в IDE NetBeans+]
@@ -67,69 +55,27 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/ide/cvs.html[+Использование поддержки CVS в IDE NetBeans+]
 * link:../docs/ide/clearcase.html[+Использование поддержки ClearCase в IDE NetBeans+]
 
-*Совместная разработка*
+=== Совместная разработка
 
 * link:../docs/ide/team-servers.html[+Работа с сервером групповой работы в IDE NetBeans+]
 
-*Оптимизация*
+=== Оптимизация
 
 * link:../docs/java/profile-loadgenerator.html[+Использование генератора нагрузки в IDE NetBeans+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * link:../docs/ide/github_nb_screencast.html[+Демонстрация: настройка репозитория GitHub при помощи IDE NetBeans+]
 * link:../docs/ide/git_nb_ssh_screencast.html[+Демонстрация: клонирование репозитория Git при помощи IDE NetBeans+]
 * YouTube: link:http://www.youtube.com/watch?v=mQS-CViDHBU[+FindBugs в IDE NetBeans+] (_Автор: Гиртжан Виленга (Geertjan Wielenga)_)
 
- 
-
-
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * Блог Гиртжана: link:https://blogs.oracle.com/geertjan/entry/git_in_netbeans_ide_7[+Git с перебазированием в IDE NetBeans+]
 * link:http://wiki.netbeans.org/TutorialUsingSVNLocalRepository[+ Использование локального хранилища системы управления исходным кодом Subversion (SVN)+]
 * link:http://wiki.netbeans.org/AccessMssql[+Доступ к MS Access/MS SQL из среды NetBeans+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1790[+Работа с базами данных и подключение к ним+] в документе _Разработка приложений в IDE NetBeans_
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG620[+Работа с Maven в NetBeans+] в документе _Разработка приложений в IDE NetBeans_
@@ -138,4 +84,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Version_Control_Systems[+Часто задаваемые вопросы по управлению версиями+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Database_Connectivity[+Часто задаваемые вопросы по соединениям с базами данных+]
 * link:http://www.mysql.com/why-mysql/java/[+MySQL и Java: материалы+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/tools_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/tools_zh_CN.asciidoc
index b242663..645c581 100644
--- a/netbeans.apache.org/src/content/kb/docs/tools_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/tools_zh_CN.asciidoc
@@ -31,21 +31,9 @@
 
 为了便于开发各种类型的应用程序，NetBeans IDE 集成了一些外部工具和服务。下列资源将有助于您了解如何配置和使用此类工具和服务，例如，连接到数据库、使用版本控制软件管理源代码，以及使用问题跟踪器的集成支持。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
+== 教程和文章
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
-
-*数据库*
+=== 数据库
 
 * link:../docs/ide/oracle-db.html[+从 NetBeans IDE 连接到 Oracle 数据库+]
 * link:../docs/ide/java-db.html[+使用 Java DB (Derby) 数据库+]
@@ -53,12 +41,12 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/web/mysql-webapp.html[+使用 MySQL 数据库创建简单的 Web 应用程序+]
 * link:../docs/ide/install-and-configure-mysql-server.html[+在 Windows 操作系统中设置 MySQL 数据库服务器+]
 
-*Maven*
+=== Maven
 
 * link:../docs/java/maven-hib-java-se.html[+使用 Hibernate 创建 Maven Swing 应用程序+]
 * link:http://wiki.netbeans.org/MavenBestPractices[+Maven 最佳实践+]
 
-*源代码管理*
+=== 源代码管理
 
 * link:../docs/ide/mercurial-queues.html[+在 NetBeans IDE 中使用 Mercurial 队列支持+]
 * link:../docs/ide/git.html[+在 NetBeans IDE 中使用 Git 支持+]
@@ -67,69 +55,27 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
 * link:../docs/ide/cvs.html[+在 NetBeans IDE 中使用 CVS 支持+]
 * link:../docs/ide/clearcase.html[+在 NetBeans IDE 中使用 ClearCase 支持+]
 
-*协作开发*
+=== 协作开发
 
 * link:../docs/ide/team-servers.html[+在 NetBeans IDE 中使用团队开发服务器+]
 
-*优化*
+=== 优化
 
 * link:../docs/java/profile-loadgenerator.html[+使用 NetBeans IDE 中的负载生成器+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * link:../docs/ide/github_nb_screencast.html[+演示：使用 NetBeans IDE 设置 GitHub 资料库+]
 * link:../docs/ide/git_nb_ssh_screencast.html[+演示：使用 NetBeans IDE 克隆 Git 资源库+]
 * YouTube：link:http://www.youtube.com/watch?v=mQS-CViDHBU[+NetBeans IDE 中的 FindBugs+]（_作者：Geertjan Wielenga_）
 
- 
-
-
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../../community/media.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * Geertjan 博客：link:https://blogs.oracle.com/geertjan/entry/git_in_netbeans_ide_7[+NetBeans IDE 中重定基址的 Git+]
 * link:http://wiki.netbeans.org/TutorialUsingSVNLocalRepository[+使用 Subversion (SVN) 本地资源库+]
 * link:http://wiki.netbeans.org/AccessMssql[+通过 NetBeans 访问 MS Access/MS SQL+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
 * _使用 NetBeans IDE 开发应用程序_中的link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1790[+使用和连接数据库+]
 * _使用 NetBeans IDE 开发应用程序_中的link:http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG620[+在 NetBeans 中使用 Maven+]
@@ -138,4 +84,4 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Version_Control_Systems[+版本控制常见问题解答+]
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#Database_Connectivity[+数据库连接常见问题解答+]
 * link:http://www.mysql.com/why-mysql/java/[+MySQL 和 Java - 资源+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
+
diff --git a/netbeans.apache.org/src/content/kb/docs/web.asciidoc b/netbeans.apache.org/src/content/kb/docs/web.asciidoc
index ef050f5..ac0c782 100644
--- a/netbeans.apache.org/src/content/kb/docs/web.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/web.asciidoc
@@ -29,8 +29,7 @@
 :description: Web Services Learning Trail - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Web Services Learning Trail
 
-
-==== *What Are Web Services?*
+== *What Are Web Services?*
 
 Web services are distributed application components that are externally available. You can use them to integrate computer applications that are written in different languages and run on different platforms. Web services are language and platform independent because vendors have agreed on common web service standards.
 
@@ -38,69 +37,35 @@ Web service applications are deployed to a Java EE application server, such as G
 
 This page provides links to some of the NetBeans documents and resources that can help you learn how to develop web service applications with NetBeans IDE.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started 
+== Getting Started 
 
 * link:../docs/websvc/intro-ws.html[+Introduction to Web Services +]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*SOAP Web Services*
+=== SOAP Web Services
 
 * link:../docs/websvc/jax-ws.html[+Getting Started with JAX-WS Web Services+]
 * link:../docs/websvc/client.html[+Developing JAX-WS Web Service Clients+]
 * Passing Binary Data in SOAP: A five-part tutorial
-* link:../docs/websvc/flower_overview.html[+Part 1: Overview+]
-* link:../docs/websvc/flower_ws.html[+Part 2: Creating the Web Service+]
-* link:../docs/websvc/flower-code-ws.html[+Part 3: Coding and Testing the Web Service+]
-* link:../docs/websvc/flower_wsdl_schema.html[+Part 4: Modifying the Schema and WSDL Files+]
-* link:../docs/websvc/flower_swing.html[+Part 5: Creating the Swing Client+]
+** link:../docs/websvc/flower_overview.html[+Part 1: Overview+]
+** link:../docs/websvc/flower_ws.html[+Part 2: Creating the Web Service+]
+** link:../docs/websvc/flower-code-ws.html[+Part 3: Coding and Testing the Web Service+]
+** link:../docs/websvc/flower_wsdl_schema.html[+Part 4: Modifying the Schema and WSDL Files+]
+** link:../docs/websvc/flower_swing.html[+Part 5: Creating the Swing Client+]
 
-*RESTful Web Services*
+=== RESTful Web Services
 
 * link:../docs/websvc/rest.html[+Getting Started with RESTful Web Services+]
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+DZone: NetBeans IDE to Generate Simpler RESTful Web Services+]
 * link:http://netbeans.dzone.com/nb-smugmug-client[+DZone: SmugMug Client in Java with NetBeans IDE+]
 * link:http://netbeans.dzone.com/articles/how-to-combine-rest-and-ejb-31[+DZone: How to Combine REST Services with EJB 3.1+]
 
-*Software as a Service (SaaS)*
+=== Software as a Service (SaaS)
 
 * link:../docs/websvc/zillow.html[+SaaS: Zillow+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Hierarchical Web Service Development with NetBeans IDE+] by Jayasurya Venug
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Steve Button's blog: Using JAX-RS [and NetBeans IDE] With WebLogic Server 10.3.4+]
@@ -109,54 +74,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Creating a Java Client for del.icio.us RESTful Web Services+], by Amit Kumar Saha
 * link:http://wiki.netbeans.org/SOAPclientForOpenCalais[+A SOAP Client for Open Calais+], by Amit Kumar Saha
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/websvc/pet-catalog-screencast.html[+RESTful Web Services Pet Catalog - NetBeans IDE 6.5+]
 * java.net: link:http://download.java.net/javaee5/screencasts/metro-nb6/[+Secure and Reliable Web Services using Metro/GlassFish+]
 * YouTube: link:http://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES: Demonstration of Web Services on Sun SPOT Devices+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
-*_Developing Applications with NetBeans IDE_ User's Guide*
+===_Developing Applications with NetBeans IDE_ User's Guide
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1842[+Developing and Securing Web Services+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1035[+Developing Web Applications+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+Developing Enterprise Applications+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+Working with Web and Application Servers+]
 
-*FAQs*
+=== FAQs
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebServicesDevelopment[+Web Service Development FAQs+]
 
-*Tutorials and Other Docs*
+=== Tutorials and Other Docs
 
 * link:https://weblogs.java.net/blog/caroljmcdonald/archive/2013/09/16/example-backbonejs-jax-rs-jpa-application[+Example Backbone.js, JAX-RS, JPA Application+]
 * link:http://coenraets.org/blog/2011/12/restful-services-with-jquery-and-java-using-jax-rs-and-jersey/[+RESTful Services with JQuery and Java Using JAX-RS and Jersey+]
@@ -167,10 +104,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://netbeans.dzone.com/news/advanced-web-service-interoper[+Advanced Web Service Interoperability Made Easy+]
 * link:http://netbeans.dzone.com/news/getting-started-with-software-[+Getting Started with "Software as a Service"+]
 
-*Blogs*
+=== Blogs
 
 * link:http://javaevangelist.blogspot.com/[+John Yeary's Blog: Web Services on NetBeans IDE+]
 * link:http://www.java.net/blogs/caroljmcdonald/[+Carol McDonald: Java EE+]
 * link:http://blogs.oracle.com/japod/[+Jakub Podlasek's blog: Jersey RESTful Web Services+]
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga: NetBeans IDE Platform+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/web_ca.asciidoc b/netbeans.apache.org/src/content/kb/docs/web_ca.asciidoc
index 53268ae..4e6a432 100644
--- a/netbeans.apache.org/src/content/kb/docs/web_ca.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/web_ca.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Camí d'aprenentatge de serveis web
 
 
-==== *Què són els serveis web?*
+== *Què són els serveis web?*
 
 Els serveis web són components d'aplicació distribuïts que estan disponibles des de l'exterior. Podeu utilitzar-los per a integrar aplicacions d'ordinador que estiguin escrites en llenguatges diferents i executar-les en diferents plataformes. Els serveis web són independents del llenguatges i plataforma, ja que els distribuïdors han estat d'acord en estàndards comuns de serveis web.
 
@@ -38,74 +38,40 @@ Les aplicacions de serveis web estan desplegades en servidors d'aplicacions Java
 
 Aquesta pàgina proporciona enllaços a diversos documents de NetBeans i a recursos que poden ajudar-vos a aprendre com desenvolupar aplicacions EJB i serveis web amb l'IDE NetBeans.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Getting Started 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Getting Started  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Getting Started 
+== Getting Started 
 
 * link:../docs/websvc/intro-ws.html[+Introduction to Web Services +]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutorials and Articles
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutorials and Articles - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutorials and Articles
+== Tutorials and Articles
 
-*SOAP Web Services*
+=== SOAP Web Services
 
 * link:../docs/websvc/jax-ws.html[+Getting Started with JAX-WS Web Services+]
 * link:../docs/websvc/client.html[+Developing JAX-WS Web Service Clients+]
 * Passing Binary Data in SOAP: A five-part tutorial (EE6 version. See link:../archive/index.html#NetBeans_6.8_Docs_Archives[+NetBeans 6.8 documentation+] for EE5 version.)
-* link:../docs/websvc/flower_overview.html[+Part 1: Overview+]
-* link:../docs/websvc/flower_ws.html[+Part 2: Creating the Web Service+]
-* link:../docs/websvc/flower-code-ws.html[+Part 3: Coding and Testing the Web Service+]
-* link:../docs/websvc/flower_wsdl_schema.html[+Part 4: Modifying the Schema and WSDL Files+]
-* link:../docs/websvc/flower_swing.html[+Part 5: Creating the Swing Client+]
+** link:../docs/websvc/flower_overview.html[+Part 1: Overview+]
+** link:../docs/websvc/flower_ws.html[+Part 2: Creating the Web Service+]
+** link:../docs/websvc/flower-code-ws.html[+Part 3: Coding and Testing the Web Service+]
+** link:../docs/websvc/flower_wsdl_schema.html[+Part 4: Modifying the Schema and WSDL Files+]
+** link:../docs/websvc/flower_swing.html[+Part 5: Creating the Swing Client+]
 
-*RESTful Web Services*
+=== RESTful Web Services
 
 * link:../docs/websvc/rest.html[+Getting Started with RESTful Web Services+]
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+NetBeans IDE to Generate Simpler RESTful Web Services+]
 * link:http://netbeans.dzone.com/nb-smugmug-client[+DZone: SmugMug Client in Java with NetBeans IDE+]
 * link:http://netbeans.dzone.com/articles/how-to-combine-rest-and-ejb-31[+DZone: How to Combine REST Services with EJB 3.1+]
 
-*Software as a Service (SaaS)*
+=== Software as a Service (SaaS)
 
 * link:../docs/websvc/zillow.html[+SaaS: Zillow+]
 
-*Web Service Reliability and Security*
+=== Web Service Reliability and Security
 
 * link:../docs/websvc/wsit.html[+Advanced Web Service Interoperability+]
 * link:http://netbeans.dzone.com/oauth-support-netbeans[+DZone: OAuth Support in NetBeans IDE 6.9+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Community-Contributed Docs
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Community-Contributed Docs - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Community-Contributed Docs
+== Community-Contributed Docs
 
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Steve Button's blog: Using JAX-RS [and NetBeans IDE] With WebLogic Server 10.3.4+]
 * link:http://www.adam-bien.com/roller/abien/entry/simplest_possible_ejb_3_13[+Simplest Possible EJB 3.1/REST (JSR 311) Component+], by Adam Bien
@@ -113,47 +79,19 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Creating a Java Client for del.icio.us RESTful Web Services+], by Amit Kumar Saha
 * link:http://wiki.netbeans.org/SOAPclientForOpenCalais[+A SOAP Client for Open Calais+], by Amit Kumar Saha
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+== Screencasts
 
 * link:../docs/websvc/pet-catalog-screencast.html[+RESTful Web Services Pet Catalog - NetBeans IDE 6.5+]
 * java.net: link:http://download.java.net/javaee5/screencasts/metro-nb6/[+Secure and Reliable Web Services using Metro/GlassFish+]
 * YouTube: link:http://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES: Demonstration of Web Services on Sun SPOT Devices+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Other Resources
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Other Resources - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Other Resources
+== Other Resources
 
-*FAQs*
+=== FAQs
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebServicesDevelopment[+Web Service Development FAQs+]
 
-*Tutorials and Other Docs*
+=== Tutorials and Other Docs
 
 * link:http://glassfish.dev.java.net/[+Join the GlassFish Community +]
 * link:http://www.mysql.com/why-mysql/java/[+MySQL and Java - Resources +]
@@ -163,7 +101,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://netbeans.dzone.com/news/advanced-web-service-interoper[+Advanced Web Service Interoperability Made Easy+]
 * link:http://netbeans.dzone.com/news/getting-started-with-software-[+Getting Started with "Software as a Service"+]
 
-*Blogs*
+=== Blogs
 
 * link:http://weblogs.java.net/blog/haroldcarr/[+Harold Carr: Enterprise Web Service Interoperability+]
 * link:http://www.java.net/blogs/caroljmcdonald/[+Carol McDonald: Java EE+]
@@ -171,4 +109,3 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://blogs.oracle.com/sandoz/[+Paul Sandoz: RESTful Web Services+]
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga: NetBeans IDE Platform+]
 * link:http://blogs.oracle.com/jrubinoff[+Jeff Rubinoff: Web Services+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/web_ja.asciidoc b/netbeans.apache.org/src/content/kb/docs/web_ja.asciidoc
index db091d5..b8e500f 100644
--- a/netbeans.apache.org/src/content/kb/docs/web_ja.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/web_ja.asciidoc
@@ -29,8 +29,7 @@
 :description: Webサービスの学習 - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Webサービスの学習
 
-
-==== *Webサービスとは*
+== *Webサービスとは*
 
 Webサービスは、外部で使用可能な分散アプリケーション・コンポーネントです。これらを使用すると、異なる言語で記述されたコンピュータ・アプリケーションを統合し、異なるプラットフォームで実行できます。Webサービスは、ベンダーが共通のWebサービス標準に同意しているため、言語およびプラットフォームに依存しません。
 
@@ -38,69 +37,35 @@ Webサービス・アプリケーションは、GlassFishやSun Java System Appl
 
 このページには、NetBeans IDEを使用したWebサービス・アプリケーションについて学習するのに役立つ、一部のNetBeansドキュメントおよびリソースへのリンクがあります。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 開始 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 開始  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 開始 
+== 開始 
 
 * link:../docs/websvc/intro-ws.html[+Webサービス入門+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= チュートリアルおよび記事
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: チュートリアルおよび記事 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, チュートリアルおよび記事
+== チュートリアルおよび記事
 
-*SOAP Webサービス*
+=== SOAP Webサービス
 
 * link:../docs/websvc/jax-ws.html[+JAX-WS Webサービスについて+]
 * link:../docs/websvc/client.html[+JAX-WS Webサービス・クライアントの開発+]
 * SOAPでのバイナリ・データの受け渡し: 5部構成のチュートリアル
-* link:../docs/websvc/flower_overview.html[+パート1: 概要+]
-* link:../docs/websvc/flower_ws.html[+パート2: Webサービスの作成+]
-* link:../docs/websvc/flower-code-ws.html[+パート3: Webサービスのコーディングおよびテスト+]
-* link:../docs/websvc/flower_wsdl_schema.html[+Part 4: スキーマおよびWSDLファイルの変更+]
-* link:../docs/websvc/flower_swing.html[+パート5: Swingクライアントの作成+]
+** link:../docs/websvc/flower_overview.html[+パート1: 概要+]
+** link:../docs/websvc/flower_ws.html[+パート2: Webサービスの作成+]
+** link:../docs/websvc/flower-code-ws.html[+パート3: Webサービスのコーディングおよびテスト+]
+** link:../docs/websvc/flower_wsdl_schema.html[+Part 4: スキーマおよびWSDLファイルの変更+]
+** link:../docs/websvc/flower_swing.html[+パート5: Swingクライアントの作成+]
 
-*RESTful Webサービス*
+=== RESTful Webサービス
 
 * link:../docs/websvc/rest.html[+RESTful Webサービスについて+]
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+DZone: NetBeans IDEによる簡易なRESTful Webサービスの生成+]
 * link:http://netbeans.dzone.com/nb-smugmug-client[+DZone: NetBeans IDEを使用したJavaのSmugMugクライアント+]
 * link:http://netbeans.dzone.com/articles/how-to-combine-rest-and-ejb-31[+DZone: RESTサービスとEJB 3.1とを組み合せる方法+]
 
-*Software as a Service (SaaS)*
+=== Software as a Service (SaaS)
 
 * link:../docs/websvc/zillow.html[+SaaS: Zillow+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= コミュニティの寄稿ドキュメント
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: コミュニティの寄稿ドキュメント - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, コミュニティの寄稿ドキュメント
+== コミュニティの寄稿ドキュメント
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+NetBeans IDEを使用した階層的なWebサービス開発+]、Jayasurya Venug著
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Steve Button氏のブログ: Using JAX-RS [およびNetBeans IDE] With WebLogic Server 10.3.4+]
@@ -109,54 +74,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Creating a Java Client for del.icio.us RESTful Web Services+]、Amit Kumar Saha著
 * link:http://wiki.netbeans.org/SOAPclientForOpenCalais[+A SOAP Client for Open Calais+]、Amit Kumar Saha著
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= スクリーンキャスト
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: スクリーンキャスト - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, スクリーンキャスト
+== スクリーンキャスト
 
 * link:../docs/websvc/pet-catalog-screencast.html[+RESTful Webサービスのペット・カタログ - NetBeans IDE 6.5+]
 * java.net: link:http://download.java.net/javaee5/screencasts/metro-nb6/[+Metro/GlassFishを使用した、セキュリティ保護された信頼性のあるWebサービス+]
 * YouTube: link:http://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES: Sun SPOTデバイスでのWebサービスのデモ+]
 
-image::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= その他のリソース
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: その他のリソース - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, その他のリソース
+== その他のリソース
 
-*_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド*
+=== _NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1842[+Webサービスの開発およびセキュリティ保護+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1035[+Webアプリケーションの開発+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+エンタープライズ・アプリケーションの開発+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+Webおよびアプリケーション・サーバーの使用+]
 
-*FAQ*
+=== FAQ
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebServicesDevelopment[+Webサービス開発のFAQ+]
 
-*チュートリアルおよびその他のドキュメント*
+=== チュートリアルおよびその他のドキュメント
 
 * link:https://weblogs.java.net/blog/caroljmcdonald/archive/2013/09/16/example-backbonejs-jax-rs-jpa-application[+Backbone.js、JAX-RS、JPAアプリケーションの例+]
 * link:http://coenraets.org/blog/2011/12/restful-services-with-jquery-and-java-using-jax-rs-and-jersey/[+JAX-RSとJerseyを使用したJQueryとJavaでのRESTfulサービス+]
@@ -167,10 +104,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://netbeans.dzone.com/news/advanced-web-service-interoper[+簡単にできる高度なWebサービスの相互運用性+]
 * link:http://netbeans.dzone.com/news/getting-started-with-software-[+「Software as a Service」入門+]
 
-*ブログ*
+=== ブログ
 
 * link:http://javaevangelist.blogspot.com/[+John Yearyのブログ: NetBeans IDEでのWebサービス+]
 * link:http://www.java.net/blogs/caroljmcdonald/[+Carol McDonald: Java EE+]
 * link:http://blogs.oracle.com/japod/[+Jakub Podlasekのブログ: Jersey RESTful Webサービス+]
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga: NetBeans IDEプラットフォーム+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/web_pt_BR.asciidoc b/netbeans.apache.org/src/content/kb/docs/web_pt_BR.asciidoc
index 2143955..0389179 100644
--- a/netbeans.apache.org/src/content/kb/docs/web_pt_BR.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/web_pt_BR.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Trilha de Aprendizado de Web Services
 
 
-==== *O que são Web Services?*
+== *O que são Web Services?*
 
 Os Web services são componentes de aplicação distribuídos que estão disponíveis externamente. Você pode usá-los para integrar aplicações de computador que são escritas em linguagens diferentes e executadas em plataformas diferentes. Os Web services são independentes de linguagem e de plataforma porque os fornecedores concordaram em oferecer padrões de Web service comuns.
 
@@ -38,69 +38,35 @@ As aplicações de Web service são implantadas em um servidor de aplicações J
 
 Essa página fornece links para alguns dos documentos e recursos do NetBeans que podem ajudá-lo a aprender a desenvolver aplicações de Web service com o NetBeans IDE.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Conceitos Básicos 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Conceitos Básicos  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Conceitos Básicos 
+== Conceitos Básicos 
 
 * link:../docs/websvc/intro-ws.html[+Introdução aos Web Services+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Tutoriais e Artigos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Tutoriais e Artigos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Tutoriais e Artigos
+== Tutoriais e Artigos
 
-*Web Services SOAP*
+=== Web Services SOAP
 
 * link:../docs/websvc/jax-ws.html[+Introdução aos Web Services JAX-WS+]
 * link:../docs/websvc/client.html[+Desenvolvendo Clientes de Web Service JAX-WS+]
 * Passando Dados Binários no SOAP: um tutorial em cinco partes
-* link:../docs/websvc/flower_overview.html[+Parte 1: Visão Geral+]
-* link:../docs/websvc/flower_ws.html[+Parte 2: Criando o Web Service+]
-* link:../docs/websvc/flower-code-ws.html[+Parte 3: Codificando e Testando o Web Service+]
-* link:../docs/websvc/flower_wsdl_schema.html[+Parte 4: Modificando o Esquema e os Arquivos WSDL+]
-* link:../docs/websvc/flower_swing.html[+Parte 5: Criando o Cliente Swing+]
+** link:../docs/websvc/flower_overview.html[+Parte 1: Visão Geral+]
+** link:../docs/websvc/flower_ws.html[+Parte 2: Criando o Web Service+]
+** link:../docs/websvc/flower-code-ws.html[+Parte 3: Codificando e Testando o Web Service+]
+** link:../docs/websvc/flower_wsdl_schema.html[+Parte 4: Modificando o Esquema e os Arquivos WSDL+]
+** link:../docs/websvc/flower_swing.html[+Parte 5: Criando o Cliente Swing+]
 
-*Web Services RESTful*
+=== Web Services RESTful
 
 * link:../docs/websvc/rest.html[+Introdução ao RESTful Web Services+]
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+DZone: NetBeans IDE para Gerar Web Services RESTful Mais Simples+]
 * link:http://netbeans.dzone.com/nb-smugmug-client[+DZone: Cliente SmugMug em Java com NetBeans IDE+]
 * link:http://netbeans.dzone.com/articles/how-to-combine-rest-and-ejb-31[+DZone: Como Combinar Serviços REST com o EJB 3.1+]
 
-*Software Como um Serviço (SaaS)*
+=== Software Como um Serviço (SaaS)
 
 * link:../docs/websvc/zillow.html[+SaaS: Zillow+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Documentos de Contribuição da Comunidade
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Documentos de Contribuição da Comunidade - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Documentos de Contribuição da Comunidade
+=== Documentos de Contribuição da Comunidade
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Desenvolvimento Hierárquico de Web Service com o NetBeans IDE+], de Jayasurya Venug
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Blog de Steve Button: Using JAX-RS [and NetBeans IDE] With WebLogic Server 10.3.4 (Usando JAX-RS - e NetBeans IDE - com o WebLogic Server 10.3.4)+]
@@ -109,54 +75,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Criando um Cliente Java para RESTful Web Services del.icio.us+], de Amit Kumar Saha
 * link:http://wiki.netbeans.org/SOAPclientForOpenCalais[+Cliente SOAP para Open Calais+], de Amit Kumar Saha
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Screencasts
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Screencasts - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Screencasts
+=== Screencasts
 
 * link:../docs/websvc/pet-catalog-screencast.html[+Catálogo Pet de Web Services RESTful - NetBeans IDE 6.5+]
 * java.net: link:http://download.java.net/javaee5/screencasts/metro-nb6/[+Web Services Protegidos e Confiáveis usando Metro/GlassFish+]
 * YouTube: link:http://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES: Demonstração de Web Services em Dispositivos Sun SPOT+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Outros Recursos
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Outros Recursos - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Outros Recursos
+== Outros Recursos
 
-*_Desenvolvendo Aplicações com o NetBeans IDE_ Guia do Usuário*
+=== _Desenvolvendo Aplicações com o NetBeans IDE_ Guia do Usuário
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1842[+Desenvolvendo e Protegendo Web Services+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1035[+Desenvolvendo Aplicações Web+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+Desenvolvendo Aplicações Corporativas+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+Trabalhando com Servidores Web e Servidores de Aplicações+]
 
-*Perguntas Frequentes*
+=== Perguntas Frequentes
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebServicesDevelopment[+Perguntas Frequentes sobre o Desenvolvimento de Web Services+]
 
-*Tutoriais e Outras Documentações*
+=== Tutoriais e Outras Documentações
 
 * link:https://weblogs.java.net/blog/caroljmcdonald/archive/2013/09/16/example-backbonejs-jax-rs-jpa-application[+Exemplo Backbone.js , JAX-RS, Aplicação JPA+]
 * link:http://coenraets.org/blog/2011/12/restful-services-with-jquery-and-java-using-jax-rs-and-jersey/[+Services RESTful com JQuery e Java Utilizando o JAX-RS e Jersey+]
@@ -167,10 +105,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://netbeans.dzone.com/news/advanced-web-service-interoper[+Interoperabilidade Avançada do Web Service de um Modo Fácil+]
 * link:http://netbeans.dzone.com/news/getting-started-with-software-[+Introdução ao "Software como um Serviço"+]
 
-*Blogs*
+=== Blogs
 
 * link:http://javaevangelist.blogspot.com/[+Blog de John Yeary: Web Services on NetBeans IDE (Web Services no NetBeans IDE)+]
 * link:http://www.java.net/blogs/caroljmcdonald/[+Carol McDonald: Java EE+]
 * link:http://blogs.oracle.com/japod/[+Blog de Jakub Podlasek: Jersey RESTful Web Services (Web Services RESTful no Jersey)+]
 * link:http://blogs.oracle.com/geertjan/[+Geertjan Wielenga: Plataforma do NetBeans IDE+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/web_ru.asciidoc b/netbeans.apache.org/src/content/kb/docs/web_ru.asciidoc
index 8a53bf9..6efb8e8 100644
--- a/netbeans.apache.org/src/content/kb/docs/web_ru.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/web_ru.asciidoc
@@ -29,8 +29,7 @@
 :description: Учебная карта по веб-службам - Apache NetBeans
 :keywords: Apache NetBeans, Tutorials, Учебная карта по веб-службам
 
-
-==== *Общие сведения о веб-службах*
+== *Общие сведения о веб-службах*
 
 Веб-службы представляют собой распределенные компоненты приложений, доступные извне. Их можно использовать для интеграции компьютерных приложений, написанных на различных языках программирования и выполняемых на различных платформах. Веб-службы не зависят от языка и платформы, так как между поставщиками существует договоренность об общих стандартах веб-служб.
 
@@ -38,69 +37,35 @@
 
 На этой странице приведены ссылки на определенные документы и ресурсы NetBeans, в которых описывается разработка приложений веб-служб с помощью IDE NetBeans.
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Начало работы 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Начало работы  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Начало работы 
+== Начало работы 
 
 * link:../docs/websvc/intro-ws.html[+Введение в веб-службы +]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Учебные курсы и статьи
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Учебные курсы и статьи - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Учебные курсы и статьи
+== Учебные курсы и статьи
 
-*Веб-службы SOAP*
+=== Веб-службы SOAP
 
 * link:../docs/websvc/jax-ws.html[+Начало работы с веб-службами JAX-WS+]
 * link:../docs/websvc/client.html[+Разработка клиентов веб-служб JAX-WS+]
 * Передача двоичных данных в SOAP: практическое руководство в пяти частях
-* link:../docs/websvc/flower_overview.html[+Часть 1: Обзор+]
-* link:../docs/websvc/flower_ws.html[+Часть 2. Создание веб-службы+]
-* link:../docs/websvc/flower-code-ws.html[+Часть 3. Написание кода веб-службы и ее тестирование+]
-* link:../docs/websvc/flower_wsdl_schema.html[+Часть 4. Изменение файлов схемы и WSDL для передачи двоичных данных+]
-* link:../docs/websvc/flower_swing.html[+Часть 5. Создание клиента Swing+]
+** link:../docs/websvc/flower_overview.html[+Часть 1: Обзор+]
+** link:../docs/websvc/flower_ws.html[+Часть 2. Создание веб-службы+]
+** link:../docs/websvc/flower-code-ws.html[+Часть 3. Написание кода веб-службы и ее тестирование+]
+** link:../docs/websvc/flower_wsdl_schema.html[+Часть 4. Изменение файлов схемы и WSDL для передачи двоичных данных+]
+** link:../docs/websvc/flower_swing.html[+Часть 5. Создание клиента Swing+]
 
-*Веб-службы RESTful*
+=== Веб-службы RESTful
 
 * link:../docs/websvc/rest.html[+Начало работы с веб-службами RESTful+]
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+DZone: Использование IDE NetBeans для создания более простых веб-служб RESTful+]
 * link:http://netbeans.dzone.com/nb-smugmug-client[+DZone: клиент SmugMug в Java с IDE NetBeans+]
 * link:http://netbeans.dzone.com/articles/how-to-combine-rest-and-ejb-31[+DZone: совмещение служб REST с EJB 3.1+]
 
-*Программное обеспечение как услуга (SaaS)*
+=== Программное обеспечение как услуга (SaaS)
 
 * link:../docs/websvc/zillow.html[+Модель "ПО как услуга": Zillow+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= Документы от сообщества
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Документы от сообщества - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Документы от сообщества
+== Документы от сообщества
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+Иерархическая разработка веб-служб с помощью IDE NetBeans+] (автор Джайсурая Венуг (Jayasurya Venug))
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Блог Стива Баттона (Steve Button): Using JAX-RS [and IDE NetBeans] With WebLogic Server 10.3.4 (Использование JAX-RS [и IDE NetBeans] с сервером WebLogic 10.3.4)+]
@@ -109,54 +74,26 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Создание клиента Java для веб-служб RESTful del.icio.us+], Амит Камар Саха (Amit Kumar Saha)
 * link:http://wiki.netbeans.org/SOAPclientForOpenCalais[+Клиент SOAP для Open Calais+], Амит Камар Саха (Amit Kumar Saha)
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Экранные демонстрации
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Экранные демонстрации - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Экранные демонстрации
+== Экранные демонстрации
 
 * link:../docs/websvc/pet-catalog-screencast.html[+Pet Catalog (веб-службы RESTful) - IDE NetBeans 6.5+]
 * java.net: link:http://download.java.net/javaee5/screencasts/metro-nb6/[+Построение безопасных и надежных веб-служб с использованием Metro/GlassFish+]
 * YouTube: link:http://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES: Демонстрация веб-служб на устройствах SPOT от Sun +]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= Другие источники
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: Другие источники - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, Другие источники
+== Другие источники
 
-*_Разработка приложений в IDE NetBeans_ - Руководство пользователя*
+=== _Разработка приложений в IDE NetBeans_ - Руководство пользователя
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1842[+Разработка и защита веб-служб+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1035[+Разработка веб-приложений+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+Разработка корпоративных приложений+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+Работа с веб-серверами и серверами приложений+]
 
-*Часто задаваемые вопросы*
+=== Часто задаваемые вопросы
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebServicesDevelopment[+Часто задаваемые вопросы по разработке веб-служб+]
 
-*Учебные курсы и другие документы*
+=== Учебные курсы и другие документы
 
 * link:https://weblogs.java.net/blog/caroljmcdonald/archive/2013/09/16/example-backbonejs-jax-rs-jpa-application[+Примеры приложений Backbone.js , JAX-RS, JPA+]
 * link:http://coenraets.org/blog/2011/12/restful-services-with-jquery-and-java-using-jax-rs-and-jersey/[+Службы RESTful с JQuery и Java при использовании JAX-RS и Jersey+]
@@ -167,10 +104,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://netbeans.dzone.com/news/advanced-web-service-interoper[+Расширенная совместимость веб-служб – это просто+]
 * link:http://netbeans.dzone.com/news/getting-started-with-software-[+Введение в понятие "Программное обеспечение как услуга"+]
 
-*Блоги*
+=== Блоги
 
 * link:http://javaevangelist.blogspot.com/[+Блог Джона Йеари (John Yeary): Web Services on IDE NetBeans (Веб-службы в IDE NetBeans)+]
 * link:http://www.java.net/blogs/caroljmcdonald/[+Кэрол Макдонадлд (Carol McDonald): Java EE+]
 * link:http://blogs.oracle.com/japod/[+Блог Якоба Подласека (Jakub Podlasek): Веб-службы RESTful Jersey+]
 * link:http://blogs.oracle.com/geertjan/[+Гиртжан Виленга (Geertjan Wielenga): IDE NetBeans Platform (Платформа IDE NetBeans)+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]
diff --git a/netbeans.apache.org/src/content/kb/docs/web_zh_CN.asciidoc b/netbeans.apache.org/src/content/kb/docs/web_zh_CN.asciidoc
index b12a8cf..0b70e92 100644
--- a/netbeans.apache.org/src/content/kb/docs/web_zh_CN.asciidoc
+++ b/netbeans.apache.org/src/content/kb/docs/web_zh_CN.asciidoc
@@ -30,7 +30,7 @@
 :keywords: Apache NetBeans, Tutorials, Web 服务学习资源
 
 
-==== *什么是 Web 服务？*
+== *什么是 Web 服务？*
 
 Web 服务是可供外部使用的分布式应用程序组件。您可以使用这些服务来集成用不同语言编写并在不同平台上运行的计算机应用程序。Web 服务与语言和平台无关，这是因为供应商已遵循通用的 Web 服务标准。
 
@@ -38,69 +38,35 @@ Web 服务应用程序将部署到 Java EE 应用服务器中，例如 GlassFish
 
 本页提供的一些 NetBeans 文档和资源链接可以帮助您了解如何使用 NetBeans IDE 开发 Web 服务应用程序。
 
-image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 入门指南 
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 入门指南  - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 入门指南 
+== 入门指南 
 
 * link:../docs/websvc/intro-ws.html[+Web 服务简介+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 教程和文章
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 教程和文章 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 教程和文章
+== 教程和文章
 
-*SOAP Web 服务*
+=== SOAP Web 服务
 
 * link:../docs/websvc/jax-ws.html[+JAX-WS Web 服务入门指南+]
 * link:../docs/websvc/client.html[+开发 JAX-WS Web 服务客户端+]
 * 在 SOAP 中传递二进制数据：一个由五部分组成的教程
-* link:../docs/websvc/flower_overview.html[+第 1 部分：概述+]
-* link:../docs/websvc/flower_ws.html[+第 2 部分：创建 Web 服务+]
-* link:../docs/websvc/flower-code-ws.html[+第 3 部分：对 Web 服务进行编码和测试+]
-* link:../docs/websvc/flower_wsdl_schema.html[+第 4 部分：修改方案文件和 WSDL 文件+]
-* link:../docs/websvc/flower_swing.html[+第 5 部分：创建 Swing 客户端+]
+** link:../docs/websvc/flower_overview.html[+第 1 部分：概述+]
+** link:../docs/websvc/flower_ws.html[+第 2 部分：创建 Web 服务+]
+** link:../docs/websvc/flower-code-ws.html[+第 3 部分：对 Web 服务进行编码和测试+]
+** link:../docs/websvc/flower_wsdl_schema.html[+第 4 部分：修改方案文件和 WSDL 文件+]
+** link:../docs/websvc/flower_swing.html[+第 5 部分：创建 Swing 客户端+]
 
-*REST 风格的 Web 服务*
+=== REST 风格的 Web 服务
 
 * link:../docs/websvc/rest.html[+REST 风格的 Web 服务入门指南+]
 * link:http://netbeans.dzone.com/nb-generate-simpler-rest[+DZone：用于生成更简单的 REST 风格 Web 服务的 NetBeans IDE+]
 * link:http://netbeans.dzone.com/nb-smugmug-client[+DZone：在 NetBeans IDE 中使用 SmugMug 创建 Java 客户端+]
 * link:http://netbeans.dzone.com/articles/how-to-combine-rest-and-ejb-31[+DZone：如何将 REST 服务与 EJB 3.1 相结合+]
 
-*服务型软件 (SaaS)*
+=== 服务型软件 (SaaS)
 
 * link:../docs/websvc/zillow.html[+SaaS：Zillow+]
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
 
-= 社区提供的文档
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 社区提供的文档 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 社区提供的文档
+== 社区提供的文档
 
 * link:http://netbeans.dzone.com/nb-hierarchical-web-services[+NetBeans IDE 中的分层 Web 服务开发+]，作者：Jayasurya Venug
 * link:http://buttso.blogspot.com/2011/02/using-jax-rs-with-weblogic-server-1034.html[+Steve Button 的博客：将 JAX-RS [和 NetBeans IDE] 与 WebLogic Server 10.3.4 结合使用+]
@@ -109,53 +75,25 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://wiki.netbeans.org/JavaClientForDeliciousUsingNetBeans[+Creating a Java Client for del.icio.us RESTful Web Services+]（为 del.icio.us REST 风格的 Web 服务创建 Java 客户端），作者：Amit Kumar Saha
 * link:http://wiki.netbeans.org/SOAPclientForOpenCalais[+用于 Open Calais 的 SOAP 客户端+]，作者：Amit Kumar Saha
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="http://wiki.netbeans.org/CommunityDocs_Contributions"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 截屏视频
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 截屏视频 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 截屏视频
+== 截屏视频
 
 * java.net：link:http://download.java.net/javaee5/screencasts/metro-nb6/[+使用 Metro/GlassFish 实现可靠安全的 Web 服务+]
 * YouTube：link:http://youtube.com/watch?v=K8OtFD6RLMM[+SOCRADES：Sun SPOT 设备上的 Web 服务演示+]
 
-image:::../../images_www/v6/arrow-button.gif[role="left", link="../docs/screencasts.html"]
-
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6/trails/trails-box-tl.png[]
-
-= 其他资源
-:jbake-type: tutorial
-:jbake-tags: tutorials 
-:jbake-status: published
-:icons: font
-:syntax: true
-:source-highlighter: pygments
-:toc: left
-:toc-title:
-:description: 其他资源 - Apache NetBeans
-:keywords: Apache NetBeans, Tutorials, 其他资源
+== 其他资源
 
-*_使用 NetBeans IDE 开发应用程序_用户指南*
+=== _使用 NetBeans IDE 开发应用程序_用户指南
 
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1842[+开发和保护 Web 服务+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1035[+开发 Web 应用程序+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1216[+开发企业应用程序+]
 * link:http://www.oracle.com/pls/topic/lookup?ctx=nb7400&id=NBDAG1649[+使用 Web 和应用程序服务器+]
 
-*常见问题解答*
+=== 常见问题解答
 
 * link:http://wiki.netbeans.org/NetBeansUserFAQ#section-NetBeansUserFAQ-WebServicesDevelopment[+Web 服务开发常见问题解答+]
 
-*教程和其他文档*
+=== 教程和其他文档
 
 * link:https://weblogs.java.net/blog/caroljmcdonald/archive/2013/09/16/example-backbonejs-jax-rs-jpa-application[+示例 Backbone.js、JAX-RS、JPA 应用程序+]
 * link:http://coenraets.org/blog/2011/12/restful-services-with-jquery-and-java-using-jax-rs-and-jersey/[+在 JQuery 和 Java 中使用 JAX-RS 和 Jersey 创建 REST 风格的服务+]
@@ -166,10 +104,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
 * link:http://netbeans.dzone.com/news/advanced-web-service-interoper[+简化高级 Web 服务互操作性+]
 * link:http://netbeans.dzone.com/news/getting-started-with-software-[+“服务型软件”入门+]
 
-*博客*
+=== 博客
 
 * link:http://javaevangelist.blogspot.com/[+John Yeary 的博客：NetBeans IDE 上的 Web 服务+]
... 4 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists