You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by gi...@apache.org on 2020/01/11 13:21:20 UTC
[netbeans-website] branch asf-site updated: Automated site
publishing by Jenkins build 1119
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 83da0fb Automated site publishing by Jenkins build 1119
83da0fb is described below
commit 83da0fb55d48abf7223a33a88b205f277392fac3
Author: jenkins <bu...@apache.org>
AuthorDate: Sat Jan 11 13:21:16 2020 +0000
Automated site publishing by Jenkins build 1119
---
content/kb/docs/cnd.html | 81 +++++----
content/kb/docs/cnd_ca.html | 70 ++++----
content/kb/docs/cnd_ja.html | 38 ++++-
content/kb/docs/cnd_pt_BR.html | 84 +++++----
content/kb/docs/cnd_ru.html | 84 +++++----
content/kb/docs/cnd_zh_CN.html | 59 ++++---
content/kb/docs/java-ee.html | 159 +++++++++--------
content/kb/docs/java-ee_ca.html | 144 +++++++++-------
content/kb/docs/java-ee_ja.html | 159 +++++++++--------
content/kb/docs/java-ee_pt_BR.html | 159 +++++++++--------
content/kb/docs/java-ee_ru.html | 56 ++++--
content/kb/docs/java-ee_zh_CN.html | 157 +++++++++--------
content/kb/docs/java-se_ca.html | 97 ++++++-----
content/kb/docs/java-se_ja.html | 94 +++++-----
content/kb/docs/java-se_pt_BR.html | 97 ++++++-----
content/kb/docs/java-se_ru.html | 97 ++++++-----
content/kb/docs/java-se_zh_CN.html | 97 ++++++-----
content/kb/docs/matisse.html | 131 +++++++-------
content/kb/docs/matisse_ca.html | 82 ++++-----
content/kb/docs/matisse_ja.html | 131 +++++++-------
content/kb/docs/matisse_pt_BR.html | 135 ++++++++-------
content/kb/docs/matisse_ru.html | 71 ++++----
content/kb/docs/matisse_zh_CN.html | 131 +++++++-------
content/kb/docs/mobility.html | 92 +++++-----
content/kb/docs/mobility_ca.html | 149 ++++++++--------
content/kb/docs/mobility_ja.html | 71 ++++----
content/kb/docs/mobility_pt_BR.html | 92 +++++-----
content/kb/docs/mobility_ru.html | 99 +++++------
content/kb/docs/mobility_zh_CN.html | 92 +++++-----
content/kb/docs/php.html | 141 ++++++++-------
content/kb/docs/php/quickstart_ru.html | 49 +++---
content/kb/docs/php/wish-list-lesson9.html | 100 ++---------
content/kb/docs/php_ca.html | 120 ++++++-------
content/kb/docs/php_fr.html | 120 ++++++-------
content/kb/docs/php_ja.html | 123 ++++++-------
content/kb/docs/php_pt_BR.html | 123 ++++++-------
content/kb/docs/php_ru.html | 124 +++++++-------
content/kb/docs/php_zh_CN.html | 123 ++++++-------
content/kb/docs/platform.html | 266 +++++++++++++++++------------
content/kb/docs/platform_ca.html | 147 ++++++++--------
content/kb/docs/platform_ja.html | 251 +++++++++++++++------------
content/kb/docs/platform_pt_BR.html | 266 +++++++++++++++++------------
content/kb/docs/platform_ru.html | 137 +++++++--------
content/kb/docs/platform_zh_CN.html | 264 ++++++++++++++++------------
content/kb/docs/tools.html | 84 +++++----
content/kb/docs/tools_ca.html | 72 ++++----
content/kb/docs/tools_ja.html | 84 +++++----
content/kb/docs/tools_pt_BR.html | 84 +++++----
content/kb/docs/tools_ru.html | 84 +++++----
content/kb/docs/tools_zh_CN.html | 84 +++++----
content/kb/docs/web.html | 112 ++++++------
content/kb/docs/web_ca.html | 115 +++++++------
content/kb/docs/web_ja.html | 115 +++++++------
content/kb/docs/web_pt_BR.html | 111 ++++++------
content/kb/docs/web_ru.html | 115 +++++++------
content/kb/docs/web_zh_CN.html | 115 +++++++------
56 files changed, 3511 insertions(+), 3026 deletions(-)
diff --git a/content/kb/docs/cnd.html b/content/kb/docs/cnd.html
index 7babced..aea1337 100644
--- a/content/kb/docs/cnd.html
+++ b/content/kb/docs/cnd.html
@@ -96,39 +96,49 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_developing_c_c_and_fortran_applications">Developing C, C++, and Fortran Applications</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
-<li><a href="#_tutorials_and_articles_2">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_creating_c_and_c_projects">Creating C and C++ Projects</a></li>
+<li><a href="#_developing_c_and_c_projects">Developing C and C++ Projects</a></li>
+</ul>
+</li>
+<li><a href="#_tutorials_and_articles_2">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_c_and_c_project_how_tos">C and C++ Project How-tos</a></li>
+</ul>
+</li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
<li><a href="#_other_resources">Other Resources</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_developing_c_c_and_fortran_applications">Developing C, C++, and Fortran Applications</h4>
+<div class="sect1">
+<h2 id="_developing_c_c_and_fortran_applications">Developing C, C++, and Fortran Applications</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../../community/releases/80/cpp-setup-instructions.html">+ Configuring NetBeans IDE for C/C+/Fortran</a>
-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[]</p>
+<p><a href="../../community/releases/80/cpp-setup-instructions.html">+ Configuring NetBeans IDE for C/C+/Fortran</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>Creating C and C++ Projects</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_creating_c_and_c_projects">Creating C and C++ Projects</h3>
<div class="ulist">
<ul>
<li>
@@ -142,9 +152,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Developing C and C++ Projects</strong></p>
</div>
+<div class="sect2">
+<h3 id="_developing_c_and_c_projects">Developing C and C++ Projects</h3>
<div class="ulist">
<ul>
<li>
@@ -160,15 +170,18 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/remotedev-tutorial.html">C/C+ Remote Development Tutorial+</a></p>
</li>
<li>
-<p><a href="../docs/cnd/c-unit-test.html">Adding Unit Tests to a C/C+ Project+</a>
-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[]</p>
+<p><a href="../docs/cnd/c-unit-test.html">Adding Unit Tests to a C/C+ Project+</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles_2" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>C and C++ Project How-tos</strong></p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles_2">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_c_and_c_project_how_tos">C and C++ Project How-tos</h3>
<div class="ulist">
<ul>
<li>
@@ -186,7 +199,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -197,17 +215,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -217,11 +229,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack">NetBeans C/C+ Plugin FAQs+</a></p>
</li>
<li>
-<p><a href="https://netbeans.org/projects/cnd/lists">NetBeans C/C+ Mailing Lists+</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://netbeans.org/projects/cnd/lists">NetBeans C/C+ Mailing Lists+</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/cnd_ca.html b/content/kb/docs/cnd_ca.html
index e28d959..2c44ae6 100644
--- a/content/kb/docs/cnd_ca.html
+++ b/content/kb/docs/cnd_ca.html
@@ -96,41 +96,48 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_desenvolupant_aplicacions_c_i_c">Desenvolupant aplicacions C i C++</a></li>
<li><a href="#_com_començar">Com començar</a></li>
-<li><a href="#_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</a></li>
+<li><a href="#_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_creant_projectes_c_i_c">Creant projectes C i C++</a></li>
+<li><a href="#_desenvolupant_projectes_c_c">Desenvolupant projectes C/C++</a></li>
+<li><a href="#_com_fer_ho_en_projectes_c_i_c">Com fer-ho en projectes C i C++</a></li>
+</ul>
+</li>
<li><a href="#_documents_aportats_per_la_comunitat">Documents aportats per la comunitat</a></li>
<li><a href="#_altres_recursos">Altres recursos</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_desenvolupant_aplicacions_c_i_c">Desenvolupant aplicacions C i C++</h4>
+<div class="sect1">
+<h2 id="_desenvolupant_aplicacions_c_i_c">Desenvolupant aplicacions C i C++</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_com_començar" class="sect0">Com començar</h1>
+<div class="sect1">
+<h2 id="_com_començar">Com començar</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../../community/releases/71/cpp-setup-instructions.html">+ Configurant l’IDE NetBeans per a C/C+/Fortran</a>
-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[]</p>
+<p><a href="../../community/releases/71/cpp-setup-instructions.html">+ Configurant l’IDE NetBeans per a C/C+/Fortran</a></p>
</li>
</ul>
</div>
-<h1 id="_guies_d_aprenentatge_i_articles" class="sect0">Guies d’aprenentatge i Articles</h1>
-<div class="paragraph">
-<p><strong>Creant projectes C i C++</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_creant_projectes_c_i_c">Creant projectes C i C++</h3>
<div class="ulist">
<ul>
<li>
@@ -144,9 +151,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Desenvolupant projectes C/C++</strong></p>
</div>
+<div class="sect2">
+<h3 id="_desenvolupant_projectes_c_c">Desenvolupant projectes C/C++</h3>
<div class="ulist">
<ul>
<li>
@@ -160,9 +167,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Com fer-ho en projectes C i C++</strong></p>
</div>
+<div class="sect2">
+<h3 id="_com_fer_ho_en_projectes_c_i_c">Com fer-ho en projectes C i C++</h3>
<div class="ulist">
<ul>
<li>
@@ -172,12 +179,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/depchecking.html">Fer la comprovació de dependències</a></p>
</li>
<li>
-<p><a href="../docs/cnd/macro-features.html">Explorant les Macros en projectes C/C++</a>
-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[]</p>
+<p><a href="../docs/cnd/macro-features.html">Explorant les Macros en projectes C/C++</a></p>
</li>
</ul>
</div>
-<h1 id="_documents_aportats_per_la_comunitat" class="sect0">Documents aportats per la comunitat</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_documents_aportats_per_la_comunitat">Documents aportats per la comunitat</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -188,28 +199,23 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_altres_recursos" class="sect0">Altres recursos</h1>
+<div class="sect1">
+<h2 id="_altres_recursos">Altres recursos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://wiki.netbeans.org/NetBeansUserFAQ#section-CAndCPlusPlusFAQ-NetBeansCCPluginFAQAndHOWTOs">PMFs complement C/C+ NetBeans+</a></p>
</li>
<li>
-<p><a href="https://netbeans.org/projects/cnd/lists">Llistes de correu de NetBeans C/C++</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://netbeans.org/projects/cnd/lists">Llistes de correu de NetBeans C/C++</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/cnd_ja.html b/content/kb/docs/cnd_ja.html
index df8377c..cb99bfb 100644
--- a/content/kb/docs/cnd_ja.html
+++ b/content/kb/docs/cnd_ja.html
@@ -96,7 +96,7 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_c_c_およびfortranアプリケーションの開発">C、C++およびFortranアプリケーションの開発</a></li>
<li><a href="#_開始">開始</a></li>
<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a></li>
@@ -105,8 +105,9 @@
<li><a href="#_その他のリソース">その他のリソース</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_c_c_およびfortranアプリケーションの開発">C、C++およびFortranアプリケーションの開発</h4>
+<div class="sect1">
+<h2 id="_c_c_およびfortranアプリケーションの開発">C、C++およびFortranアプリケーションの開発</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>C/CをサポートするNetBeans IDEをインストールすると、そのIDEにはC/C用のプロジェクト・タイプと適切なテンプレートが含まれます。動的ライブラリや静的ライブラリとともに、C/C/Fortranアプリケーションを作成でき、既存のソースからC/C/Fortranプロジェクトを作成することもできます。エディタによって、C/C++コードのインデント、コード補完、および構文の強調が行われ、GNU gdbデバッガが十分に統合されています。</p>
</div>
@@ -116,7 +117,10 @@
</div>
</div>
</div>
-<h1 id="_開始" class="sect0">開始</h1>
+</div>
+<div class="sect1">
+<h2 id="_開始">開始</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -125,7 +129,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事" class="sect0">チュートリアルおよび記事</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事">チュートリアルおよび記事</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>C/C++プロジェクトの作成</strong></p>
</div>
@@ -165,7 +173,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事_2" class="sect0">チュートリアルおよび記事</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事_2">チュートリアルおよび記事</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>C/C++プロジェクトの操作方法</strong></p>
</div>
@@ -186,7 +198,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_コミュニティの寄稿ドキュメント" class="sect0">コミュニティの寄稿ドキュメント</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -207,7 +223,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_その他のリソース" class="sect0">その他のリソース</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_その他のリソース">その他のリソース</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -222,6 +242,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/cnd_pt_BR.html b/content/kb/docs/cnd_pt_BR.html
index b106cb7..b1de3d5 100644
--- a/content/kb/docs/cnd_pt_BR.html
+++ b/content/kb/docs/cnd_pt_BR.html
@@ -96,39 +96,49 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_desenvolvendo_aplicações_c_c_e_fortran">Desenvolvendo Aplicações C, C++ e Fortran</a></li>
<li><a href="#_conceitos_básicos">Conceitos Básicos</a></li>
-<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a></li>
-<li><a href="#_tutoriais_e_artigos_2">Tutoriais e Artigos</a></li>
+<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_criando_projetos_em_c_e_c">Criando Projetos em C e C++</a></li>
+<li><a href="#_desenvolvendo_projetos_c_e_c">Desenvolvendo Projetos C e C++</a></li>
+</ul>
+</li>
+<li><a href="#_tutoriais_e_artigos_2">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_como_fazer_do_projeto_c_e_c">Como Fazer do Projeto C e C++</a></li>
+</ul>
+</li>
<li><a href="#_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</a></li>
<li><a href="#_outros_recursos">Outros Recursos</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_desenvolvendo_aplicações_c_c_e_fortran">Desenvolvendo Aplicações C, C++ e Fortran</h4>
+<div class="sect1">
+<h2 id="_desenvolvendo_aplicações_c_c_e_fortran">Desenvolvendo Aplicações C, C++ e Fortran</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_conceitos_básicos" class="sect0">Conceitos Básicos</h1>
+<div class="sect1">
+<h2 id="_conceitos_básicos">Conceitos Básicos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../../community/releases/80/cpp-setup-instructions.html">Configurando o NetBeans IDE para C/C+/Fortran+</a>
-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[]</p>
+<p><a href="../../community/releases/80/cpp-setup-instructions.html">Configurando o NetBeans IDE para C/C+/Fortran+</a></p>
</li>
</ul>
</div>
-<h1 id="_tutoriais_e_artigos" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p><strong>Criando Projetos em C e C++</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_criando_projetos_em_c_e_c">Criando Projetos em C e C++</h3>
<div class="ulist">
<ul>
<li>
@@ -142,9 +152,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Desenvolvendo Projetos C e C++</strong></p>
</div>
+<div class="sect2">
+<h3 id="_desenvolvendo_projetos_c_e_c">Desenvolvendo Projetos C e C++</h3>
<div class="ulist">
<ul>
<li>
@@ -160,15 +170,18 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/remotedev-tutorial.html">Tutorial de Desenvolvimento Remoto C/C++</a></p>
</li>
<li>
-<p><a href="../docs/cnd/c-unit-test.html">Adicionando Testes de Unidade a um Projeto C/C++</a>
-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[]</p>
+<p><a href="../docs/cnd/c-unit-test.html">Adicionando Testes de Unidade a um Projeto C/C++</a></p>
</li>
</ul>
</div>
-<h1 id="_tutoriais_e_artigos_2" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p><strong>Como Fazer do Projeto C e C++</strong></p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos_2">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_como_fazer_do_projeto_c_e_c">Como Fazer do Projeto C e C++</h3>
<div class="ulist">
<ul>
<li>
@@ -181,12 +194,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/toolchain.html">Usando o Descritor de Coleção da Ferramenta C/C++</a></p>
</li>
<li>
-<p><a href="../docs/cnd/cpp-vcs.html">Armazenando Projetos do NetBeans C/C+ em VCS+</a>
-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[]</p>
+<p><a href="../docs/cnd/cpp-vcs.html">Armazenando Projetos do NetBeans C/C+ em VCS+</a></p>
</li>
</ul>
</div>
-<h1 id="_documentos_de_contribuição_da_comunidade" class="sect0">Documentos de Contribuição da Comunidade</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -197,17 +214,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_outros_recursos" class="sect0">Outros Recursos</h1>
+<div class="sect1">
+<h2 id="_outros_recursos">Outros Recursos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -217,11 +228,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack">Perguntas Frequentes do Plug-in C/C+ do NetBeans+</a></p>
</li>
<li>
-<p><a href="https://netbeans.org/projects/cnd/lists">Listas de Correspondência do C/C+ do NetBeans+</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://netbeans.org/projects/cnd/lists">Listas de Correspondência do C/C+ do NetBeans+</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/cnd_ru.html b/content/kb/docs/cnd_ru.html
index 0e037ff..14b561f 100644
--- a/content/kb/docs/cnd_ru.html
+++ b/content/kb/docs/cnd_ru.html
@@ -96,39 +96,49 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_Разработка_приложений_на_c_c_и_Фортране">Разработка приложений на C, C++ и Фортране</a></li>
<li><a href="#_Начало_работы">Начало работы</a></li>
-<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a></li>
-<li><a href="#_Учебные_курсы_и_статьи_2">Учебные курсы и статьи</a></li>
+<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a>
+<ul class="sectlevel2">
+<li><a href="#_Создание_проектов_на_языках_c_и_c">Создание проектов на языках C и C++</a></li>
+<li><a href="#_Разработка_проектов_на_языках_c_и_c">Разработка проектов на языках C и C++</a></li>
+</ul>
+</li>
+<li><a href="#_Учебные_курсы_и_статьи_2">Учебные курсы и статьи</a>
+<ul class="sectlevel2">
+<li><a href="#_Указания_по_разработке_проектов_на_языках_c_и_c">Указания по разработке проектов на языках C и C++</a></li>
+</ul>
+</li>
<li><a href="#_Документы_от_сообщества">Документы от сообщества</a></li>
<li><a href="#_Другие_источники">Другие источники</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_Разработка_приложений_на_c_c_и_Фортране">Разработка приложений на C, C++ и Фортране</h4>
+<div class="sect1">
+<h2 id="_Разработка_приложений_на_c_c_и_Фортране">Разработка приложений на C, C++ и Фортране</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>При установке IDE NetBeans с поддержкой C/C, среда включает IDE типы проектов для C и C и соответствующие шаблоны. Существует возможность создания приложений на C, C и Фортране с динамическими и статическими библиотеками, а также проектов на C, C и Фортране на основе существующего кода. С помощью редактора можно выполнить вставку отступов, автозавершение и выделение синтаксиса кода C/C++. Кроме того, редактор тесно интегрирован с отладчиком GNU gdb.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_Начало_работы" class="sect0">Начало работы</h1>
+<div class="sect1">
+<h2 id="_Начало_работы">Начало работы</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../../community/releases/80/cpp-setup-instructions.html">+ Настройка IDE NetBeans для C/C+/Fortran</a>
-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[]</p>
+<p><a href="../../community/releases/80/cpp-setup-instructions.html">+ Настройка IDE NetBeans для C/C+/Fortran</a></p>
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи" class="sect0">Учебные курсы и статьи</h1>
-<div class="paragraph">
-<p><strong>Создание проектов на языках C и C++</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи">Учебные курсы и статьи</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_Создание_проектов_на_языках_c_и_c">Создание проектов на языках C и C++</h3>
<div class="ulist">
<ul>
<li>
@@ -142,9 +152,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Разработка проектов на языках C и C++</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Разработка_проектов_на_языках_c_и_c">Разработка проектов на языках C и C++</h3>
<div class="ulist">
<ul>
<li>
@@ -160,15 +170,18 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/remotedev-tutorial.html">Учебный курс по удаленной разработке на языке C/C++</a></p>
</li>
<li>
-<p><a href="../docs/cnd/c-unit-test.html">Добавление модульных тестов к проекту C/C++</a>
-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[]</p>
+<p><a href="../docs/cnd/c-unit-test.html">Добавление модульных тестов к проекту C/C++</a></p>
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи_2" class="sect0">Учебные курсы и статьи</h1>
-<div class="paragraph">
-<p><strong>Указания по разработке проектов на языках C и C++</strong></p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи_2">Учебные курсы и статьи</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_Указания_по_разработке_проектов_на_языках_c_и_c">Указания по разработке проектов на языках C и C++</h3>
<div class="ulist">
<ul>
<li>
@@ -181,12 +194,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/toolchain.html">Использование дескрипторов наборов средств C/C++</a></p>
</li>
<li>
-<p><a href="../docs/cnd/cpp-vcs.html">Сохранение проектов NetBeans C/C+ в VCS+</a>
-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[]</p>
+<p><a href="../docs/cnd/cpp-vcs.html">Сохранение проектов NetBeans C/C+ в VCS+</a></p>
</li>
</ul>
</div>
-<h1 id="_Документы_от_сообщества" class="sect0">Документы от сообщества</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Документы_от_сообщества">Документы от сообщества</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -197,17 +214,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_Другие_источники" class="sect0">Другие источники</h1>
+<div class="sect1">
+<h2 id="_Другие_источники">Другие источники</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -217,11 +228,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack">Часто задаваемые вопросы по подключаемым модулям NetBeans C/C++</a></p>
</li>
<li>
-<p><a href="https://netbeans.org/projects/cnd/lists">Рассылки по NetBeans C/C++</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://netbeans.org/projects/cnd/lists">Рассылки по NetBeans C/C++</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/cnd_zh_CN.html b/content/kb/docs/cnd_zh_CN.html
index 3201ed7..0c31dad 100644
--- a/content/kb/docs/cnd_zh_CN.html
+++ b/content/kb/docs/cnd_zh_CN.html
@@ -96,7 +96,7 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_开发_c_c_和_fortran_应用程序">开发 C、C++ 和 Fortran 应用程序</a></li>
<li><a href="#_入门指南">入门指南</a></li>
<li><a href="#_教程和文章">教程和文章</a></li>
@@ -105,27 +105,29 @@
<li><a href="#_其他资源">其他资源</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_开发_c_c_和_fortran_应用程序">开发 C、C++ 和 Fortran 应用程序</h4>
+<div class="sect1">
+<h2 id="_开发_c_c_和_fortran_应用程序">开发 C、C++ 和 Fortran 应用程序</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>当安装支持 C/C 的 NetBeans IDE 时,IDE 中将包括 C 和 C 项目类型以及相应的模板。您可以使用动态库和静态库创建 C、C 和 Fortran 应用程序,也可以创建基于现有源代码的 C/C/Fortran 项目。编辑器可以缩进、补充完整 C 和 C++ 代码并能突出显示其语法,它很好地集成了 GNU gdb 调试器。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_入门指南" class="sect0">入门指南</h1>
+<div class="sect1">
+<h2 id="_入门指南">入门指南</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../../community/releases/80/cpp-setup-instructions.html">+ 配置 NetBeans IDE 以使用 C/C+/Fortran</a>
-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[]</p>
+<p><a href="../../community/releases/80/cpp-setup-instructions.html">+ 配置 NetBeans IDE 以使用 C/C+/Fortran</a></p>
</li>
</ul>
</div>
-<h1 id="_教程和文章" class="sect0">教程和文章</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章">教程和文章</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>创建 C 和 C++ 项目</strong></p>
</div>
@@ -160,12 +162,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/remotedev-tutorial.html">C/C+ 远程开发教程+</a></p>
</li>
<li>
-<p><a href="../docs/cnd/c-unit-test.html">将单元测试添加到 C/C+ 项目+</a>
-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[]</p>
+<p><a href="../docs/cnd/c-unit-test.html">将单元测试添加到 C/C+ 项目+</a></p>
</li>
</ul>
</div>
-<h1 id="_教程和文章_2" class="sect0">教程和文章</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章_2">教程和文章</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>C 和 C++ 项目指导</strong></p>
</div>
@@ -181,12 +186,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/cnd/toolchain.html">使用 C/C+ 工具集合描述符+</a></p>
</li>
<li>
-<p><a href="../docs/cnd/cpp-vcs.html">在 VCS 下存储 NetBeans C/C+ 项目+</a>
-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[]</p>
+<p><a href="../docs/cnd/cpp-vcs.html">在 VCS 下存储 NetBeans C/C+ 项目+</a></p>
</li>
</ul>
</div>
-<h1 id="_社区提供的文档" class="sect0">社区提供的文档</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_社区提供的文档">社区提供的文档</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -197,17 +205,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_其他资源" class="sect0">其他资源</h1>
+<div class="sect1">
+<h2 id="_其他资源">其他资源</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -217,11 +219,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://wiki.netbeans.org/NetBeansUserFAQ#NetBeans_C.2FC.2B.2B_Development_Pack">NetBeans C/C+ 插件常见问题解答+</a></p>
</li>
<li>
-<p><a href="https://netbeans.org/projects/cnd/lists">NetBeans C/C+ 邮件列表+</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://netbeans.org/projects/cnd/lists">NetBeans C/C+ 邮件列表+</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-ee.html b/content/kb/docs/java-ee.html
index 522ae52..a4b20d9 100644
--- a/content/kb/docs/java-ee.html
+++ b/content/kb/docs/java-ee.html
@@ -96,29 +96,54 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
-<li><a href="#_what_is_a_java_web_application">What is a Java Web Application?</a></li>
+<ul class="sectlevel1">
+<li><a href="#_what_is_a_java_web_application">What is a Java Web Application?</a>
+<ul class="sectlevel2">
<li><a href="#_strong_what_is_java_ee_strong"><strong>What is Java EE?</strong></a></li>
<li><a href="#_javascript_and_ajax_development">JavaScript and Ajax Development</a></li>
+</ul>
+</li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
-<li><a href="#_screencasts">Screencasts</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_e_commerce_tutorial">NetBeans E-commerce Tutorial</a></li>
+<li><a href="#_contexts_and_dependency_injection">Contexts and Dependency Injection</a></li>
+<li><a href="#_developing_java_web_applications">Developing Java Web Applications</a></li>
+<li><a href="#_cloud_support">Cloud Support</a></li>
+<li><a href="#_ejb_technology_and_java_persistence">EJB Technology and Java Persistence</a></li>
+<li><a href="#_web_frameworks">Web Frameworks</a></li>
+<li><a href="#_javascript_and_ajax_development_2">JavaScript and Ajax Development</a></li>
+</ul>
+</li>
+<li><a href="#_screencasts">Screencasts</a>
+<ul class="sectlevel2">
+<li><a href="#_osgi_enabled_java_ee_applications_by_arun_gupta_youtube">OSGi-enabled Java EE Applications by Arun Gupta (YouTube)</a></li>
+<li><a href="#_java_ee_6_video_tutorial_by_arun_gupta_youtube">Java EE 6 Video Tutorial by Arun Gupta (YouTube)</a></li>
+</ul>
+</li>
<li><a href="#_sample_applications">Sample Applications</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
+<li><a href="#_other_resources">Other Resources</a>
+<ul class="sectlevel2">
+<li><a href="#_em_developing_applications_with_netbeans_ide_em_user_s_guide"><em>Developing Applications with NetBeans IDE</em> User’s Guide</a></li>
+<li><a href="#_faqs">FAQs</a></li>
+<li><a href="#_tutorials_and_other_docs">Tutorials and Other Docs</a></li>
+<li><a href="#_weblogs">Weblogs</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_what_is_a_java_web_application">What is a Java Web Application?</h4>
+<div class="sect1">
+<h2 id="_what_is_a_java_web_application">What is a Java Web Application?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
<div class="paragraph">
<p>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.</p>
</div>
-</div>
-<div class="sect3">
-<h4 id="_strong_what_is_java_ee_strong"><strong>What is Java EE?</strong></h4>
+<div class="sect2">
+<h3 id="_strong_what_is_java_ee_strong"><strong>What is Java EE?</strong></h3>
<div class="paragraph">
<p>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.</p>
</div>
@@ -136,21 +161,17 @@
</ul>
</div>
</div>
-<div class="sect3">
-<h4 id="_javascript_and_ajax_development">JavaScript and Ajax Development</h4>
+<div class="sect2">
+<h3 id="_javascript_and_ajax_development">JavaScript and Ajax Development</h3>
<div class="paragraph">
<p>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.</p>
</div>
-<div class="paragraph">
-<p> </p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -166,15 +187,17 @@
<p><a href="../docs/web/jsf20-intro.html">Introduction to JavaServer Faces 2.x</a></p>
</li>
<li>
-<p><a href="../docs/web/ajax-quickstart.html">Introduction to Ajax</a>
-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[]</p>
+<p><a href="../docs/web/ajax-quickstart.html">Introduction to Ajax</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>NetBeans E-commerce Tutorial</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeans_e_commerce_tutorial">NetBeans E-commerce Tutorial</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +241,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Contexts and Dependency Injection</strong></p>
</div>
+<div class="sect2">
+<h3 id="_contexts_and_dependency_injection">Contexts and Dependency Injection</h3>
<div class="ulist">
<ul>
<li>
@@ -240,9 +263,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Developing Java Web Applications</strong></p>
</div>
+<div class="sect2">
+<h3 id="_developing_java_web_applications">Developing Java Web Applications</h3>
<div class="ulist">
<ul>
<li>
@@ -268,9 +291,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Cloud Support</strong></p>
</div>
+<div class="sect2">
+<h3 id="_cloud_support">Cloud Support</h3>
<div class="ulist">
<ul>
<li>
@@ -284,9 +307,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>EJB Technology and Java Persistence</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ejb_technology_and_java_persistence">EJB Technology and Java Persistence</h3>
<div class="ulist">
<ul>
<li>
@@ -315,9 +338,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Web Frameworks</strong></p>
</div>
+<div class="sect2">
+<h3 id="_web_frameworks">Web Frameworks</h3>
<div class="ulist">
<ul>
<li>
@@ -346,9 +369,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaScript and Ajax Development</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javascript_and_ajax_development_2">JavaScript and Ajax Development</h3>
<div class="ulist">
<ul>
<li>
@@ -358,12 +381,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/web/js-toolkits-jquery.html">Using jQuery to Enhance the Appearance and Usability of a Web Page</a></p>
</li>
<li>
-<p><a href="../docs/web/js-toolkits-dojo.html">Connecting a Dojo Tree to an ArrayList using JSON</a>
-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[]</p>
+<p><a href="../docs/web/js-toolkits-dojo.html">Connecting a Dojo Tree to an ArrayList using JSON</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -401,9 +428,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>OSGi-enabled Java EE Applications by Arun Gupta</strong> (YouTube)</p>
-</div>
+<div class="sect2">
+<h3 id="_osgi_enabled_java_ee_applications_by_arun_gupta_youtube">OSGi-enabled Java EE Applications by Arun Gupta (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -426,9 +452,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java EE 6 Video Tutorial by Arun Gupta</strong> (YouTube)</p>
</div>
+<div class="sect2">
+<h3 id="_java_ee_6_video_tutorial_by_arun_gupta_youtube">Java EE 6 Video Tutorial by Arun Gupta (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -448,12 +474,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_sample_applications" class="sect0">Sample Applications</h1>
+</div>
+<div class="sect1">
+<h2 id="_sample_applications">Sample Applications</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -476,12 +502,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../samples/index.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -516,15 +541,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
-<div class="paragraph">
-<p><strong><em>Developing Applications with NetBeans IDE</em> User’s Guide</strong></p>
-</div>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_em_developing_applications_with_netbeans_ide_em_user_s_guide"><em>Developing Applications with NetBeans IDE</em> User’s Guide</h3>
<div class="ulist">
<ul>
<li>
@@ -547,9 +570,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>FAQs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_faqs">FAQs</h3>
<div class="ulist">
<ul>
<li>
@@ -560,9 +583,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Tutorials and Other Docs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_tutorials_and_other_docs">Tutorials and Other Docs</h3>
<div class="ulist">
<ul>
<li>
@@ -591,9 +614,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Weblogs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_weblogs">Weblogs</h3>
<div class="ulist">
<ul>
<li>
@@ -618,11 +641,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://blogs.oracle.com/theaquarium/">The Aquarium</a></p>
</li>
<li>
-<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-ee_ca.html b/content/kb/docs/java-ee_ca.html
index e9626b8..ac1a6aa 100644
--- a/content/kb/docs/java-ee_ca.html
+++ b/content/kb/docs/java-ee_ca.html
@@ -96,28 +96,51 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
-<li><a href="#_què_és_una_aplicació_java_web">Què és una aplicació Java Web?</a></li>
+<ul class="sectlevel1">
+<li><a href="#_què_és_una_aplicació_java_web">Què és una aplicació Java Web?</a>
+<ul class="sectlevel2">
<li><a href="#_strong_què_és_java_ee_strong"><strong>Què és Java EE?</strong></a></li>
+</ul>
+</li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
-<li><a href="#_screencasts">Screencasts</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_e_commerce_tutorial">NetBeans E-commerce Tutorial</a></li>
+<li><a href="#_contexts_and_dependency_injection">Contexts and Dependency Injection</a></li>
+<li><a href="#_developing_java_web_applications">Developing Java Web Applications</a></li>
+<li><a href="#_ejb_technology_and_java_persistence">EJB Technology and Java Persistence</a></li>
+<li><a href="#_web_frameworks">Web Frameworks</a></li>
+<li><a href="#_javascript_and_ajax_development">JavaScript and Ajax Development</a></li>
+</ul>
+</li>
+<li><a href="#_screencasts">Screencasts</a>
+<ul class="sectlevel2">
+<li><a href="#_osgi_enabled_java_ee_applications_by_arun_gupta_youtube">OSGi-enabled Java EE Applications by Arun Gupta (YouTube)</a></li>
+<li><a href="#_java_ee_6_video_tutorial_by_arun_gupta_youtube">Java EE 6 Video Tutorial by Arun Gupta (YouTube)</a></li>
+</ul>
+</li>
<li><a href="#_sample_applications">Sample Applications</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
+<li><a href="#_other_resources">Other Resources</a>
+<ul class="sectlevel2">
+<li><a href="#_faqs">FAQs</a></li>
+<li><a href="#_tutorials_and_other_docs">Tutorials and Other Docs</a></li>
+<li><a href="#_weblogs">Weblogs</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_què_és_una_aplicació_java_web">Què és una aplicació Java Web?</h4>
+<div class="sect1">
+<h2 id="_què_és_una_aplicació_java_web">Què és una aplicació Java Web?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
<div class="paragraph">
<p>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.</p>
</div>
-</div>
-<div class="sect3">
-<h4 id="_strong_què_és_java_ee_strong"><strong>Què és Java EE?</strong></h4>
+<div class="sect2">
+<h3 id="_strong_què_és_java_ee_strong"><strong>Què és Java EE?</strong></h3>
<div class="paragraph">
<p>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’ [...]
</div>
@@ -130,13 +153,16 @@
<p>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.</p>
</li>
<li>
-<p>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[]</p>
+<p>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.</p>
</li>
</ul>
</div>
</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -152,15 +178,17 @@ image::../../images_www/v6/trails/trails-box-tr.png[] image::../../images_www/v6
<p><a href="../docs/web/jsf20-intro.html">Introduction to JavaServer Faces 2.0</a></p>
</li>
<li>
-<p><a href="../docs/web/ajax-quickstart.html">Introduction to Ajax</a>
-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[]</p>
+<p><a href="../docs/web/ajax-quickstart.html">Introduction to Ajax</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>NetBeans E-commerce Tutorial</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeans_e_commerce_tutorial">NetBeans E-commerce Tutorial</h3>
<div class="ulist">
<ul>
<li>
@@ -204,9 +232,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Contexts and Dependency Injection</strong></p>
</div>
+<div class="sect2">
+<h3 id="_contexts_and_dependency_injection">Contexts and Dependency Injection</h3>
<div class="ulist">
<ul>
<li>
@@ -223,9 +251,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Developing Java Web Applications</strong></p>
</div>
+<div class="sect2">
+<h3 id="_developing_java_web_applications">Developing Java Web Applications</h3>
<div class="ulist">
<ul>
<li>
@@ -248,9 +276,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>EJB Technology and Java Persistence</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ejb_technology_and_java_persistence">EJB Technology and Java Persistence</h3>
<div class="ulist">
<ul>
<li>
@@ -276,9 +304,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Web Frameworks</strong></p>
</div>
+<div class="sect2">
+<h3 id="_web_frameworks">Web Frameworks</h3>
<div class="ulist">
<ul>
<li>
@@ -298,21 +326,25 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaScript and Ajax Development</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javascript_and_ajax_development">JavaScript and Ajax Development</h3>
<div class="ulist">
<ul>
<li>
<p><a href="../docs/web/js-toolkits-jquery.html">Using jQuery to Enhance the Appearance and Usability of a Web Page</a></p>
</li>
<li>
-<p><a href="../docs/web/js-toolkits-dojo.html">Connecting a Dojo Tree to an ArrayList using JSON</a>
-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[]</p>
+<p><a href="../docs/web/js-toolkits-dojo.html">Connecting a Dojo Tree to an ArrayList using JSON</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -332,9 +364,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>OSGi-enabled Java EE Applications by Arun Gupta</strong> (YouTube)</p>
-</div>
+<div class="sect2">
+<h3 id="_osgi_enabled_java_ee_applications_by_arun_gupta_youtube">OSGi-enabled Java EE Applications by Arun Gupta (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -357,9 +388,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java EE 6 Video Tutorial by Arun Gupta</strong> (YouTube)</p>
</div>
+<div class="sect2">
+<h3 id="_java_ee_6_video_tutorial_by_arun_gupta_youtube">Java EE 6 Video Tutorial by Arun Gupta (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -379,12 +410,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_sample_applications" class="sect0">Sample Applications</h1>
+</div>
+<div class="sect1">
+<h2 id="_sample_applications">Sample Applications</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -407,12 +438,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../samples/index.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -444,15 +474,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
-</div>
</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
-<div class="paragraph">
-<p><strong>FAQs</strong></p>
</div>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_faqs">FAQs</h3>
<div class="ulist">
<ul>
<li>
@@ -463,9 +491,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Tutorials and Other Docs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_tutorials_and_other_docs">Tutorials and Other Docs</h3>
<div class="ulist">
<ul>
<li>
@@ -494,9 +522,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Weblogs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_weblogs">Weblogs</h3>
<div class="ulist">
<ul>
<li>
@@ -527,11 +555,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://blogs.oracle.com/theaquarium/">The Aquarium</a></p>
</li>
<li>
-<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-ee_ja.html b/content/kb/docs/java-ee_ja.html
index 8e5ef5a..a087e85 100644
--- a/content/kb/docs/java-ee_ja.html
+++ b/content/kb/docs/java-ee_ja.html
@@ -96,29 +96,54 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
-<li><a href="#_java_webアプリケーションとは">Java Webアプリケーションとは</a></li>
+<ul class="sectlevel1">
+<li><a href="#_java_webアプリケーションとは">Java Webアプリケーションとは</a>
+<ul class="sectlevel2">
<li><a href="#_strong_java_eeとは_strong"><strong>Java EEとは</strong></a></li>
<li><a href="#_javascriptとajaxの開発">JavaScriptとAjaxの開発</a></li>
+</ul>
+</li>
<li><a href="#_開始">開始</a></li>
-<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a></li>
-<li><a href="#_スクリーンキャスト">スクリーンキャスト</a></li>
+<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_eコマースのチュートリアル">NetBeans Eコマースのチュートリアル</a></li>
+<li><a href="#_コンテキストと依存性の注入">コンテキストと依存性の注入</a></li>
+<li><a href="#_java_webアプリケーションの開発">Java Webアプリケーションの開発</a></li>
+<li><a href="#_クラウドのサポート">クラウドのサポート</a></li>
+<li><a href="#_ejbテクノロジとjava_persistence">EJBテクノロジとJava Persistence</a></li>
+<li><a href="#_webフレームワーク">Webフレームワーク</a></li>
+<li><a href="#_javascriptとajaxの開発_2">JavaScriptとAjaxの開発</a></li>
+</ul>
+</li>
+<li><a href="#_スクリーンキャスト">スクリーンキャスト</a>
+<ul class="sectlevel2">
+<li><a href="#_arun_gupta氏によるosgi対応のjava_eeアプリケーション_youtube">Arun Gupta氏によるOSGi対応のJava EEアプリケーション (YouTube)</a></li>
+<li><a href="#_arun_gupta氏によるjava_ee_6ビデオ_チュートリアル_youtube">Arun Gupta氏によるJava EE 6ビデオ・チュートリアル (YouTube)</a></li>
+</ul>
+</li>
<li><a href="#_サンプル_アプリケーション">サンプル・アプリケーション</a></li>
<li><a href="#_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</a></li>
-<li><a href="#_その他のリソース">その他のリソース</a></li>
+<li><a href="#_その他のリソース">その他のリソース</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_ideによるアプリケーションの開発_ユーザーズ_ガイド">_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド</a></li>
+<li><a href="#_faq">FAQ</a></li>
+<li><a href="#_チュートリアルおよびその他のドキュメント">チュートリアルおよびその他のドキュメント</a></li>
+<li><a href="#_ブログ">ブログ</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_java_webアプリケーションとは">Java Webアプリケーションとは</h4>
+<div class="sect1">
+<h2 id="_java_webアプリケーションとは">Java Webアプリケーションとは</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Java Webアプリケーションは、様々なタイプのマークアップ言語(HTML、XMLなど)や動的コンテンツを含む、対話式のWebページを生成します。通常、JavaServer Pages (JSP)、サーブレット、およびJavaBeansなどのWebコンポーネントで構成され、データの変更と一時保存、データベースやWebサービスとの対話、クライアント・リクエストに応じたコンテンツのレンダリングを行います。</p>
</div>
<div class="paragraph">
<p>Webアプリケーションの開発に伴うタスクの多くは反復的であったり、過剰な定型コードが必要であったりすることがあるため、Webフレームワークを適用して、一般的なアクティビティに関連するオーバーヘッドを軽減することができます。たとえば、JavaServer Facesなどのフレームワークの多くは、ページをテンプレート化するためのライブラリやセッション管理を提供し、コードの再利用を促進します。</p>
</div>
-</div>
-<div class="sect3">
-<h4 id="_strong_java_eeとは_strong"><strong>Java EEとは</strong></h4>
+<div class="sect2">
+<h3 id="_strong_java_eeとは_strong"><strong>Java EEとは</strong></h3>
<div class="paragraph">
<p>Java EE (Enterprise Edition)は、サーバー中心の複数層アプリケーションの開発、デプロイおよび管理にかかるコストと複雑さを大幅に削減する組織的なテクノロジのセットを含み、広く使用されているプラットフォームです。Java EEはJava SEプラットフォーム上にビルドされ、移植可能、堅牢、スケーラブル、信頼性、およびセキュリティに優れたサーバー側アプリケーションを開発および実行するための一連のAPI (application programming interfaces)を提供します。</p>
</div>
@@ -136,21 +161,17 @@
</ul>
</div>
</div>
-<div class="sect3">
-<h4 id="_javascriptとajaxの開発">JavaScriptとAjaxの開発</h4>
+<div class="sect2">
+<h3 id="_javascriptとajaxの開発">JavaScriptとAjaxの開発</h3>
<div class="paragraph">
<p>JavaScriptはオブジェクト指向のスクリプト言語で、主にWebアプリケーションのクライアント側インタフェースで使用されます。Ajax (Asynchronous JavaScript and XML)はWeb 2.0のテクニックで、ページをリフレッシュせずに、Webページを変更できます。JavaScriptのツールキットは、Ajax対応のコンポーネントや機能をWebページに実装するために利用できます。</p>
</div>
-<div class="paragraph">
-<p> </p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
</div>
-<h1 id="_開始" class="sect0">開始</h1>
+<div class="sect1">
+<h2 id="_開始">開始</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -166,15 +187,17 @@
<p><a href="../docs/web/jsf20-intro.html">JavaServer Faces 2.x入門</a></p>
</li>
<li>
-<p><a href="../docs/web/ajax-quickstart.html">Ajax入門</a>
-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[]</p>
+<p><a href="../docs/web/ajax-quickstart.html">Ajax入門</a></p>
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事" class="sect0">チュートリアルおよび記事</h1>
-<div class="paragraph">
-<p><strong>NetBeans Eコマースのチュートリアル</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事">チュートリアルおよび記事</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeans_eコマースのチュートリアル">NetBeans Eコマースのチュートリアル</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +241,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>コンテキストと依存性の注入</strong></p>
</div>
+<div class="sect2">
+<h3 id="_コンテキストと依存性の注入">コンテキストと依存性の注入</h3>
<div class="ulist">
<ul>
<li>
@@ -240,9 +263,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java Webアプリケーションの開発</strong></p>
</div>
+<div class="sect2">
+<h3 id="_java_webアプリケーションの開発">Java Webアプリケーションの開発</h3>
<div class="ulist">
<ul>
<li>
@@ -268,9 +291,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>クラウドのサポート</strong></p>
</div>
+<div class="sect2">
+<h3 id="_クラウドのサポート">クラウドのサポート</h3>
<div class="ulist">
<ul>
<li>
@@ -284,9 +307,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>EJBテクノロジとJava Persistence</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ejbテクノロジとjava_persistence">EJBテクノロジとJava Persistence</h3>
<div class="ulist">
<ul>
<li>
@@ -315,9 +338,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Webフレームワーク</strong></p>
</div>
+<div class="sect2">
+<h3 id="_webフレームワーク">Webフレームワーク</h3>
<div class="ulist">
<ul>
<li>
@@ -343,9 +366,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaScriptとAjaxの開発</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javascriptとajaxの開発_2">JavaScriptとAjaxの開発</h3>
<div class="ulist">
<ul>
<li>
@@ -355,12 +378,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/web/js-toolkits-jquery.html">jQueryを使用した、Webページの見た目と使いやすさの向上</a></p>
</li>
<li>
-<p><a href="../docs/web/js-toolkits-dojo.html">JSONを使用したDojoツリーのArrayListへの接続</a>
-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[]</p>
+<p><a href="../docs/web/js-toolkits-dojo.html">JSONを使用したDojoツリーのArrayListへの接続</a></p>
</li>
</ul>
</div>
-<h1 id="_スクリーンキャスト" class="sect0">スクリーンキャスト</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_スクリーンキャスト">スクリーンキャスト</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -398,9 +425,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Arun Gupta氏によるOSGi対応のJava EEアプリケーション</strong> (YouTube)</p>
-</div>
+<div class="sect2">
+<h3 id="_arun_gupta氏によるosgi対応のjava_eeアプリケーション_youtube">Arun Gupta氏によるOSGi対応のJava EEアプリケーション (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -423,9 +449,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Arun Gupta氏によるJava EE 6ビデオ・チュートリアル</strong> (YouTube)</p>
</div>
+<div class="sect2">
+<h3 id="_arun_gupta氏によるjava_ee_6ビデオ_チュートリアル_youtube">Arun Gupta氏によるJava EE 6ビデオ・チュートリアル (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -445,12 +471,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_サンプル_アプリケーション" class="sect0">サンプル・アプリケーション</h1>
+</div>
+<div class="sect1">
+<h2 id="_サンプル_アプリケーション">サンプル・アプリケーション</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -473,12 +499,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../samples/index.html"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_コミュニティの寄稿ドキュメント" class="sect0">コミュニティの寄稿ドキュメント</h1>
+<div class="sect1">
+<h2 id="_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -513,15 +538,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_その他のリソース" class="sect0">その他のリソース</h1>
-<div class="paragraph">
-<p><strong>_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド</strong></p>
-</div>
+<div class="sect1">
+<h2 id="_その他のリソース">その他のリソース</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeans_ideによるアプリケーションの開発_ユーザーズ_ガイド">_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド</h3>
<div class="ulist">
<ul>
<li>
@@ -544,9 +567,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>FAQ</strong></p>
</div>
+<div class="sect2">
+<h3 id="_faq">FAQ</h3>
<div class="ulist">
<ul>
<li>
@@ -557,9 +580,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>チュートリアルおよびその他のドキュメント</strong></p>
</div>
+<div class="sect2">
+<h3 id="_チュートリアルおよびその他のドキュメント">チュートリアルおよびその他のドキュメント</h3>
<div class="ulist">
<ul>
<li>
@@ -588,9 +611,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>ブログ</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ブログ">ブログ</h3>
<div class="ulist">
<ul>
<li>
@@ -615,11 +638,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://blogs.oracle.com/theaquarium/">Aquarium</a></p>
</li>
<li>
-<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-ee_pt_BR.html b/content/kb/docs/java-ee_pt_BR.html
index 9d3edc9..b4aeed8 100644
--- a/content/kb/docs/java-ee_pt_BR.html
+++ b/content/kb/docs/java-ee_pt_BR.html
@@ -96,29 +96,54 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
-<li><a href="#_o_que_é_uma_aplicação_java_web">O que é uma Aplicação Java Web?</a></li>
+<ul class="sectlevel1">
+<li><a href="#_o_que_é_uma_aplicação_java_web">O que é uma Aplicação Java Web?</a>
+<ul class="sectlevel2">
<li><a href="#_strong_o_que_é_java_ee_strong"><strong>O que é Java EE?</strong></a></li>
<li><a href="#_desenvolvimento_em_javascript_e_ajax">Desenvolvimento em JavaScript e Ajax</a></li>
+</ul>
+</li>
<li><a href="#_introdução">Introdução</a></li>
-<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a></li>
-<li><a href="#_screencasts">Screencasts</a></li>
+<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_tutorial_de_e_commerce_do_netbeans">Tutorial de E-commerce do NetBeans</a></li>
+<li><a href="#_injeção_de_dependência_e_contextos">Injeção de Dependência e Contextos</a></li>
+<li><a href="#_desenvolvendo_aplicações_java_web">Desenvolvendo Aplicações Java Web</a></li>
+<li><a href="#_suporte_a_nuvem">Suporte a Nuvem</a></li>
+<li><a href="#_tecnologia_ejb_e_java_persistence">Tecnologia EJB e Java Persistence</a></li>
+<li><a href="#_frameworks_web">Frameworks Web</a></li>
+<li><a href="#_desenvolvimento_em_javascript_e_ajax_2">Desenvolvimento em JavaScript e Ajax</a></li>
+</ul>
+</li>
+<li><a href="#_screencasts">Screencasts</a>
+<ul class="sectlevel2">
+<li><a href="#_aplicações_do_java_ee_ativados_para_osgi_de_arun_gupta_youtube">Aplicações do Java EE ativados para OSGi de Arun Gupta (YouTube)</a></li>
+<li><a href="#_tutorial_em_vídeo_do_java_ee_6_de_arun_gupta_youtube">Tutorial em Vídeo do Java EE 6 de Arun Gupta (YouTube)</a></li>
+</ul>
+</li>
<li><a href="#_aplicações_de_amostra">Aplicações de Amostra</a></li>
<li><a href="#_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</a></li>
-<li><a href="#_outros_recursos">Outros Recursos</a></li>
+<li><a href="#_outros_recursos">Outros Recursos</a>
+<ul class="sectlevel2">
+<li><a href="#_em_desenvolvendo_aplicações_com_o_netbeans_ide_em_guia_do_usuário"><em>Desenvolvendo Aplicações com o NetBeans IDE</em> Guia do Usuário</a></li>
+<li><a href="#_perguntas_frequentes">Perguntas Frequentes</a></li>
+<li><a href="#_tutoriais_e_outras_documentações">Tutoriais e Outras Documentações</a></li>
+<li><a href="#_weblogs">Weblogs</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_o_que_é_uma_aplicação_java_web">O que é uma Aplicação Java Web?</h4>
+<div class="sect1">
+<h2 id="_o_que_é_uma_aplicação_java_web">O que é uma Aplicação Java Web?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
<div class="paragraph">
<p>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.</p>
</div>
-</div>
-<div class="sect3">
-<h4 id="_strong_o_que_é_java_ee_strong"><strong>O que é Java EE?</strong></h4>
+<div class="sect2">
+<h3 id="_strong_o_que_é_java_ee_strong"><strong>O que é Java EE?</strong></h3>
<div class="paragraph">
<p>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 seg [...]
</div>
@@ -136,21 +161,17 @@
</ul>
</div>
</div>
-<div class="sect3">
-<h4 id="_desenvolvimento_em_javascript_e_ajax">Desenvolvimento em JavaScript e Ajax</h4>
+<div class="sect2">
+<h3 id="_desenvolvimento_em_javascript_e_ajax">Desenvolvimento em JavaScript e Ajax</h3>
<div class="paragraph">
<p>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.</p>
</div>
-<div class="paragraph">
-<p> </p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
</div>
-<h1 id="_introdução" class="sect0">Introdução</h1>
+<div class="sect1">
+<h2 id="_introdução">Introdução</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -166,15 +187,17 @@
<p><a href="../docs/web/jsf20-intro.html">Introdução ao JavaServer Faces 2.x</a></p>
</li>
<li>
-<p><a href="../docs/web/ajax-quickstart.html">Introdução ao Ajax</a>
-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[]</p>
+<p><a href="../docs/web/ajax-quickstart.html">Introdução ao Ajax</a></p>
</li>
</ul>
</div>
-<h1 id="_tutoriais_e_artigos" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p><strong>Tutorial de E-commerce do NetBeans</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_tutorial_de_e_commerce_do_netbeans">Tutorial de E-commerce do NetBeans</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +241,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Injeção de Dependência e Contextos</strong></p>
</div>
+<div class="sect2">
+<h3 id="_injeção_de_dependência_e_contextos">Injeção de Dependência e Contextos</h3>
<div class="ulist">
<ul>
<li>
@@ -240,9 +263,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Desenvolvendo Aplicações Java Web</strong></p>
</div>
+<div class="sect2">
+<h3 id="_desenvolvendo_aplicações_java_web">Desenvolvendo Aplicações Java Web</h3>
<div class="ulist">
<ul>
<li>
@@ -268,9 +291,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Suporte a Nuvem</strong></p>
</div>
+<div class="sect2">
+<h3 id="_suporte_a_nuvem">Suporte a Nuvem</h3>
<div class="ulist">
<ul>
<li>
@@ -284,9 +307,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Tecnologia EJB e Java Persistence</strong></p>
</div>
+<div class="sect2">
+<h3 id="_tecnologia_ejb_e_java_persistence">Tecnologia EJB e Java Persistence</h3>
<div class="ulist">
<ul>
<li>
@@ -315,9 +338,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Frameworks Web</strong></p>
</div>
+<div class="sect2">
+<h3 id="_frameworks_web">Frameworks Web</h3>
<div class="ulist">
<ul>
<li>
@@ -343,9 +366,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Desenvolvimento em JavaScript e Ajax</strong></p>
</div>
+<div class="sect2">
+<h3 id="_desenvolvimento_em_javascript_e_ajax_2">Desenvolvimento em JavaScript e Ajax</h3>
<div class="ulist">
<ul>
<li>
@@ -355,12 +378,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/web/js-toolkits-jquery.html">Usando jQuery para Aprimorar a Aparência e o Uso de uma Página Web</a></p>
</li>
<li>
-<p><a href="../docs/web/js-toolkits-dojo.html">Conectando uma Árvore Dojo a uma ArrayList utilizando JSON</a>
-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[]</p>
+<p><a href="../docs/web/js-toolkits-dojo.html">Conectando uma Árvore Dojo a uma ArrayList utilizando JSON</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -398,9 +425,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Aplicações do Java EE ativados para OSGi de Arun Gupta</strong> (YouTube)</p>
-</div>
+<div class="sect2">
+<h3 id="_aplicações_do_java_ee_ativados_para_osgi_de_arun_gupta_youtube">Aplicações do Java EE ativados para OSGi de Arun Gupta (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -423,9 +449,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Tutorial em Vídeo do Java EE 6 de Arun Gupta</strong> (YouTube)</p>
</div>
+<div class="sect2">
+<h3 id="_tutorial_em_vídeo_do_java_ee_6_de_arun_gupta_youtube">Tutorial em Vídeo do Java EE 6 de Arun Gupta (YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -445,12 +471,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_aplicações_de_amostra" class="sect0">Aplicações de Amostra</h1>
+</div>
+<div class="sect1">
+<h2 id="_aplicações_de_amostra">Aplicações de Amostra</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -473,12 +499,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../samples/index.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_documentos_de_contribuição_da_comunidade" class="sect0">Documentos de Contribuição da Comunidade</h1>
+<div class="sect1">
+<h2 id="_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -513,15 +538,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_outros_recursos" class="sect0">Outros Recursos</h1>
-<div class="paragraph">
-<p><strong><em>Desenvolvendo Aplicações com o NetBeans IDE</em> Guia do Usuário</strong></p>
-</div>
+<div class="sect1">
+<h2 id="_outros_recursos">Outros Recursos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_em_desenvolvendo_aplicações_com_o_netbeans_ide_em_guia_do_usuário"><em>Desenvolvendo Aplicações com o NetBeans IDE</em> Guia do Usuário</h3>
<div class="ulist">
<ul>
<li>
@@ -544,9 +567,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Perguntas Frequentes</strong></p>
</div>
+<div class="sect2">
+<h3 id="_perguntas_frequentes">Perguntas Frequentes</h3>
<div class="ulist">
<ul>
<li>
@@ -557,9 +580,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Tutoriais e Outras Documentações</strong></p>
</div>
+<div class="sect2">
+<h3 id="_tutoriais_e_outras_documentações">Tutoriais e Outras Documentações</h3>
<div class="ulist">
<ul>
<li>
@@ -588,9 +611,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Weblogs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_weblogs">Weblogs</h3>
<div class="ulist">
<ul>
<li>
@@ -615,11 +638,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://blogs.oracle.com/theaquarium/">The Aquarium</a></p>
</li>
<li>
-<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-ee_ru.html b/content/kb/docs/java-ee_ru.html
index 414be5d..d971cdd 100644
--- a/content/kb/docs/java-ee_ru.html
+++ b/content/kb/docs/java-ee_ru.html
@@ -96,7 +96,7 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_Общее_представление_о_веб_приложении_java">Общее представление о веб-приложении Java</a></li>
<li><a href="#_strong_Общие_сведения_о_java_ee_strong"><strong>Общие сведения о Java EE</strong></a></li>
<li><a href="#_Разработка_на_javascript_и_ajax">Разработка на JavaScript и Ajax</a></li>
@@ -108,8 +108,9 @@
<li><a href="#_Другие_источники">Другие источники</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_Общее_представление_о_веб_приложении_java">Общее представление о веб-приложении Java</h4>
+<div class="sect1">
+<h2 id="_Общее_представление_о_веб_приложении_java">Общее представление о веб-приложении Java</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Веб-приложение Java создает интерактивные веб-страницы, содержащие различные типы языков разметки (HTML, XML и т.д.), а также динамическое содержимое. Это содержимое обычно формируется веб-компонентами, например страницами JavaServer (JSP), сервлетами и компонентами JavaBean, которые позволяют изменять данные и осуществлять их временное хранение, взаимодействовать с базами данных и веб-службами, а также отображать содержимое в ответ на запросы клиентов.</p>
</div>
@@ -117,8 +118,10 @@
<p>Так как многие задачи разработки веб-приложения могут повторяться или требовать наличия избыточного шаблонного кода, то для уменьшения количества общих действий следует применять веб-платформы. Многие платформы (например, JavaServer Faces) предоставляют библиотеки для создания шаблонов страниц и управления сеансами, а также часто обеспечивают повторное использование кода.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_strong_Общие_сведения_о_java_ee_strong"><strong>Общие сведения о Java EE</strong></h4>
+</div>
+<div class="sect1">
+<h2 id="_strong_Общие_сведения_о_java_ee_strong"><strong>Общие сведения о Java EE</strong></h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Java EE (Enterprise Edition) представляет собой широко используемую платформу, содержащую набор взаимосвязанных технологий, которые существенно сокращают стоимость и сложность разработки, развертывания многоуровневых серверных приложений, а также управления ими. Платформа Java EE основана на платформе Java SE и предоставляет набор интерфейсов API (интерфейсов разработки приложений) для разработки и запуска портируемых, надежных, масштабируемых и безопасных серверных приложений.</p>
</div>
@@ -136,8 +139,10 @@
</ul>
</div>
</div>
-<div class="sect3">
-<h4 id="_Разработка_на_javascript_и_ajax">Разработка на JavaScript и Ajax</h4>
+</div>
+<div class="sect1">
+<h2 id="_Разработка_на_javascript_и_ajax">Разработка на JavaScript и Ajax</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>JavaScript представляет собой объектно-ориентированный язык сценариев и в основном используется в клиентских интерфейсах веб-приложений. Ajax (асинхронный JavaScript и XML) является технологией Web 2.0, позволяющей выполнять изменения веб-страницы без ее обновления. Для реализации компонентов и функций Ajax на веб-страницах можно использовать наборы инструментов JavaScript.</p>
</div>
@@ -150,7 +155,10 @@
</div>
</div>
</div>
-<h1 id="_Начало_работы" class="sect0">Начало работы</h1>
+</div>
+<div class="sect1">
+<h2 id="_Начало_работы">Начало работы</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -171,7 +179,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи" class="sect0">Учебные курсы и статьи</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи">Учебные курсы и статьи</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>Учебный курс по электронной коммерции в среде NetBeans</strong></p>
</div>
@@ -360,7 +372,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_Экранные_демонстрации" class="sect0">Экранные демонстрации</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Экранные_демонстрации">Экранные демонстрации</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -450,7 +466,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_Примеры_приложений" class="sect0">Примеры приложений</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Примеры_приложений">Примеры приложений</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -478,7 +498,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<a class="image" href="../samples/index.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_Документы_от_сообщества" class="sect0">Документы от сообщества</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Документы_от_сообщества">Документы от сообщества</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -518,7 +542,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_Другие_источники" class="sect0">Другие источники</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Другие_источники">Другие источники</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong><em>Разработка приложений в IDE NetBeans</em> - Руководство пользователя</strong></p>
</div>
@@ -620,6 +648,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-ee_zh_CN.html b/content/kb/docs/java-ee_zh_CN.html
index 7dafac0..1277225 100644
--- a/content/kb/docs/java-ee_zh_CN.html
+++ b/content/kb/docs/java-ee_zh_CN.html
@@ -96,29 +96,53 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
-<li><a href="#_什么是_java_web_应用程序">什么是 Java Web 应用程序?</a></li>
+<ul class="sectlevel1">
+<li><a href="#_什么是_java_web_应用程序">什么是 Java Web 应用程序?</a>
+<ul class="sectlevel2">
<li><a href="#_strong_什么是_java_ee_strong"><strong>什么是 Java EE?</strong></a></li>
<li><a href="#_javascript_和_ajax_开发">JavaScript 和 Ajax 开发</a></li>
+</ul>
+</li>
<li><a href="#_入门指南">入门指南</a></li>
-<li><a href="#_教程和文章">教程和文章</a></li>
-<li><a href="#_截屏视频">截屏视频</a></li>
-<li><a href="#_样例应用程序">样例应用程序</a></li>
+<li><a href="#_教程和文章">教程和文章</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_电子商务教程">NetBeans 电子商务教程</a></li>
+<li><a href="#_上下文和依赖关系注入">上下文和依赖关系注入</a></li>
+<li><a href="#_开发_java_web_应用程序">开发 Java Web 应用程序</a></li>
+<li><a href="#_云支持">云支持</a></li>
+<li><a href="#_ejb_技术和_java_持久性">EJB 技术和 Java 持久性</a></li>
+<li><a href="#_web_框架">Web 框架</a></li>
+<li><a href="#_javascript_和_ajax_开发_2">JavaScript 和 Ajax 开发</a></li>
+</ul>
+</li>
+<li><a href="#_截屏视频">截屏视频</a>
+<ul class="sectlevel2">
+<li><a href="#_启用_osgi_的_java_ee_应用程序_作者_arun_gupta_youtube">启用 OSGi 的 Java EE 应用程序(作者:Arun Gupta)(YouTube)</a></li>
+<li><a href="#_java_ee_6_视频教程_作者_arun_gupta_youtube">Java EE 6 视频教程(作者:Arun Gupta)(YouTube)</a></li>
+</ul>
+</li>
<li><a href="#_社区提供的文档">社区提供的文档</a></li>
-<li><a href="#_其他资源">其他资源</a></li>
+<li><a href="#_其他资源">其他资源</a>
+<ul class="sectlevel2">
+<li><a href="#_使用_netbeans_ide_开发应用程序_用户指南">_使用 NetBeans IDE 开发应用程序_用户指南</a></li>
+<li><a href="#_常见问题解答">常见问题解答</a></li>
+<li><a href="#_教程和其他文档">教程和其他文档</a></li>
+<li><a href="#_博客">博客</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_什么是_java_web_应用程序">什么是 Java Web 应用程序?</h4>
+<div class="sect1">
+<h2 id="_什么是_java_web_应用程序">什么是 Java Web 应用程序?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Java Web 应用程序会生成包含各种类型的标记语言(HTML 和 XML 等)和动态内容的交互式 Web 页。它通常由 Web 组件组成(如 JavaServer Pages (JSP)、servlet 和 JavaBeans),可用来修改和临时存储数据、与数据库和 Web 服务交互,以及根据客户端的请求呈现内容。</p>
</div>
<div class="paragraph">
<p>由于 Web 应用程序开发中涉及的很多任务都可以重复或需要多余的模板代码,因此可以应用 Web 框架来减少与常见活动相关联的开销。例如,很多框架(如 JavaServer Faces)为模板页面和会话管理提供了库,并经常提高代码的重用率。</p>
</div>
-</div>
-<div class="sect3">
-<h4 id="_strong_什么是_java_ee_strong"><strong>什么是 Java EE?</strong></h4>
+<div class="sect2">
+<h3 id="_strong_什么是_java_ee_strong"><strong>什么是 Java EE?</strong></h3>
<div class="paragraph">
<p>Java EE (Enterprise Edition) 是一种广泛使用的平台,包含了一组协调技术,可显著降低成本以及开发、部署和管理以服务器为中心的多层应用程序的复杂性。Java EE 是基于 Java SE 平台构建的,并提供了一组用于开发和运行可移植、强健、可伸缩、可靠和安全的服务器端应用程序的 API(应用程序编程接口)。</p>
</div>
@@ -136,21 +160,17 @@
</ul>
</div>
</div>
-<div class="sect3">
-<h4 id="_javascript_和_ajax_开发">JavaScript 和 Ajax 开发</h4>
+<div class="sect2">
+<h3 id="_javascript_和_ajax_开发">JavaScript 和 Ajax 开发</h3>
<div class="paragraph">
<p>JavaScript 是面向对象的脚本语言,主要用在 Web 应用程序的客户端接口中。Ajax(异步 JavaScript 和 XML)是一种 Web 2.0 技术,能使 Web 页发生变化而无需执行页面刷新。JavaScript 工具包可用于在 Web 页中实现支持 Ajax 的组件和功能。</p>
</div>
-<div class="paragraph">
-<p> </p>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
</div>
-<h1 id="_入门指南" class="sect0">入门指南</h1>
+<div class="sect1">
+<h2 id="_入门指南">入门指南</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -166,15 +186,17 @@
<p><a href="../docs/web/jsf20-intro.html">JavaServer Faces 2.x 简介</a></p>
</li>
<li>
-<p><a href="../docs/web/ajax-quickstart.html">Ajax 简介</a>
-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[]</p>
+<p><a href="../docs/web/ajax-quickstart.html">Ajax 简介</a></p>
</li>
</ul>
</div>
-<h1 id="_教程和文章" class="sect0">教程和文章</h1>
-<div class="paragraph">
-<p><strong>NetBeans 电子商务教程</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章">教程和文章</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeans_电子商务教程">NetBeans 电子商务教程</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +240,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>上下文和依赖关系注入</strong></p>
</div>
+<div class="sect2">
+<h3 id="_上下文和依赖关系注入">上下文和依赖关系注入</h3>
<div class="ulist">
<ul>
<li>
@@ -240,9 +262,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>开发 Java Web 应用程序</strong></p>
</div>
+<div class="sect2">
+<h3 id="_开发_java_web_应用程序">开发 Java Web 应用程序</h3>
<div class="ulist">
<ul>
<li>
@@ -268,9 +290,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>云支持</strong></p>
</div>
+<div class="sect2">
+<h3 id="_云支持">云支持</h3>
<div class="ulist">
<ul>
<li>
@@ -284,9 +306,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>EJB 技术和 Java 持久性</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ejb_技术和_java_持久性">EJB 技术和 Java 持久性</h3>
<div class="ulist">
<ul>
<li>
@@ -315,9 +337,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Web 框架</strong></p>
</div>
+<div class="sect2">
+<h3 id="_web_框架">Web 框架</h3>
<div class="ulist">
<ul>
<li>
@@ -343,9 +365,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaScript 和 Ajax 开发</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javascript_和_ajax_开发_2">JavaScript 和 Ajax 开发</h3>
<div class="ulist">
<ul>
<li>
@@ -355,12 +377,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/web/js-toolkits-jquery.html">使用 jQuery 改善 Web 页的外观和可用性</a></p>
</li>
<li>
-<p><a href="../docs/web/js-toolkits-dojo.html">使用 JSON 将 Dojo 树连接至 ArrayList</a>
-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[]</p>
+<p><a href="../docs/web/js-toolkits-dojo.html">使用 JSON 将 Dojo 树连接至 ArrayList</a></p>
</li>
</ul>
</div>
-<h1 id="_截屏视频" class="sect0">截屏视频</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_截屏视频">截屏视频</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -398,9 +424,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>启用 OSGi 的 Java EE 应用程序(作者:Arun Gupta)</strong>(YouTube)</p>
-</div>
+<div class="sect2">
+<h3 id="_启用_osgi_的_java_ee_应用程序_作者_arun_gupta_youtube">启用 OSGi 的 Java EE 应用程序(作者:Arun Gupta)(YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -423,9 +448,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java EE 6 视频教程(作者:Arun Gupta)</strong>(YouTube)</p>
</div>
+<div class="sect2">
+<h3 id="_java_ee_6_视频教程_作者_arun_gupta_youtube">Java EE 6 视频教程(作者:Arun Gupta)(YouTube)</h3>
<div class="ulist">
<ul>
<li>
@@ -445,18 +470,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
-</div>
</div>
-<h1 id="_样例应用程序" class="sect0">样例应用程序</h1>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../samples/index.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_社区提供的文档" class="sect0">社区提供的文档</h1>
+<div class="sect1">
+<h2 id="_社区提供的文档">社区提供的文档</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -491,15 +510,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button" height="]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["></a>
</div>
</div>
-<h1 id="_其他资源" class="sect0">其他资源</h1>
-<div class="paragraph">
-<p><strong>_使用 NetBeans IDE 开发应用程序_用户指南</strong></p>
-</div>
+<div class="sect1">
+<h2 id="_其他资源">其他资源</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_使用_netbeans_ide_开发应用程序_用户指南">_使用 NetBeans IDE 开发应用程序_用户指南</h3>
<div class="ulist">
<ul>
<li>
@@ -522,9 +539,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>常见问题解答</strong></p>
</div>
+<div class="sect2">
+<h3 id="_常见问题解答">常见问题解答</h3>
<div class="ulist">
<ul>
<li>
@@ -535,9 +552,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>教程和其他文档</strong></p>
</div>
+<div class="sect2">
+<h3 id="_教程和其他文档">教程和其他文档</h3>
<div class="ulist">
<ul>
<li>
@@ -566,9 +583,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>博客</strong></p>
</div>
+<div class="sect2">
+<h3 id="_博客">博客</h3>
<div class="ulist">
<ul>
<li>
@@ -593,11 +610,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://blogs.oracle.com/theaquarium/">The Aquarium</a></p>
</li>
<li>
-<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://buttso.blogspot.com/">The Buttso Blathers</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-se_ca.html b/content/kb/docs/java-se_ca.html
index 18c16ad..7ebcf51 100644
--- a/content/kb/docs/java-se_ca.html
+++ b/content/kb/docs/java-se_ca.html
@@ -96,42 +96,52 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_què_és_una_aplicació_java_se">Què és una aplicació Java SE?</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_developing_java_applications">Developing Java Applications</a></li>
+<li><a href="#_building_debugging_and_testing">Building, Debugging, and Testing</a></li>
+<li><a href="#_maven">Maven</a></li>
+<li><a href="#_profiling_source_code">Profiling Source Code</a></li>
+<li><a href="#_scripting_languages">Scripting Languages</a></li>
+<li><a href="#_jmx_monitoring_and_management">JMX Monitoring and Management</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
<li><a href="#_other_resources">Other Resources</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_què_és_una_aplicació_java_se">Què és una aplicació Java SE?</h4>
+<div class="sect1">
+<h2 id="_què_és_una_aplicació_java_se">Què és una aplicació Java SE?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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 ant [...]
</div>
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/quickstart.html">Java Quick Start Tutorial</a>
-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[]</p>
+<p><a href="../docs/java/quickstart.html">Java Quick Start Tutorial</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p>*Developing Java Applications *</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_developing_java_applications">Developing Java Applications</h3>
<div class="ulist">
<ul>
<li>
@@ -160,9 +170,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Building, Debugging, and Testing</strong></p>
</div>
+<div class="sect2">
+<h3 id="_building_debugging_and_testing">Building, Debugging, and Testing</h3>
<div class="ulist">
<ul>
<li>
@@ -176,9 +186,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Maven</strong></p>
</div>
+<div class="sect2">
+<h3 id="_maven">Maven</h3>
<div class="ulist">
<ul>
<li>
@@ -189,9 +199,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Profiling Source Code</strong></p>
</div>
+<div class="sect2">
+<h3 id="_profiling_source_code">Profiling Source Code</h3>
<div class="ulist">
<ul>
<li>
@@ -205,9 +215,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Scripting Languages</strong></p>
</div>
+<div class="sect2">
+<h3 id="_scripting_languages">Scripting Languages</h3>
<div class="ulist">
<ul>
<li>
@@ -215,9 +225,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JMX Monitoring and Management</strong></p>
</div>
+<div class="sect2">
+<h3 id="_jmx_monitoring_and_management">JMX Monitoring and Management</h3>
<div class="ulist">
<ul>
<li>
@@ -227,12 +237,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/java/jmx-tutorial.html">Adding JMX Instrumentation to a Java Application</a></p>
</li>
<li>
-<p><a href="../docs/java/jmx-manager-tutorial.html">Developing a JMX Manager and Connecting to a Remote JMX Agent</a>
-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[]</p>
+<p><a href="../docs/java/jmx-manager-tutorial.html">Developing a JMX Manager and Connecting to a Remote JMX Agent</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -255,17 +269,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -291,17 +299,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -338,11 +340,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://www.javapassion.com/portal/">JavaPassion Java Intro</a></p>
</li>
<li>
-<p><a href="http://download.oracle.com/javase/tutorial/">The Java Tutorials</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[] </p>
+<p><a href="http://download.oracle.com/javase/tutorial/">The Java Tutorials</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-se_ja.html b/content/kb/docs/java-se_ja.html
index 6d3c3a6..e404ddf 100644
--- a/content/kb/docs/java-se_ja.html
+++ b/content/kb/docs/java-se_ja.html
@@ -96,42 +96,52 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_java_seアプリケーションとは">Java SEアプリケーションとは</a></li>
<li><a href="#_開始">開始</a></li>
-<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a></li>
+<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a>
+<ul class="sectlevel2">
+<li><a href="#_javaアプリケーションの開発">Javaアプリケーションの開発</a></li>
+<li><a href="#_ビルド_デバッグ_およびテスト">ビルド、デバッグ、およびテスト</a></li>
+<li><a href="#_maven">Maven</a></li>
+<li><a href="#_ソース_コードのプロファイリング">ソース・コードのプロファイリング</a></li>
+<li><a href="#_スクリプト作成言語">スクリプト作成言語</a></li>
+<li><a href="#_jmxのモニタリングおよび管理">JMXのモニタリングおよび管理</a></li>
+</ul>
+</li>
<li><a href="#_スクリーンキャスト">スクリーンキャスト</a></li>
<li><a href="#_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</a></li>
<li><a href="#_その他のリソース">その他のリソース</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_java_seアプリケーションとは">Java SEアプリケーションとは</h4>
+<div class="sect1">
+<h2 id="_java_seアプリケーションとは">Java SEアプリケーションとは</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Java SEアプリケーションは、Java Platform, Standard Edition (Java SE)向けに作成されたアプリケーションです。Java SEアプリケーションは、Microsoft Windows、Solaris、Linux、またはOS Xの各オペレーティング・システムが動作するコンピュータで変更せずに実行できます。このようなアプリケーションの移植性の基盤となるのがJava Runtime Environmentです。上記で述べたオペレーティング・システムを含む、ほとんどのオペレーティング・システム用のJava Runtime Environmentが無償で提供されています。</p>
</div>
<div class="paragraph">
<p>Java SEプラットフォームは、マルチプラットフォーム・デスクトップ・アプリケーションのプラットフォームであるのみでなく、Java Platform, Enterprise Editionなど、他のテクノロジの基盤でもあります。Webアプリケーションとエンタープライズ・アプリケーションのバックエンド・ロジックのJavaコードを作成することもできます。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_開始" class="sect0">開始</h1>
+<div class="sect1">
+<h2 id="_開始">開始</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/quickstart.html">Javaクイック・スタート・チュートリアル</a>
-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[]</p>
+<p><a href="../docs/java/quickstart.html">Javaクイック・スタート・チュートリアル</a></p>
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事" class="sect0">チュートリアルおよび記事</h1>
-<div class="paragraph">
-<p><strong>Javaアプリケーションの開発</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事">チュートリアルおよび記事</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_javaアプリケーションの開発">Javaアプリケーションの開発</h3>
<div class="ulist">
<ul>
<li>
@@ -160,9 +170,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>ビルド、デバッグ、およびテスト</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ビルド_デバッグ_およびテスト">ビルド、デバッグ、およびテスト</h3>
<div class="ulist">
<ul>
<li>
@@ -176,9 +186,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Maven</strong></p>
</div>
+<div class="sect2">
+<h3 id="_maven">Maven</h3>
<div class="ulist">
<ul>
<li>
@@ -189,9 +199,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>ソース・コードのプロファイリング</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ソース_コードのプロファイリング">ソース・コードのプロファイリング</h3>
<div class="ulist">
<ul>
<li>
@@ -208,9 +218,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>スクリプト作成言語</strong></p>
</div>
+<div class="sect2">
+<h3 id="_スクリプト作成言語">スクリプト作成言語</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +228,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JMXのモニタリングおよび管理</strong></p>
</div>
+<div class="sect2">
+<h3 id="_jmxのモニタリングおよび管理">JMXのモニタリングおよび管理</h3>
<div class="ulist">
<ul>
<li>
@@ -235,7 +245,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_スクリーンキャスト" class="sect0">スクリーンキャスト</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_スクリーンキャスト">スクリーンキャスト</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -270,17 +285,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_コミュニティの寄稿ドキュメント" class="sect0">コミュニティの寄稿ドキュメント</h1>
+<div class="sect1">
+<h2 id="_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -300,17 +309,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_その他のリソース" class="sect0">その他のリソース</h1>
+<div class="sect1">
+<h2 id="_その他のリソース">その他のリソース</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -359,11 +362,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql">MySQLのオンデマンドWebセミナー</a></p>
</li>
<li>
-<p><a href="../../kb/articles/learn-java.html">Javaの学習 - リソース</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[] </p>
+<p><a href="../../kb/articles/learn-java.html">Javaの学習 - リソース</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-se_pt_BR.html b/content/kb/docs/java-se_pt_BR.html
index f22db5d..a60bab0 100644
--- a/content/kb/docs/java-se_pt_BR.html
+++ b/content/kb/docs/java-se_pt_BR.html
@@ -96,42 +96,52 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_o_que_é_uma_aplicação_java_se">O que é uma Aplicação Java SE?</a></li>
<li><a href="#_conceitos_básicos">Conceitos Básicos</a></li>
-<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a></li>
+<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_desenvolvendo_aplicações_java">Desenvolvendo Aplicações Java</a></li>
+<li><a href="#_construindo_depurando_e_testando">Construindo, Depurando e Testando</a></li>
+<li><a href="#_maven">Maven</a></li>
+<li><a href="#_criando_perfil_do_código_fonte">Criando Perfil do Código-fonte</a></li>
+<li><a href="#_linguagens_de_script">Linguagens de Script</a></li>
+<li><a href="#_monitoramento_e_gerenciamento_do_jmx">Monitoramento e Gerenciamento do JMX</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</a></li>
<li><a href="#_outros_recursos">Outros Recursos</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_o_que_é_uma_aplicação_java_se">O que é uma Aplicação Java SE?</h4>
+<div class="sect1">
+<h2 id="_o_que_é_uma_aplicação_java_se">O que é uma Aplicação Java SE?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_conceitos_básicos" class="sect0">Conceitos Básicos</h1>
+<div class="sect1">
+<h2 id="_conceitos_básicos">Conceitos Básicos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/quickstart.html">Tutorial de Início Rápido do Java</a>
-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[]</p>
+<p><a href="../docs/java/quickstart.html">Tutorial de Início Rápido do Java</a></p>
</li>
</ul>
</div>
-<h1 id="_tutoriais_e_artigos" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p>*Desenvolvendo Aplicações Java *</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_desenvolvendo_aplicações_java">Desenvolvendo Aplicações Java</h3>
<div class="ulist">
<ul>
<li>
@@ -160,9 +170,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Construindo, Depurando e Testando</strong></p>
</div>
+<div class="sect2">
+<h3 id="_construindo_depurando_e_testando">Construindo, Depurando e Testando</h3>
<div class="ulist">
<ul>
<li>
@@ -176,9 +186,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Maven</strong></p>
</div>
+<div class="sect2">
+<h3 id="_maven">Maven</h3>
<div class="ulist">
<ul>
<li>
@@ -189,9 +199,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Criando Perfil do Código-fonte</strong></p>
</div>
+<div class="sect2">
+<h3 id="_criando_perfil_do_código_fonte">Criando Perfil do Código-fonte</h3>
<div class="ulist">
<ul>
<li>
@@ -208,9 +218,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Linguagens de Script</strong></p>
</div>
+<div class="sect2">
+<h3 id="_linguagens_de_script">Linguagens de Script</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +228,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Monitoramento e Gerenciamento do JMX</strong></p>
</div>
+<div class="sect2">
+<h3 id="_monitoramento_e_gerenciamento_do_jmx">Monitoramento e Gerenciamento do JMX</h3>
<div class="ulist">
<ul>
<li>
@@ -230,12 +240,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/java/jmx-tutorial.html">Adicionando Instrumentação JMX a uma Aplicação Java</a></p>
</li>
<li>
-<p><a href="../docs/java/jmx-manager-tutorial.html">Desenvolvendo um Gerenciador JMX e Conectando a um Agente JMX Remoto</a>
-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[]</p>
+<p><a href="../docs/java/jmx-manager-tutorial.html">Desenvolvendo um Gerenciador JMX e Conectando a um Agente JMX Remoto</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -270,17 +284,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_documentos_de_contribuição_da_comunidade" class="sect0">Documentos de Contribuição da Comunidade</h1>
+<div class="sect1">
+<h2 id="_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -300,17 +308,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_outros_recursos" class="sect0">Outros Recursos</h1>
+<div class="sect1">
+<h2 id="_outros_recursos">Outros Recursos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -359,11 +361,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql">Seminários Web Sob Demanda Sobre o MySQL</a></p>
</li>
<li>
-<p><a href="../../kb/articles/learn-java.html">Aprendendo Java: Recursos</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[] </p>
+<p><a href="../../kb/articles/learn-java.html">Aprendendo Java: Recursos</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-se_ru.html b/content/kb/docs/java-se_ru.html
index 4dee0f6..bf0735c 100644
--- a/content/kb/docs/java-se_ru.html
+++ b/content/kb/docs/java-se_ru.html
@@ -96,42 +96,52 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_Общее_представление_о_приложении_на_базе_java_se">Общее представление о приложении на базе Java SE</a></li>
<li><a href="#_Начало_работы">Начало работы</a></li>
-<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a></li>
+<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a>
+<ul class="sectlevel2">
+<li><a href="#_Разработка_приложений_на_java">Разработка приложений на Java</a></li>
+<li><a href="#_Сборка_отладка_и_тестирование">Сборка, отладка и тестирование</a></li>
+<li><a href="#_maven">Maven</a></li>
+<li><a href="#_Профилирование_исходного_кода">Профилирование исходного кода</a></li>
+<li><a href="#_Языки_написания_сценариев">Языки написания сценариев</a></li>
+<li><a href="#_Наблюдение_и_управление_с_помощью_среды_jmx">Наблюдение и управление с помощью среды JMX</a></li>
+</ul>
+</li>
<li><a href="#_Экранные_демонстрации">Экранные демонстрации</a></li>
<li><a href="#_Документы_от_сообщества">Документы от сообщества</a></li>
<li><a href="#_Другие_источники">Другие источники</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_Общее_представление_о_приложении_на_базе_java_se">Общее представление о приложении на базе Java SE</h4>
+<div class="sect1">
+<h2 id="_Общее_представление_о_приложении_на_базе_java_se">Общее представление о приложении на базе Java SE</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Приложение на базе Java SE – это приложение, написанное на платформе Java Standard Edition (Java SE). Одни и те же немодифицированные приложения Java SE можно запускать практически на любом компьютере с операционной системой Microsoft Windows, Solaris, Linux или OS X. Ключ к такой переносимости приложений – среда Java Runtime Environment, бесплатная для большинства операционных систем, в том числе операционных систем, упомянутых выше.</p>
</div>
<div class="paragraph">
<p>Являясь платформой для создания многоплатформенных приложений рабочей среды, платформа Java SE является также основой для других технологий, таких как Java Platform Enterprise Edition. Написанный код Java может обеспечивать серверную логику и для веб-приложений, а также для приложений уровня предприятия.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_Начало_работы" class="sect0">Начало работы</h1>
+<div class="sect1">
+<h2 id="_Начало_работы">Начало работы</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/quickstart.html">Краткий учебный курс по работе с Java</a>
-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[]</p>
+<p><a href="../docs/java/quickstart.html">Краткий учебный курс по работе с Java</a></p>
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи" class="sect0">Учебные курсы и статьи</h1>
-<div class="paragraph">
-<p>*Разработка приложений на Java *</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи">Учебные курсы и статьи</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_Разработка_приложений_на_java">Разработка приложений на Java</h3>
<div class="ulist">
<ul>
<li>
@@ -160,9 +170,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Сборка, отладка и тестирование</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Сборка_отладка_и_тестирование">Сборка, отладка и тестирование</h3>
<div class="ulist">
<ul>
<li>
@@ -176,9 +186,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Maven</strong></p>
</div>
+<div class="sect2">
+<h3 id="_maven">Maven</h3>
<div class="ulist">
<ul>
<li>
@@ -189,9 +199,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Профилирование исходного кода</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Профилирование_исходного_кода">Профилирование исходного кода</h3>
<div class="ulist">
<ul>
<li>
@@ -208,9 +218,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Языки написания сценариев</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Языки_написания_сценариев">Языки написания сценариев</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +228,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Наблюдение и управление с помощью среды JMX</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Наблюдение_и_управление_с_помощью_среды_jmx">Наблюдение и управление с помощью среды JMX</h3>
<div class="ulist">
<ul>
<li>
@@ -230,12 +240,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/java/jmx-tutorial.html">Добавление инструментов JMX к приложению, написанному на Java</a></p>
</li>
<li>
-<p><a href="../docs/java/jmx-manager-tutorial.html">Разработка диспетчера JMX и подключение к удаленному агенту JMX</a>
-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[]</p>
+<p><a href="../docs/java/jmx-manager-tutorial.html">Разработка диспетчера JMX и подключение к удаленному агенту JMX</a></p>
</li>
</ul>
</div>
-<h1 id="_Экранные_демонстрации" class="sect0">Экранные демонстрации</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Экранные_демонстрации">Экранные демонстрации</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -270,17 +284,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_Документы_от_сообщества" class="sect0">Документы от сообщества</h1>
+<div class="sect1">
+<h2 id="_Документы_от_сообщества">Документы от сообщества</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -300,17 +308,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_Другие_источники" class="sect0">Другие источники</h1>
+<div class="sect1">
+<h2 id="_Другие_источники">Другие источники</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -359,11 +361,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql">Веб-семинары MySQL по требованию</a></p>
</li>
<li>
-<p><a href="../../kb/articles/learn-java.html">Материалы для изучения Java</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[] </p>
+<p><a href="../../kb/articles/learn-java.html">Материалы для изучения Java</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/java-se_zh_CN.html b/content/kb/docs/java-se_zh_CN.html
index 3f7c9e2..005aa82 100644
--- a/content/kb/docs/java-se_zh_CN.html
+++ b/content/kb/docs/java-se_zh_CN.html
@@ -96,42 +96,52 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_什么是_java_se_应用程序">什么是 Java SE 应用程序?</a></li>
<li><a href="#_入门指南">入门指南</a></li>
-<li><a href="#_教程和文章">教程和文章</a></li>
+<li><a href="#_教程和文章">教程和文章</a>
+<ul class="sectlevel2">
+<li><a href="#_开发_java_应用程序">开发 Java 应用程序</a></li>
+<li><a href="#_编译_调试和测试">编译、调试和测试</a></li>
+<li><a href="#_maven">Maven</a></li>
+<li><a href="#_对源代码进行性能分析">对源代码进行性能分析</a></li>
+<li><a href="#_脚本语言">脚本语言</a></li>
+<li><a href="#_jmx_监控和管理">JMX 监控和管理</a></li>
+</ul>
+</li>
<li><a href="#_截屏视频">截屏视频</a></li>
<li><a href="#_社区提供的文档">社区提供的文档</a></li>
<li><a href="#_其他资源">其他资源</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_什么是_java_se_应用程序">什么是 Java SE 应用程序?</h4>
+<div class="sect1">
+<h2 id="_什么是_java_se_应用程序">什么是 Java SE 应用程序?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Java SE 应用程序是在 Java Platform, Standard Edition (Java SE) 中编写的应用程序。相同的 Java SE 应用程序无需任何修改便可在几乎所有计算机上运行,无论这台计算机使用 Microsoft Windows、Solaris、Linux 还是 OS X 操作系统。这种应用程序可移植性的关键因素是 Java 运行时环境,它免费针对大多数操作系统开放,包括上面提到的所有操作系统。</p>
</div>
<div class="paragraph">
<p>除了支持开发多平台桌面应用程序之外,Java SE 平还是许多其他技术的基础,比如说 Java Platform, Enterprise Edition。在 Java SE 平台中编写的代码还可为 Web 和企业应用程序提供后台逻辑。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_入门指南" class="sect0">入门指南</h1>
+<div class="sect1">
+<h2 id="_入门指南">入门指南</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/quickstart.html">Java 快速入门教程</a>
-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[]</p>
+<p><a href="../docs/java/quickstart.html">Java 快速入门教程</a></p>
</li>
</ul>
</div>
-<h1 id="_教程和文章" class="sect0">教程和文章</h1>
-<div class="paragraph">
-<p><strong>开发 Java 应用程序</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章">教程和文章</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_开发_java_应用程序">开发 Java 应用程序</h3>
<div class="ulist">
<ul>
<li>
@@ -160,9 +170,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>编译、调试和测试</strong></p>
</div>
+<div class="sect2">
+<h3 id="_编译_调试和测试">编译、调试和测试</h3>
<div class="ulist">
<ul>
<li>
@@ -176,9 +186,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Maven</strong></p>
</div>
+<div class="sect2">
+<h3 id="_maven">Maven</h3>
<div class="ulist">
<ul>
<li>
@@ -189,9 +199,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>对源代码进行性能分析</strong></p>
</div>
+<div class="sect2">
+<h3 id="_对源代码进行性能分析">对源代码进行性能分析</h3>
<div class="ulist">
<ul>
<li>
@@ -208,9 +218,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>脚本语言</strong></p>
</div>
+<div class="sect2">
+<h3 id="_脚本语言">脚本语言</h3>
<div class="ulist">
<ul>
<li>
@@ -218,9 +228,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JMX 监控和管理</strong></p>
</div>
+<div class="sect2">
+<h3 id="_jmx_监控和管理">JMX 监控和管理</h3>
<div class="ulist">
<ul>
<li>
@@ -230,12 +240,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/java/jmx-tutorial.html">将 JMX 分析添加到 Java 应用程序中</a></p>
</li>
<li>
-<p><a href="../docs/java/jmx-manager-tutorial.html">开发一个 JMX 管理器并连接到远程 JMX 代理</a>
-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[]</p>
+<p><a href="../docs/java/jmx-manager-tutorial.html">开发一个 JMX 管理器并连接到远程 JMX 代理</a></p>
</li>
</ul>
</div>
-<h1 id="_截屏视频" class="sect0">截屏视频</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_截屏视频">截屏视频</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -270,17 +284,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_社区提供的文档" class="sect0">社区提供的文档</h1>
+<div class="sect1">
+<h2 id="_社区提供的文档">社区提供的文档</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -300,17 +308,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_其他资源" class="sect0">其他资源</h1>
+<div class="sect1">
+<h2 id="_其他资源">其他资源</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -359,11 +361,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://mysql.com/news-and-events/on-demand-webinars/?category=java_mysql">MySQL 按需 Web 研讨会</a></p>
</li>
<li>
-<p><a href="../../kb/articles/learn-java.html">了解 Java - 资源</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[] </p>
+<p><a href="../../kb/articles/learn-java.html">了解 Java - 资源</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/matisse.html b/content/kb/docs/matisse.html
index 7cab331..f727fa4 100644
--- a/content/kb/docs/matisse.html
+++ b/content/kb/docs/matisse.html
@@ -96,18 +96,35 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_what_are_java_gui_applications">What are Java GUI applications?</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
-<li><a href="#_tutorials_and_articles_2">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_javafx_8_developer_preview">JavaFX 8 Developer Preview</a></li>
+<li><a href="#_getting_started_with_javafx">Getting Started with JavaFX</a></li>
+<li><a href="#_javafx_scene_builder">JavaFX Scene Builder</a></li>
+<li><a href="#_javafx_application_logic">JavaFX Application Logic</a></li>
+<li><a href="#_javafx_user_interface">JavaFX User Interface</a></li>
+<li><a href="#_javafx_effects_animation_and_media">JavaFX Effects, Animation, and Media</a></li>
+<li><a href="#_javafx_deployment_and_more">JavaFX Deployment and More</a></li>
+</ul>
+</li>
+<li><a href="#_tutorials_and_articles_2">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_getting_started_with_swing">Getting Started with Swing</a></li>
+<li><a href="#_java_persistence_and_beans_binding">Java Persistence and Beans Binding</a></li>
+<li><a href="#_internationalization">Internationalization</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
<li><a href="#_other_resources">Other Resources</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_what_are_java_gui_applications">What are Java GUI applications?</h4>
+<div class="sect1">
+<h2 id="_what_are_java_gui_applications">What are Java GUI applications?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A Java GUI application uses the standard Java components GUI component set, Swing, and is deployed to the desktop.</p>
</div>
@@ -117,25 +134,25 @@
<div class="paragraph">
<p><a href="http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn">JavaFX</a> 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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">Getting Started with JavaFX</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">Getting Started with JavaFX</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>JavaFX 8 Developer Preview</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_javafx_8_developer_preview">JavaFX 8 Developer Preview</h3>
<div class="ulist">
<ul>
<li>
@@ -149,9 +166,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Getting Started with JavaFX</strong></p>
</div>
+<div class="sect2">
+<h3 id="_getting_started_with_javafx">Getting Started with JavaFX</h3>
<div class="ulist">
<ul>
<li>
@@ -162,9 +179,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFX Scene Builder *</p>
</div>
+<div class="sect2">
+<h3 id="_javafx_scene_builder">JavaFX Scene Builder</h3>
<div class="ulist">
<ul>
<li>
@@ -181,9 +198,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFX Application Logic *</p>
</div>
+<div class="sect2">
+<h3 id="_javafx_application_logic">JavaFX Application Logic</h3>
<div class="ulist">
<ul>
<li>
@@ -206,9 +223,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFX User Interface *</p>
</div>
+<div class="sect2">
+<h3 id="_javafx_user_interface">JavaFX User Interface</h3>
<div class="ulist">
<ul>
<li>
@@ -246,9 +263,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFX Effects, Animation, and Media</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafx_effects_animation_and_media">JavaFX Effects, Animation, and Media</h3>
<div class="ulist">
<ul>
<li>
@@ -265,9 +282,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFX Deployment and More</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafx_deployment_and_more">JavaFX Deployment and More</h3>
<div class="ulist">
<ul>
<li>
@@ -280,15 +297,18 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm">JavaFX Interoperability with SWT</a></p>
</li>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">Using a Doclet with JavaFX</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">Using a Doclet with JavaFX</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles_2" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>Getting Started with Swing</strong></p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles_2">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_getting_started_with_swing">Getting Started with Swing</h3>
<div class="ulist">
<ul>
<li>
@@ -323,9 +343,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java Persistence and Beans Binding</strong></p>
</div>
+<div class="sect2">
+<h3 id="_java_persistence_and_beans_binding">Java Persistence and Beans Binding</h3>
<div class="ulist">
<ul>
<li>
@@ -339,18 +359,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Internationalization</strong></p>
</div>
+<div class="sect2">
+<h3 id="_internationalization">Internationalization</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/gui-automatic-i18n.html">Internationalizing a GUI Form</a>
-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[]</p>
+<p><a href="../docs/java/gui-automatic-i18n.html">Internationalizing a GUI Form</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -367,17 +391,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -391,17 +409,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -429,11 +441,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245">Developing with Java Persistence</a> in <em>Developing Applications with NetBeans IDE</em></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">Internationalizing Source Code</a> in <em>Developing Applications with NetBeans IDE</em>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">Internationalizing Source Code</a> in <em>Developing Applications with NetBeans IDE</em></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/matisse_ca.html b/content/kb/docs/matisse_ca.html
index ef27149..cf51ce9 100644
--- a/content/kb/docs/matisse_ca.html
+++ b/content/kb/docs/matisse_ca.html
@@ -96,17 +96,24 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_què_són_les_gui_d_aplicacions_java_i_java_fx">Què són les GUI d’aplicacions Java i Java FX?</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_designing_java_guis">Designing Java GUIs</a></li>
+<li><a href="#_java_database_applications_beans_binding_and_persistence">Java Database Applications, Beans Binding, and Persistence</a></li>
+<li><a href="#_internationalization">Internationalization</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
<li><a href="#_other_resources">Other Resources</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_què_són_les_gui_d_aplicacions_java_i_java_fx">Què són les GUI d’aplicacions Java i Java FX?</h4>
+<div class="sect1">
+<h2 id="_què_són_les_gui_d_aplicacions_java_i_java_fx">Què són les GUI d’aplicacions Java i Java FX?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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).</p>
</div>
@@ -116,25 +123,25 @@
<div class="paragraph">
<p>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 [...]
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/gui-functionality.html">Introduction to Java GUI Building</a>
-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[]</p>
+<p><a href="../docs/java/gui-functionality.html">Introduction to Java GUI Building</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>Designing Java GUIs</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_designing_java_guis">Designing Java GUIs</h3>
<div class="ulist">
<ul>
<li>
@@ -157,9 +164,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java Database Applications, Beans Binding, and Persistence</strong></p>
</div>
+<div class="sect2">
+<h3 id="_java_database_applications_beans_binding_and_persistence">Java Database Applications, Beans Binding, and Persistence</h3>
<div class="ulist">
<ul>
<li>
@@ -176,18 +183,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Internationalization</strong></p>
</div>
+<div class="sect2">
+<h3 id="_internationalization">Internationalization</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/gui-automatic-i18n.html">Internationalizing a GUI Form</a>
-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[]</p>
+<p><a href="../docs/java/gui-automatic-i18n.html">Internationalizing a GUI Form</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -195,17 +206,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -225,17 +230,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -245,11 +244,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://download.oracle.com/javase/tutorial/uiswing/index.html">+ download.oracle.com Swing Tutorial+</a></p>
</li>
<li>
-<p><a href="https://netbeans.org/community/magazine/html/03/matisse/">NetBeans Magazine: UI Design in NetBeans</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://netbeans.org/community/magazine/html/03/matisse/">NetBeans Magazine: UI Design in NetBeans</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/matisse_ja.html b/content/kb/docs/matisse_ja.html
index aed970b..71110d4 100644
--- a/content/kb/docs/matisse_ja.html
+++ b/content/kb/docs/matisse_ja.html
@@ -96,18 +96,35 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_java_guiアプリケーションとは">Java GUIアプリケーションとは</a></li>
<li><a href="#_開始">開始</a></li>
-<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a></li>
-<li><a href="#_チュートリアルおよび記事_2">チュートリアルおよび記事</a></li>
+<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a>
+<ul class="sectlevel2">
+<li><a href="#_javafx_8_developer_preview">JavaFX 8 Developer Preview</a></li>
+<li><a href="#_javafxの開始">JavaFXの開始</a></li>
+<li><a href="#_javafx_scene_builder">JavaFX Scene Builder</a></li>
+<li><a href="#_javafxアプリケーション_ロジック">JavaFXアプリケーション・ロジック</a></li>
+<li><a href="#_javafxユーザー_インタフェース">JavaFXユーザー・インタフェース</a></li>
+<li><a href="#_javafxエフェクト_アニメーションおよびメディア">JavaFXエフェクト、アニメーションおよびメディア</a></li>
+<li><a href="#_javafxデプロイメントなど">JavaFXデプロイメントなど</a></li>
+</ul>
+</li>
+<li><a href="#_チュートリアルおよび記事_2">チュートリアルおよび記事</a>
+<ul class="sectlevel2">
+<li><a href="#_swingの開始">Swingの開始</a></li>
+<li><a href="#_java_persistenceおよびbeansのバインディング">Java PersistenceおよびBeansのバインディング</a></li>
+<li><a href="#_国際化">国際化</a></li>
+</ul>
+</li>
<li><a href="#_スクリーンキャスト">スクリーンキャスト</a></li>
<li><a href="#_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</a></li>
<li><a href="#_その他のリソース">その他のリソース</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_java_guiアプリケーションとは">Java GUIアプリケーションとは</h4>
+<div class="sect1">
+<h2 id="_java_guiアプリケーションとは">Java GUIアプリケーションとは</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Java GUIアプリケーションは、Java標準コンポーネントのGUIコンポーネント・セットであるSwingを使用するアプリケーションで、デスクトップにデプロイします。</p>
</div>
@@ -117,25 +134,25 @@
<div class="paragraph">
<p><a href="http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn">JavaFX</a>は、開発者による複数のプラットフォームで同様に動作するリッチ・インターネット・アプリケーション(RIA)の設計、作成、テスト、デバッグおよびデプロイを可能にする多彩なグラフィックスおよびメディア・パッケージのセットです。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_開始" class="sect0">開始</h1>
+<div class="sect1">
+<h2 id="_開始">開始</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">JavaFXの開始</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">JavaFXの開始</a></p>
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事" class="sect0">チュートリアルおよび記事</h1>
-<div class="paragraph">
-<p><strong>JavaFX 8 Developer Preview</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事">チュートリアルおよび記事</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_javafx_8_developer_preview">JavaFX 8 Developer Preview</h3>
<div class="ulist">
<ul>
<li>
@@ -149,9 +166,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFXの開始</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafxの開始">JavaFXの開始</h3>
<div class="ulist">
<ul>
<li>
@@ -162,9 +179,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFX Scene Builder *</p>
</div>
+<div class="sect2">
+<h3 id="_javafx_scene_builder">JavaFX Scene Builder</h3>
<div class="ulist">
<ul>
<li>
@@ -181,9 +198,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFXアプリケーション・ロジック</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafxアプリケーション_ロジック">JavaFXアプリケーション・ロジック</h3>
<div class="ulist">
<ul>
<li>
@@ -206,9 +223,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFXユーザー・インタフェース *</p>
</div>
+<div class="sect2">
+<h3 id="_javafxユーザー_インタフェース">JavaFXユーザー・インタフェース</h3>
<div class="ulist">
<ul>
<li>
@@ -246,9 +263,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFXエフェクト、アニメーションおよびメディア</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafxエフェクト_アニメーションおよびメディア">JavaFXエフェクト、アニメーションおよびメディア</h3>
<div class="ulist">
<ul>
<li>
@@ -265,9 +282,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFXデプロイメントなど</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafxデプロイメントなど">JavaFXデプロイメントなど</h3>
<div class="ulist">
<ul>
<li>
@@ -280,15 +297,18 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm">SWTとのJavaFX相互運用性</a></p>
</li>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">JavaFXでのドックレットの使用</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">JavaFXでのドックレットの使用</a></p>
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事_2" class="sect0">チュートリアルおよび記事</h1>
-<div class="paragraph">
-<p><strong>Swingの開始</strong></p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事_2">チュートリアルおよび記事</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_swingの開始">Swingの開始</h3>
<div class="ulist">
<ul>
<li>
@@ -323,9 +343,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java PersistenceおよびBeansのバインディング</strong></p>
</div>
+<div class="sect2">
+<h3 id="_java_persistenceおよびbeansのバインディング">Java PersistenceおよびBeansのバインディング</h3>
<div class="ulist">
<ul>
<li>
@@ -339,18 +359,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>国際化</strong></p>
</div>
+<div class="sect2">
+<h3 id="_国際化">国際化</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/gui-automatic-i18n.html">GUIフォームの国際化</a>
-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[]</p>
+<p><a href="../docs/java/gui-automatic-i18n.html">GUIフォームの国際化</a></p>
</li>
</ul>
</div>
-<h1 id="_スクリーンキャスト" class="sect0">スクリーンキャスト</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_スクリーンキャスト">スクリーンキャスト</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -367,17 +391,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_コミュニティの寄稿ドキュメント" class="sect0">コミュニティの寄稿ドキュメント</h1>
+<div class="sect1">
+<h2 id="_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -391,17 +409,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_その他のリソース" class="sect0">その他のリソース</h1>
+<div class="sect1">
+<h2 id="_その他のリソース">その他のリソース</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -429,11 +441,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p>_NetBeans IDEによるアプリケーションの開発_の<a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245">Java Persistenceを使用した開発</a></p>
</li>
<li>
-<p>_NetBeans IDEによるアプリケーションの開発_の<a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">ソース・コードの実装</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p>_NetBeans IDEによるアプリケーションの開発_の<a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">ソース・コードの実装</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/matisse_pt_BR.html b/content/kb/docs/matisse_pt_BR.html
index 53c851d..7747f26 100644
--- a/content/kb/docs/matisse_pt_BR.html
+++ b/content/kb/docs/matisse_pt_BR.html
@@ -96,18 +96,35 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_o_que_são_aplicações_de_gui_do_java">O que são Aplicações de GUI do Java?</a></li>
<li><a href="#_introdução">Introdução</a></li>
-<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a></li>
-<li><a href="#_tutoriais_e_artigos_2">Tutoriais e Artigos</a></li>
+<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_visualização_do_desenvolvedor_javafx_8">Visualização do Desenvolvedor JavaFX 8</a></li>
+<li><a href="#_conceitos_básicos_sobre_javafx">Conceitos Básicos sobre JavaFX</a></li>
+<li><a href="#_javafx_scene_builder">JavaFX Scene Builder</a></li>
+<li><a href="#_lógica_da_aplicação_javafx">Lógica da Aplicação JavaFX</a></li>
+<li><a href="#_interface_do_usuário_javafx">Interface do Usuário JavaFX</a></li>
+<li><a href="#_efeitos_animação_e_mídia_javafx">Efeitos, Animação e Mídia JavaFX</a></li>
+<li><a href="#_implantação_javafx_e_mais">Implantação JavaFX e Mais</a></li>
+</ul>
+</li>
+<li><a href="#_tutoriais_e_artigos_2">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_conceitos_básicos_sobre_swing">Conceitos Básicos sobre Swing</a></li>
+<li><a href="#_java_persistence_e_vinculação_de_beans">Java Persistence e Vinculação de Beans</a></li>
+<li><a href="#_internacionalização">Internacionalização</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</a></li>
<li><a href="#_outros_recursos">Outros Recursos</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_o_que_são_aplicações_de_gui_do_java">O que são Aplicações de GUI do Java?</h4>
+<div class="sect1">
+<h2 id="_o_que_são_aplicações_de_gui_do_java">O que são Aplicações de GUI do Java?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Uma aplicação de GUI do Java usa o componente GUI de componentes Java padrão, o Swing e é implantada na desktop.</p>
</div>
@@ -117,25 +134,25 @@
<div class="paragraph">
<p><a href="http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn">JavaFX</a> é 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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_introdução" class="sect0">Introdução</h1>
+<div class="sect1">
+<h2 id="_introdução">Introdução</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">Conceitos Básicos sobre JavaFX</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">Conceitos Básicos sobre JavaFX</a></p>
</li>
</ul>
</div>
-<h1 id="_tutoriais_e_artigos" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p><strong>Visualização do Desenvolvedor JavaFX 8</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_visualização_do_desenvolvedor_javafx_8">Visualização do Desenvolvedor JavaFX 8</h3>
<div class="ulist">
<ul>
<li>
@@ -143,33 +160,38 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Conceitos Básicos sobre JavaFX</strong></p>
</div>
-<div class="paragraph">
-<p>*JavaFX Scene Builder *</p>
+<div class="sect2">
+<h3 id="_conceitos_básicos_sobre_javafx">Conceitos Básicos sobre JavaFX</h3>
+
</div>
-<div class="paragraph">
-<p>*Lógica da Aplicação JavaFX *</p>
+<div class="sect2">
+<h3 id="_javafx_scene_builder">JavaFX Scene Builder</h3>
+
</div>
-<div class="paragraph">
-<p>*Interface do Usuário JavaFX *</p>
+<div class="sect2">
+<h3 id="_lógica_da_aplicação_javafx">Lógica da Aplicação JavaFX</h3>
+
</div>
-<div class="paragraph">
-<p><strong>Efeitos, Animação e Mídia JavaFX</strong></p>
+<div class="sect2">
+<h3 id="_interface_do_usuário_javafx">Interface do Usuário JavaFX</h3>
+
</div>
-<div class="paragraph">
-<p><strong>Implantação JavaFX e Mais</strong></p>
+<div class="sect2">
+<h3 id="_efeitos_animação_e_mídia_javafx">Efeitos, Animação e Mídia JavaFX</h3>
+
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
+<div class="sect2">
+<h3 id="_implantação_javafx_e_mais">Implantação JavaFX e Mais</h3>
+
</div>
</div>
-<h1 id="_tutoriais_e_artigos_2" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p><strong>Conceitos Básicos sobre Swing</strong></p>
</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos_2">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_conceitos_básicos_sobre_swing">Conceitos Básicos sobre Swing</h3>
<div class="ulist">
<ul>
<li>
@@ -204,9 +226,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java Persistence e Vinculação de Beans</strong></p>
</div>
+<div class="sect2">
+<h3 id="_java_persistence_e_vinculação_de_beans">Java Persistence e Vinculação de Beans</h3>
<div class="ulist">
<ul>
<li>
@@ -220,18 +242,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Internacionalização</strong></p>
</div>
+<div class="sect2">
+<h3 id="_internacionalização">Internacionalização</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/gui-automatic-i18n.html">Internacionalizando um Form GUI</a>
-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[]</p>
+<p><a href="../docs/java/gui-automatic-i18n.html">Internacionalizando um Form GUI</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -248,17 +274,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_documentos_de_contribuição_da_comunidade" class="sect0">Documentos de Contribuição da Comunidade</h1>
+<div class="sect1">
+<h2 id="_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -272,17 +292,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_outros_recursos" class="sect0">Outros Recursos</h1>
+<div class="sect1">
+<h2 id="_outros_recursos">Outros Recursos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -310,11 +324,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245">Desenvolvendo Java Persistence</a> em <em>Desenvolvendo Aplicações com o NetBeans IDE</em></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">Internacionalizando Código-fonte</a> em <em>Desenvolvendo Aplicações com o NetBeans IDE</em>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">Internacionalizando Código-fonte</a> em <em>Desenvolvendo Aplicações com o NetBeans IDE</em></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/matisse_ru.html b/content/kb/docs/matisse_ru.html
index 5d8c863..668af4e 100644
--- a/content/kb/docs/matisse_ru.html
+++ b/content/kb/docs/matisse_ru.html
@@ -96,7 +96,7 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_Что_такое_приложения_с_графическим_интерфейсом_на_языке_java">Что такое приложения с графическим интерфейсом на языке Java?</a></li>
<li><a href="#_Начало_работы">Начало работы</a></li>
<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a></li>
@@ -106,8 +106,9 @@
<li><a href="#_Другие_источники">Другие источники</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_Что_такое_приложения_с_графическим_интерфейсом_на_языке_java">Что такое приложения с графическим интерфейсом на языке Java?</h4>
+<div class="sect1">
+<h2 id="_Что_такое_приложения_с_графическим_интерфейсом_на_языке_java">Что такое приложения с графическим интерфейсом на языке Java?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>В приложении с графическим интерфейсом на языке Java используются стандартные компоненты Java из набора компонентов для построения графических интерфейсов, Swing, и оно развертывается в рабочей среде.</p>
</div>
@@ -117,22 +118,23 @@
<div class="paragraph">
<p><a href="http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn">JavaFX</a> предоставляет обширный набор графических пакетов и медиапакетов, который позволяет разработчикам проектировать, создавать, тестировать, выполнять отладку и развертывание толстых клиентов (RIA), стабильно функционирующих на различных платформах.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_Начало_работы" class="sect0">Начало работы</h1>
+<div class="sect1">
+<h2 id="_Начало_работы">Начало работы</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">Общие сведения о JavaFX</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">Общие сведения о JavaFX</a></p>
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи" class="sect0">Учебные курсы и статьи</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи">Учебные курсы и статьи</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>Предварительный обзор JavaFX 8 для разработчиков</strong></p>
</div>
@@ -280,12 +282,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm">Взаимосовместимость JavaFX и SWT</a></p>
</li>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">Использование доклетов в JavaFX</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">Использование доклетов в JavaFX</a></p>
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи_2" class="sect0">Учебные курсы и статьи</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи_2">Учебные курсы и статьи</h2>
+<div class="sectionbody">
<div class="paragraph">
<p><strong>Общие сведения о Swing</strong></p>
</div>
@@ -345,12 +350,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/gui-automatic-i18n.html">+Интернационализация формы графического интерфейса +</a>
-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[]</p>
+<p><a href="../docs/java/gui-automatic-i18n.html">+Интернационализация формы графического интерфейса +</a></p>
</li>
</ul>
</div>
-<h1 id="_Экранные_демонстрации" class="sect0">Экранные демонстрации</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Экранные_демонстрации">Экранные демонстрации</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -367,17 +375,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_Документы_от_сообщества" class="sect0">Документы от сообщества</h1>
+<div class="sect1">
+<h2 id="_Документы_от_сообщества">Документы от сообщества</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -391,17 +393,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_Другие_источники" class="sect0">Другие источники</h1>
+<div class="sect1">
+<h2 id="_Другие_источники">Другие источники</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -429,11 +425,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245">Разработка с использованием Java Persistence</a> в документе <em>Разработка приложений в IDE NetBeans</em></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">Интернационализация исходного кода</a> в документе <em>Разработка приложений в IDE NetBeans</em>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">Интернационализация исходного кода</a> в документе <em>Разработка приложений в IDE NetBeans</em></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/matisse_zh_CN.html b/content/kb/docs/matisse_zh_CN.html
index d457c3e..16d5704 100644
--- a/content/kb/docs/matisse_zh_CN.html
+++ b/content/kb/docs/matisse_zh_CN.html
@@ -96,18 +96,35 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_什么是_java_gui_应用程序">什么是 Java GUI 应用程序?</a></li>
<li><a href="#_入门指南">入门指南</a></li>
-<li><a href="#_教程和文章">教程和文章</a></li>
-<li><a href="#_教程和文章_2">教程和文章</a></li>
+<li><a href="#_教程和文章">教程和文章</a>
+<ul class="sectlevel2">
+<li><a href="#_javafx_8_开发者预览">JavaFX 8 开发者预览</a></li>
+<li><a href="#_javafx_入门指南">JavaFX 入门指南</a></li>
+<li><a href="#_javafx_场景构建器">JavaFX 场景构建器</a></li>
+<li><a href="#_javafx_应用程序逻辑">JavaFX 应用程序逻辑</a></li>
+<li><a href="#_javafx_用户界面">JavaFX 用户界面</a></li>
+<li><a href="#_javafx_效果_动画和媒体">JavaFX 效果、动画和媒体</a></li>
+<li><a href="#_javafx_部署及更多内容">JavaFX 部署及更多内容</a></li>
+</ul>
+</li>
+<li><a href="#_教程和文章_2">教程和文章</a>
+<ul class="sectlevel2">
+<li><a href="#_swing_入门指南">Swing 入门指南</a></li>
+<li><a href="#_java_持久性和_bean_绑定">Java 持久性和 Bean 绑定</a></li>
+<li><a href="#_国际化">国际化</a></li>
+</ul>
+</li>
<li><a href="#_截屏视频">截屏视频</a></li>
<li><a href="#_社区提供的文档">社区提供的文档</a></li>
<li><a href="#_其他资源">其他资源</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_什么是_java_gui_应用程序">什么是 Java GUI 应用程序?</h4>
+<div class="sect1">
+<h2 id="_什么是_java_gui_应用程序">什么是 Java GUI 应用程序?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>Java GUI 应用程序使用标准的 Java 组件 GUI 组件集 Swing,并且会部署到桌面上。</p>
</div>
@@ -117,25 +134,25 @@
<div class="paragraph">
<p><a href="http://www.oracle.com/technetwork/java/javafx/overview/index.html?ssSourceSiteId=otncn">JavaFX</a> 是一组丰富的图形和媒体包,使开发人员能够设计、创建、测试、调试和部署在多个平台之间运行一致的丰富客户端应用程序 (RIA)。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_入门指南" class="sect0">入门指南</h1>
+<div class="sect1">
+<h2 id="_入门指南">入门指南</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">JavaFX 入门指南</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/get_started/jfxpub-get_started.htm">JavaFX 入门指南</a></p>
</li>
</ul>
</div>
-<h1 id="_教程和文章" class="sect0">教程和文章</h1>
-<div class="paragraph">
-<p><strong>JavaFX 8 开发者预览</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章">教程和文章</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_javafx_8_开发者预览">JavaFX 8 开发者预览</h3>
<div class="ulist">
<ul>
<li>
@@ -149,9 +166,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFX 入门指南</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafx_入门指南">JavaFX 入门指南</h3>
<div class="ulist">
<ul>
<li>
@@ -162,9 +179,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFX 场景构建器 *</p>
</div>
+<div class="sect2">
+<h3 id="_javafx_场景构建器">JavaFX 场景构建器</h3>
<div class="ulist">
<ul>
<li>
@@ -181,9 +198,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFX 应用程序逻辑 *</p>
</div>
+<div class="sect2">
+<h3 id="_javafx_应用程序逻辑">JavaFX 应用程序逻辑</h3>
<div class="ulist">
<ul>
<li>
@@ -206,9 +223,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*JavaFX 用户界面 *</p>
</div>
+<div class="sect2">
+<h3 id="_javafx_用户界面">JavaFX 用户界面</h3>
<div class="ulist">
<ul>
<li>
@@ -246,9 +263,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFX 效果、动画和媒体</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafx_效果_动画和媒体">JavaFX 效果、动画和媒体</h3>
<div class="ulist">
<ul>
<li>
@@ -265,9 +282,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFX 部署及更多内容</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafx_部署及更多内容">JavaFX 部署及更多内容</h3>
<div class="ulist">
<ul>
<li>
@@ -280,15 +297,18 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://docs.oracle.com/javafx/2/swt_interoperability/jfxpub-swt_interoperability.htm">JavaFX 与 SWT 的互操作性</a></p>
</li>
<li>
-<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">将 Doclet 与 JavaFX 一起使用</a>
-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[]</p>
+<p><a href="http://docs.oracle.com/javafx/2/doclet/jfxpub-doclet.htm">将 Doclet 与 JavaFX 一起使用</a></p>
</li>
</ul>
</div>
-<h1 id="_教程和文章_2" class="sect0">教程和文章</h1>
-<div class="paragraph">
-<p><strong>Swing 入门指南</strong></p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章_2">教程和文章</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_swing_入门指南">Swing 入门指南</h3>
<div class="ulist">
<ul>
<li>
@@ -323,9 +343,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Java 持久性和 Bean 绑定</strong></p>
</div>
+<div class="sect2">
+<h3 id="_java_持久性和_bean_绑定">Java 持久性和 Bean 绑定</h3>
<div class="ulist">
<ul>
<li>
@@ -339,18 +359,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>国际化</strong></p>
</div>
+<div class="sect2">
+<h3 id="_国际化">国际化</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/java/gui-automatic-i18n.html">国际化 GUI 窗体</a>
-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[]</p>
+<p><a href="../docs/java/gui-automatic-i18n.html">国际化 GUI 窗体</a></p>
</li>
</ul>
</div>
-<h1 id="_截屏视频" class="sect0">截屏视频</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_截屏视频">截屏视频</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -367,17 +391,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_社区提供的文档" class="sect0">社区提供的文档</h1>
+<div class="sect1">
+<h2 id="_社区提供的文档">社区提供的文档</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -391,17 +409,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_其他资源" class="sect0">其他资源</h1>
+<div class="sect1">
+<h2 id="_其他资源">其他资源</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -429,11 +441,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p>_使用 NetBeans IDE 开发应用程序_中的<a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG1245">使用 Java 持久性进行开发</a></p>
</li>
<li>
-<p>_使用 NetBeans IDE 开发应用程序_中的<a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">国际化源代码</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p>_使用 NetBeans IDE 开发应用程序_中的<a href="http://www.oracle.com/pls/topic/lookup?ctx=nb8000&id=NBDAG188">国际化源代码</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/mobility.html b/content/kb/docs/mobility.html
index 5a6d1c9..66b8a12 100644
--- a/content/kb/docs/mobility.html
+++ b/content/kb/docs/mobility.html
@@ -96,55 +96,68 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_what_is_a_mobile_application">What is a Mobile Application?</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_developing_java_card_applications">Developing Java Card Applications</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
+<li><a href="#_other_resources">Other Resources</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_mobility_community_resources">NetBeans Mobility Community Resources</a></li>
+<li><a href="#_java_me_related_sites">Java ME Related Sites</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_what_is_a_mobile_application">What is a Mobile Application?</h4>
+<div class="sect1">
+<h2 id="_what_is_a_mobile_application">What is a Mobile Application?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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 <a href="http://www.oracle.com/us/technologies/java/embedded/micro-edition/overview/index.html">Oracle Java ME Embe [...]
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/imp-ng.html">Creating, Debugging, and Profiling a Mobile Embedded Application</a></p>
</li>
<li>
-<p><a href="../docs/javame/java-card.html">NetBeans Java Card Development Quick Start Guide</a>
-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[]</p>
+<p><a href="../docs/javame/java-card.html">NetBeans Java Card Development Quick Start Guide</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p>*Developing Java Card Applications
-*</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_developing_java_card_applications">Developing Java Card Applications</h3>
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/javacard.html">Java Card Quick Start Article</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">Deploying Servlets on Smart Cards: Portable Web Servers with Java Card 3.0</a>
-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[]</p>
+<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">Deploying Servlets on Smart Cards: Portable Web Servers with Java Card 3.0</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -158,17 +171,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -179,17 +186,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -206,10 +207,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*NetBeans Mobility Community Resources
-*</p>
-</div>
+<div class="sect2">
+<h3 id="_netbeans_mobility_community_resources">NetBeans Mobility Community Resources</h3>
<div class="ulist">
<ul>
<li>
@@ -220,21 +219,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Java ME Related Sites
-*</p>
</div>
+<div class="sect2">
+<h3 id="_java_me_related_sites">Java ME Related Sites</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html">Java ME Embedded Documentation</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle Technology Network - Java ME Landing Page</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle Technology Network - Java ME Landing Page</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/mobility_ca.html b/content/kb/docs/mobility_ca.html
index 03aeecb..d6ab883 100644
--- a/content/kb/docs/mobility_ca.html
+++ b/content/kb/docs/mobility_ca.html
@@ -96,18 +96,38 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_què_és_una_aplicació_mòbil">[[Què és una aplicació mòbil?]]</a></li>
<li><a href="#_com_començar">Com començar</a></li>
-<li><a href="#_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</a></li>
+<li><a href="#_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_utilitzant_components_personalitzats_pel_dissenyador_visual_mòbil">Utilitzant components personalitzats pel dissenyador visual mòbil</a></li>
+<li><a href="#_afegint_javafx_a_aplicacions_mòbil">Afegint JavaFX a aplicacions Mòbil</a></li>
+<li><a href="#_desenvolupant_aplicacions_java_me_cdc">Desenvolupant aplicacions Java ME/CDC</a></li>
+<li><a href="#_creant_jocs_java_me">Creant jocs Java ME</a></li>
+<li><a href="#_dissenyant_aplicacions_per_a_diversos_dispositius">Dissenyant aplicacions per a diversos dispositius</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
-<li><a href="#_aplicacions_d_exemple">Aplicacions d’exemple</a></li>
+<li><a href="#_aplicacions_d_exemple">Aplicacions d’exemple</a>
+<ul class="sectlevel2">
+<li><a href="#_java_me">Java ME</a></li>
+<li><a href="#_javafx">JavaFX</a></li>
+</ul>
+</li>
<li><a href="#_documents_aportats_per_la_comunitat">Documents aportats per la comunitat</a></li>
-<li><a href="#_altres_recursos">Altres recursos</a></li>
+<li><a href="#_altres_recursos">Altres recursos</a>
+<ul class="sectlevel2">
+<li><a href="#_recursos_de_la_comunitat_mòbil_de_netbeans">Recursos de la comunitat mòbil de NetBeans</a></li>
+<li><a href="#_blogs_de_desenvolupadors_de_java_me">Blogs de desenvolupadors de Java ME</a></li>
+<li><a href="#_llocs_relacionats_amb_java_me">Llocs relacionats amb Java ME</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_què_és_una_aplicació_mòbil">[[Què és una aplicació mòbil?]]</h4>
+<div class="sect1">
+<h2 id="_què_és_una_aplicació_mòbil">[[Què és una aplicació mòbil?]]</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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 [...]
</div>
@@ -124,29 +144,28 @@
<div class="paragraph">
<p>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 <a href="http://wiki.netbeans.org/JavaFX">Centre de desenvolupadors JavaFX</a> i donant un cop d’ull als següent exemples JavaFX.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_com_començar" class="sect0">Com començar</h1>
+<div class="sect1">
+<h2 id="_com_començar">Com començar</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/quickstart.html">Guia d'inici ràpid pel desenvolupament MIDP en Java ME a NetBeans</a></p>
</li>
<li>
-<p><a href="../docs/javame/cdc-quickstart.html">Guia d'inici ràpid pel desenvolupament de CDC en Java ME a NetBeans</a>
-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[]</p>
+<p><a href="../docs/javame/cdc-quickstart.html">Guia d'inici ràpid pel desenvolupament de CDC en Java ME a NetBeans</a></p>
</li>
</ul>
</div>
-<h1 id="_guies_d_aprenentatge_i_articles" class="sect0">Guies d’aprenentatge i Articles</h1>
-<div class="paragraph">
-<p>*Utilitzant components personalitzats pel dissenyador visual mòbil
-*</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_utilitzant_components_personalitzats_pel_dissenyador_visual_mòbil">Utilitzant components personalitzats pel dissenyador visual mòbil</h3>
<div class="ulist">
<ul>
<li>
@@ -178,10 +197,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Afegint JavaFX a aplicacions Mòbil
-*</p>
</div>
+<div class="sect2">
+<h3 id="_afegint_javafx_a_aplicacions_mòbil">Afegint JavaFX a aplicacions Mòbil</h3>
<div class="ulist">
<ul>
<li>
@@ -192,10 +210,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Desenvolupant aplicacions Java ME/CDC
-*</p>
</div>
+<div class="sect2">
+<h3 id="_desenvolupant_aplicacions_java_me_cdc">Desenvolupant aplicacions Java ME/CDC</h3>
<div class="ulist">
<ul>
<li>
@@ -206,28 +223,25 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Creant jocs Java ME
-*</p>
</div>
+<div class="sect2">
+<h3 id="_creant_jocs_java_me">Creant jocs Java ME</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://wiki.netbeans.org/CreatingJavaMEGamesWithGameBuilder">Creant jocs mòbils amb el constructor de jocs de Java ME</a></p>
</li>
<li>
-<p>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)</p>
+<p><a href="http://developers.sun.com/events/techdays/downloads/pdfs/6400_MobileGame_labdoc.pdf">Creeu el vostre joc mòbil: JavaOne 2008 Hands On Lab - 6400</a> (descarregar PDF)</p>
</li>
<li>
<p><a href="http://wiki.netbeans.org/DarkstarSupport">Guia de suport del projecte Darkstar per a jocs en línia i connectats al desenvolupament d'aplicacions.</a></p>
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Dissenyant aplicacions per a diversos dispositius
-*</p>
</div>
+<div class="sect2">
+<h3 id="_dissenyant_aplicacions_per_a_diversos_dispositius">Dissenyant aplicacions per a diversos dispositius</h3>
<div class="ulist">
<ul>
<li>
@@ -235,12 +249,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -248,20 +262,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_aplicacions_d_exemple" class="sect0">Aplicacions d’exemple</h1>
-<div class="paragraph">
-<p><strong>Java ME</strong></p>
-</div>
+<div class="sect1">
+<h2 id="_aplicacions_d_exemple">Aplicacions d’exemple</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_java_me">Java ME</h3>
<div class="ulist">
<ul>
<li>
@@ -278,9 +285,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>JavaFX</strong></p>
</div>
+<div class="sect2">
+<h3 id="_javafx">JavaFX</h3>
<div class="ulist">
<ul>
<li>
@@ -290,12 +297,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://www.javafx.com/samples/Carousel/">Anell d'imatges</a></p>
</li>
<li>
-<p><a href="http://www.javafx.com/samples/SpringAnimation/">Animacions elàstiques i rebotants</a>
-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[]</p>
+<p><a href="http://www.javafx.com/samples/SpringAnimation/">Animacions elàstiques i rebotants</a></p>
</li>
</ul>
</div>
-<h1 id="_documents_aportats_per_la_comunitat" class="sect0">Documents aportats per la comunitat</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_documents_aportats_per_la_comunitat">Documents aportats per la comunitat</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -306,21 +317,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_altres_recursos" class="sect0">Altres recursos</h1>
-<div class="paragraph">
-<p>*Recursos de la comunitat mòbil de NetBeans
-*</p>
-</div>
+<div class="sect1">
+<h2 id="_altres_recursos">Altres recursos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_recursos_de_la_comunitat_mòbil_de_netbeans">Recursos de la comunitat mòbil de NetBeans</h3>
<div class="ulist">
<ul>
<li>
@@ -334,10 +337,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Blogs de desenvolupadors de Java ME
-*</p>
</div>
+<div class="sect2">
+<h3 id="_blogs_de_desenvolupadors_de_java_me">Blogs de desenvolupadors de Java ME</h3>
<div class="ulist">
<ul>
<li>
@@ -354,10 +356,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Llocs relacionats amb Java ME
-*</p>
</div>
+<div class="sect2">
+<h3 id="_llocs_relacionats_amb_java_me">Llocs relacionats amb Java ME</h3>
<div class="ulist">
<ul>
<li>
@@ -367,11 +368,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://java.sun.com/javame/index.jsp">Xarca de desenvolupadors de Sun</a> - Pàgina web principal de Java ME</p>
</li>
<li>
-<p><a href="http://developers.sun.com/techtopics/mobility/">+Centre de tecnologia mòbil de la xarxa de desenvolupadors de Sun +</a> - 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[]</p>
+<p><a href="http://developers.sun.com/techtopics/mobility/">+Centre de tecnologia mòbil de la xarxa de desenvolupadors de Sun +</a> - Informació quant a la creació, testeig i certificació d’aplicacions mòbils.</p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/mobility_ja.html b/content/kb/docs/mobility_ja.html
index cf1ed76..f4465f6 100644
--- a/content/kb/docs/mobility_ja.html
+++ b/content/kb/docs/mobility_ja.html
@@ -96,7 +96,7 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_モバイル_アプリケーションとは">モバイル・アプリケーションとは</a></li>
<li><a href="#_開始">開始</a></li>
<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a></li>
@@ -105,33 +105,34 @@
<li><a href="#_その他のリソース">その他のリソース</a></li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_モバイル_アプリケーションとは">モバイル・アプリケーションとは</h4>
+<div class="sect1">
+<h2 id="_モバイル_アプリケーションとは">モバイル・アプリケーションとは</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>モバイル・アプリケーションのほとんどはJava Micro Edition (Java ME)プラットフォームを使用します。Java MEプラットフォームは携帯電話などの小型デバイス用に開発されましたが、現在では様々なデバイスで使用されています。Java MEでは、縮小されたJava SEコンポーネントのサブセット、仮想マシン、およびAPIを使用します。また、消費者向けのモバイル機器や組込みデバイスに特化したAPIを定義します。NetBeans IDEでは、<a href="http://www.oracle.com/us/technologies/java/embedded/micro-edition/overview/index.html">Oracle Java ME Embedded</a>および<a href="http://www.oracle.com/technetwork/java/javame/javacard/overview/getstarted/index.html">Java Cardプラットフォーム</a>がサポートされます。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_開始" class="sect0">開始</h1>
+<div class="sect1">
+<h2 id="_開始">開始</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/imp-ng.html">モバイル埋込みアプリケーションの作成、デバッグおよびプロファイリング</a></p>
</li>
<li>
-<p><a href="../docs/javame/java-card.html">Java Card開発のクイック・スタート・ガイド</a>
-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[]</p>
+<p><a href="../docs/javame/java-card.html">Java Card開発のクイック・スタート・ガイド</a></p>
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事" class="sect0">チュートリアルおよび記事</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事">チュートリアルおよび記事</h2>
+<div class="sectionbody">
<div class="paragraph">
-<p>*Java Cardアプリケーションの開発
-*</p>
+<p><strong>Java Cardアプリケーションの開発</strong></p>
</div>
<div class="ulist">
<ul>
@@ -139,12 +140,15 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/javame/javacard.html">Java Cardクイック・スタートの記事</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">スマート・カード上でのサーブレットのデプロイ: ポータブルWebサーバーとJava Card 3.0</a>
-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[]</p>
+<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">スマート・カード上でのサーブレットのデプロイ: ポータブルWebサーバーとJava Card 3.0</a></p>
</li>
</ul>
</div>
-<h1 id="_スクリーンキャスト" class="sect0">スクリーンキャスト</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_スクリーンキャスト">スクリーンキャスト</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -161,17 +165,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_コミュニティの寄稿ドキュメント" class="sect0">コミュニティの寄稿ドキュメント</h1>
+<div class="sect1">
+<h2 id="_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -182,17 +180,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_その他のリソース" class="sect0">その他のリソース</h1>
+<div class="sect1">
+<h2 id="_その他のリソース">その他のリソース</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -210,8 +202,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</ul>
</div>
<div class="paragraph">
-<p>*NetBeans Mobilityコミュニティのリソース
-*</p>
+<p><strong>NetBeans Mobilityコミュニティのリソース</strong></p>
</div>
<div class="ulist">
<ul>
@@ -224,8 +215,7 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</ul>
</div>
<div class="paragraph">
-<p>*Java ME関連サイト
-*</p>
+<p><strong>Java ME関連サイト</strong></p>
</div>
<div class="ulist">
<ul>
@@ -233,11 +223,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html">Java ME Embeddedドキュメント</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle Technology Network - Java MEランディング・ページ</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle Technology Network - Java MEランディング・ページ</a></p>
</li>
</ul>
</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/mobility_pt_BR.html b/content/kb/docs/mobility_pt_BR.html
index f4dd9f4..c2735c9 100644
--- a/content/kb/docs/mobility_pt_BR.html
+++ b/content/kb/docs/mobility_pt_BR.html
@@ -96,55 +96,68 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_o_que_é_uma_aplicação_móvel">O que é uma Aplicação Móvel?</a></li>
<li><a href="#_introdução">Introdução</a></li>
-<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a></li>
+<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_desenvolvendo_aplicações_java_card">Desenvolvendo Aplicações Java Card</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</a></li>
-<li><a href="#_outros_recursos">Outros Recursos</a></li>
+<li><a href="#_outros_recursos">Outros Recursos</a>
+<ul class="sectlevel2">
+<li><a href="#_recursos_da_comunidade_do_netbeans_mobility">Recursos da Comunidade do NetBeans Mobility</a></li>
+<li><a href="#_sites_relacionados_ao_java_me">Sites Relacionados ao Java ME</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_o_que_é_uma_aplicação_móvel">O que é uma Aplicação Móvel?</h4>
+<div class="sect1">
+<h2 id="_o_que_é_uma_aplicação_móvel">O que é uma Aplicação Móvel?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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 <a href="http://www.oracle.com/us/technologies/java/e [...]
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_introdução" class="sect0">Introdução</h1>
+<div class="sect1">
+<h2 id="_introdução">Introdução</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/imp-ng.html">Criando, Depurando e Criando Perfil em uma Aplicação Incorporada Móvel</a></p>
</li>
<li>
-<p><a href="../docs/javame/java-card.html">Guia de Início Rápido do Desenvolvimento de Java Card no NetBeans</a>
-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[]</p>
+<p><a href="../docs/javame/java-card.html">Guia de Início Rápido do Desenvolvimento de Java Card no NetBeans</a></p>
</li>
</ul>
</div>
-<h1 id="_tutoriais_e_artigos" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p>*Desenvolvendo Aplicações Java Card
-*</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_desenvolvendo_aplicações_java_card">Desenvolvendo Aplicações Java Card</h3>
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/javacard.html">Artigo de Início Rápido do Java Card</a></p>
</li>
<li>
-<p><a href="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</a>
-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[]</p>
+<p><a href="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</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -161,17 +174,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_documentos_de_contribuição_da_comunidade" class="sect0">Documentos de Contribuição da Comunidade</h1>
+<div class="sect1">
+<h2 id="_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -182,17 +189,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_outros_recursos" class="sect0">Outros Recursos</h1>
+<div class="sect1">
+<h2 id="_outros_recursos">Outros Recursos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -209,10 +210,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Recursos da Comunidade do NetBeans Mobility
-*</p>
-</div>
+<div class="sect2">
+<h3 id="_recursos_da_comunidade_do_netbeans_mobility">Recursos da Comunidade do NetBeans Mobility</h3>
<div class="ulist">
<ul>
<li>
@@ -223,21 +222,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Sites Relacionados ao Java ME
-*</p>
</div>
+<div class="sect2">
+<h3 id="_sites_relacionados_ao_java_me">Sites Relacionados ao Java ME</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html">Documentação Incorporada do Java ME</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">+Oracle Technology Network - Página Inicial do Java ME +</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">+Oracle Technology Network - Página Inicial do Java ME +</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/mobility_ru.html b/content/kb/docs/mobility_ru.html
index 5c61695..09e1852 100644
--- a/content/kb/docs/mobility_ru.html
+++ b/content/kb/docs/mobility_ru.html
@@ -96,55 +96,69 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
-<li><a href="#_Общее_представление_о_мобильном_приложении">Общее представление о мобильном приложении</a></li>
+<ul class="sectlevel1">
+<li><a href="#_Общее_представление_о_мобильном_приложении">Общее представление о мобильном приложении</a>
+<ul class="sectlevel2">
<li><a href="#_Начало_работы">Начало работы</a></li>
-<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a></li>
+</ul>
+</li>
+<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a>
+<ul class="sectlevel2">
+<li><a href="#_Разработка_приложений_java_card">Разработка приложений Java Card</a></li>
+</ul>
+</li>
<li><a href="#_Экранные_демонстрации">Экранные демонстрации</a></li>
<li><a href="#_Документы_от_сообщества">Документы от сообщества</a></li>
-<li><a href="#_Другие_источники">Другие источники</a></li>
+<li><a href="#_Другие_источники">Другие источники</a>
+<ul class="sectlevel2">
+<li><a href="#_Источники_сообщества_netbeans_mobility">Источники сообщества NetBeans Mobility</a></li>
+<li><a href="#_Сайты_с_информацией_по_java_me">Сайты с информацией по Java ME</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_Общее_представление_о_мобильном_приложении">Общее представление о мобильном приложении</h4>
+<div class="sect1">
+<h2 id="_Общее_представление_о_мобильном_приложении">Общее представление о мобильном приложении</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>В большинстве мобильных приложений используется платформа Java Micro Edition (Java ME), разработанная для небольших устройств, таких как мобильные телефоны, но используемая на широком спектре устройств. В платформе Java ME используются сокращенные подмножества компонентов Java SE, виртуальных машин и интерфейсов API. В ней также определены интерфейсы API, которые предназначены специально для мобильных и встроенных устройств. IDE NetBeans поддерживает платформы <a href="http://www.orac [...]
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
-</div>
-</div>
-<h1 id="_Начало_работы" class="sect0">Начало работы</h1>
+<div class="sect2">
+<h3 id="_Начало_работы">Начало работы</h3>
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/imp-ng.html">Создание, отладка и профилирование мобильных встроенных приложений</a></p>
</li>
<li>
-<p><a href="../docs/javame/java-card.html">Краткое руководство пользователя по разработке приложений Java Card в среде NetBeans</a>
-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[]</p>
+<p><a href="../docs/javame/java-card.html">Краткое руководство пользователя по разработке приложений Java Card в среде NetBeans</a></p>
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи" class="sect0">Учебные курсы и статьи</h1>
-<div class="paragraph">
-<p>*Разработка приложений Java Card
-*</p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи">Учебные курсы и статьи</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_Разработка_приложений_java_card">Разработка приложений Java Card</h3>
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/javacard.html">Статья о начале работы с Java Card</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">Развертывание сервлетов на смарт-картах: переносные веб-серверы с Java Card 3.0</a>
-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[]</p>
+<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">Развертывание сервлетов на смарт-картах: переносные веб-серверы с Java Card 3.0</a></p>
</li>
</ul>
</div>
-<h1 id="_Экранные_демонстрации" class="sect0">Экранные демонстрации</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Экранные_демонстрации">Экранные демонстрации</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -161,17 +175,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_Документы_от_сообщества" class="sect0">Документы от сообщества</h1>
+<div class="sect1">
+<h2 id="_Документы_от_сообщества">Документы от сообщества</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -182,17 +190,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_Другие_источники" class="sect0">Другие источники</h1>
+<div class="sect1">
+<h2 id="_Другие_источники">Другие источники</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -209,10 +211,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Источники сообщества NetBeans Mobility
-*</p>
-</div>
+<div class="sect2">
+<h3 id="_Источники_сообщества_netbeans_mobility">Источники сообщества NetBeans Mobility</h3>
<div class="ulist">
<ul>
<li>
@@ -223,21 +223,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Сайты с информацией по Java ME
-*</p>
</div>
+<div class="sect2">
+<h3 id="_Сайты_с_информацией_по_java_me">Сайты с информацией по Java ME</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html">Документация по Java ME Embedded</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle Technology Network - целевая страница Java ME</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle Technology Network - целевая страница Java ME</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/mobility_zh_CN.html b/content/kb/docs/mobility_zh_CN.html
index 55880a7..d1ff768 100644
--- a/content/kb/docs/mobility_zh_CN.html
+++ b/content/kb/docs/mobility_zh_CN.html
@@ -96,55 +96,68 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_什么是_mobile_应用程序">什么是 Mobile 应用程序?</a></li>
<li><a href="#_入门指南">入门指南</a></li>
-<li><a href="#_教程和文章">教程和文章</a></li>
+<li><a href="#_教程和文章">教程和文章</a>
+<ul class="sectlevel2">
+<li><a href="#_开发_java_card_应用程序">开发 Java Card 应用程序</a></li>
+</ul>
+</li>
<li><a href="#_截屏视频">截屏视频</a></li>
<li><a href="#_社区提供的文档">社区提供的文档</a></li>
-<li><a href="#_其他资源">其他资源</a></li>
+<li><a href="#_其他资源">其他资源</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_mobility_社区资源">NetBeans Mobility 社区资源</a></li>
+<li><a href="#_java_me_相关站点">Java ME 相关站点</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_什么是_mobile_应用程序">什么是 Mobile 应用程序?</h4>
+<div class="sect1">
+<h2 id="_什么是_mobile_应用程序">什么是 Mobile 应用程序?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>大多数 Mobile 应用程序使用 Java Micro Edition (Java ME) 平台,该平台是为移动电话之类的小型设备开发的,但现在可用于多种设备。Java ME 使用向下扩展的 Java SE 组件、虚拟机和 API 所组成的子集。它也定义分别以客户移动设备和嵌入设备为目标的 API。NetBeans IDE 支持 <a href="http://www.oracle.com/us/technologies/java/embedded/micro-edition/overview/index.html">Oracle Java ME 嵌入式</a>和 <a href="http://www.oracle.com/technetwork/java/javame/javacard/overview/getstarted/index.html">Java Card 平台</a>。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_入门指南" class="sect0">入门指南</h1>
+<div class="sect1">
+<h2 id="_入门指南">入门指南</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/imp-ng.html">创建、调试 Mobile 嵌入式应用程序并进行性能分析</a></p>
</li>
<li>
-<p>《<a href="../docs/javame/java-card.html">NetBeans Java Card 开发快速入门指南</a>》
-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[]</p>
+<p>《<a href="../docs/javame/java-card.html">NetBeans Java Card 开发快速入门指南</a>》</p>
</li>
</ul>
</div>
-<h1 id="_教程和文章" class="sect0">教程和文章</h1>
-<div class="paragraph">
-<p>*开发 Java Card 应用程序
-*</p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章">教程和文章</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_开发_java_card_应用程序">开发 Java Card 应用程序</h3>
<div class="ulist">
<ul>
<li>
<p><a href="../docs/javame/javacard.html">Java Card 快速入门文章</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">在智能卡上部署 Servlet:具有 Java Card 3.0 的可移植 Web 服务器</a>
-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[]</p>
+<p><a href="http://www.oracle.com/technetwork/articles/javase/javacard-servlets-136657.html">在智能卡上部署 Servlet:具有 Java Card 3.0 的可移植 Web 服务器</a></p>
</li>
</ul>
</div>
-<h1 id="_截屏视频" class="sect0">截屏视频</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_截屏视频">截屏视频</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -161,17 +174,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../../community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_社区提供的文档" class="sect0">社区提供的文档</h1>
+<div class="sect1">
+<h2 id="_社区提供的文档">社区提供的文档</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -182,17 +189,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_其他资源" class="sect0">其他资源</h1>
+<div class="sect1">
+<h2 id="_其他资源">其他资源</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -209,10 +210,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*NetBeans Mobility 社区资源
-*</p>
-</div>
+<div class="sect2">
+<h3 id="_netbeans_mobility_社区资源">NetBeans Mobility 社区资源</h3>
<div class="ulist">
<ul>
<li>
@@ -223,21 +222,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Java ME 相关站点
-*</p>
</div>
+<div class="sect2">
+<h3 id="_java_me_相关站点">Java ME 相关站点</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://www.oracle.com/technetwork/java/embedded/resources/me-embeddocs/index.html">Java ME Embedded 文档</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle 技术网 - Java ME 登录页</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://www.oracle.com/technetwork/java/javame/index.html">Oracle 技术网 - Java ME 登录页</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/php.html b/content/kb/docs/php.html
index 8edb259..5e2ad72 100644
--- a/content/kb/docs/php.html
+++ b/content/kb/docs/php.html
@@ -96,12 +96,33 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel0">
+<ul class="sectlevel1">
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_basic_oracle_jet_development">Basic Oracle JET Development</a></li>
+<li><a href="#_common_scenarios_for_oracle_jet_development">Common Scenarios for Oracle JET Development</a></li>
+<li><a href="#_html5_and_javascript_project_development">HTML5 and JavaScript Project Development</a></li>
+<li><a href="#_configuring_your_environment_for_php_development">Configuring Your Environment for PHP Development</a></li>
+<li><a href="#_testing_and_debugging">Testing and Debugging</a></li>
+<li><a href="#_frameworks">Frameworks</a></li>
+</ul>
+</li>
+<li><a href="#_general_php_tutorials">General PHP Tutorials</a>
+<ul class="sectlevel2">
+<li><a href="#_creating_a_database_driven_application_with_php">Creating a Database Driven Application With PHP</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
+<li><a href="#_other_resources">Other Resources</a>
+<ul class="sectlevel2">
+<li><a href="#_em_developing_applications_with_netbeans_ide_em_user_s_guide"><em>Developing Applications with NetBeans IDE</em> User’s Guide</a></li>
+<li><a href="#_online_magazine_articles">Online Magazine Articles</a></li>
+<li><a href="#_the_ide_databases_and_versioning">The IDE, Databases, and Versioning</a></li>
+<li><a href="#_weblogs">Weblogs</a></li>
+</ul>
+</li>
</ul>
</div>
<div id="preamble">
@@ -109,14 +130,11 @@
<div class="paragraph">
<p>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 <a href="http://blogs.oracle.com/netbeansphp/">NetBeans for PHP blog</a> and <a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans WebClient blog</a> for the latest information.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -135,15 +153,17 @@
<p><a href="../docs/webclient/ojet-gettingstarted.html">Getting Started with Oracle JET Applications</a></p>
</li>
<li>
-<p><a href="../docs/webclient/cordova-gettingstarted.html">Getting Started with Cordova Applications</a>
-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[]</p>
+<p><a href="../docs/webclient/cordova-gettingstarted.html">Getting Started with Cordova Applications</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>Basic Oracle JET Development</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_basic_oracle_jet_development">Basic Oracle JET Development</h3>
<div class="ulist">
<ul>
<li>
@@ -166,9 +186,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Common Scenarios for Oracle JET Development</strong></p>
</div>
+<div class="sect2">
+<h3 id="_common_scenarios_for_oracle_jet_development">Common Scenarios for Oracle JET Development</h3>
<div class="ulist">
<ul>
<li>
@@ -200,9 +220,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>HTML5 and JavaScript Project Development</strong></p>
</div>
+<div class="sect2">
+<h3 id="_html5_and_javascript_project_development">HTML5 and JavaScript Project Development</h3>
<div class="ulist">
<ul>
<li>
@@ -225,9 +245,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Configuring Your Environment for PHP Development</strong></p>
</div>
+<div class="sect2">
+<h3 id="_configuring_your_environment_for_php_development">Configuring Your Environment for PHP Development</h3>
<div class="ulist">
<ul>
<li>
@@ -247,9 +267,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Testing and Debugging</strong></p>
</div>
+<div class="sect2">
+<h3 id="_testing_and_debugging">Testing and Debugging</h3>
<div class="ulist">
<ul>
<li>
@@ -263,9 +283,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Frameworks</strong></p>
</div>
+<div class="sect2">
+<h3 id="_frameworks">Frameworks</h3>
<div class="ulist">
<ul>
<li>
@@ -288,9 +308,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>General PHP Tutorials</strong></p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_general_php_tutorials">General PHP Tutorials</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -301,15 +324,12 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Creating a Database Driven Application With PHP</strong></p>
-</div>
+<div class="sect2">
+<h3 id="_creating_a_database_driven_application_with_php">Creating a Database Driven Application With PHP</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/php/wish-list-tutorial-main-page.html">Main Page: Creating a Database Driven Application With PHP</a>
-*
-Part 1: Creating the Database</p>
+<p><a href="../docs/php/wish-list-tutorial-main-page.html">Main Page: Creating a Database Driven Application With PHP</a></p>
</li>
<li>
<p><a href="../docs/php/wish-list-lesson1.html">1a: Creating a MySQL Database</a></p>
@@ -339,12 +359,16 @@ Part 1: Creating the Database</p>
<p><a href="../docs/php/wish-list-lesson8.html">Part 8: Making the Application Look Better Using CSS</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson9.html">Part 9: Deploying the Application on a Remote Web Server</a>
-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[]</p>
+<p><a href="../docs/php/wish-list-lesson9.html">Part 9: Deploying the Application on a Remote Web Server</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -403,17 +427,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="/community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -427,20 +445,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
-</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
-<div class="paragraph">
-<p><strong><em>Developing Applications with NetBeans IDE</em> User’s Guide</strong></p>
</div>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_em_developing_applications_with_netbeans_ide_em_user_s_guide"><em>Developing Applications with NetBeans IDE</em> User’s Guide</h3>
<div class="ulist">
<ul>
<li>
@@ -451,9 +462,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Online Magazine Articles</strong></p>
</div>
+<div class="sect2">
+<h3 id="_online_magazine_articles">Online Magazine Articles</h3>
<div class="ulist">
<ul>
<li>
@@ -467,9 +478,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>The IDE, Databases, and Versioning</strong></p>
</div>
+<div class="sect2">
+<h3 id="_the_ide_databases_and_versioning">The IDE, Databases, and Versioning</h3>
<div class="ulist">
<ul>
<li>
@@ -492,20 +503,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Weblogs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_weblogs">Weblogs</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">NetBeans for PHP blog</a></p>
</li>
<li>
-<p><a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Web Client blog</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Web Client blog</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/php/quickstart_ru.html b/content/kb/docs/php/quickstart_ru.html
index 88d6ad5..3ffff74 100644
--- a/content/kb/docs/php/quickstart_ru.html
+++ b/content/kb/docs/php/quickstart_ru.html
@@ -244,7 +244,7 @@ image::images/getting-started-open-new-project.png[]</p>
</div>
</div>
<div class="olist arabic">
-<ol class="arabic">
+<ol class="arabic" start="4">
<li>
<p>Для выполнения этого проекта поместите курсор на узел NewPHPProject и в контекстном меню выберите команду "Выполнить". На рисунке ниже показано, что должно отобразиться в окне браузера.
image::images/getting-started-browser-hello-world.png[]
@@ -286,25 +286,34 @@ image::images/getting-started-browser-hello-world.png[]
<div class="paragraph">
<p>В это же время для поиска информации, связанной с типом разрабатываемых приложений, используйте учебные карты IDE NetBeans для этого типа приложения. Каждая учебная карта содержит ряд учебных курсов и руководств различных уровней сложности. Доступны следующие учебные карты:</p>
</div>
-<table class="tableblock frame-all grid-all spread">
-<colgroup>
-<col style="width: 100%;">
-</colgroup>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">* <a href="../../trails/php.html">Программирование на PHP</a>
-* <a href="../../trails/java-se.html">Базовое программирование на Java</a>
-* <a href="../../trails/matisse.html">Приложения на Java с графическим интерфейсом</a>
-* <a href="../../trails/web.html">Приложения веб-служб</a>
-* <a href="../../trails/java-ee.html">Приложения Java EE и веб-приложения Java</a></p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock">* <a href="../../trails/mobility.html">Мобильные приложения</a>
-* <a href="../../trails/platform.html">Подключаемые модули NetBeans и функционально насыщенные клиентские приложения</a>
-* <a href="../../trails/cnd.html">Приложения на C/C++</a></p></td>
-</tr>
-</tbody>
-</table>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="../../trails/php.html">Программирование на PHP</a></p>
+</li>
+<li>
+<p><a href="../../trails/java-se.html">Базовое программирование на Java</a></p>
+</li>
+<li>
+<p><a href="../../trails/matisse.html">Приложения на Java с графическим интерфейсом</a></p>
+</li>
+<li>
+<p><a href="../../trails/web.html">Приложения веб-служб</a></p>
+</li>
+<li>
+<p><a href="../../trails/java-ee.html">Приложения Java EE и веб-приложения Java</a></p>
+</li>
+<li>
+<p><a href="../../trails/mobility.html">Мобильные приложения</a></p>
+</li>
+<li>
+<p><a href="../../trails/platform.html">Подключаемые модули NetBeans и функционально насыщенные клиентские приложения</a></p>
+</li>
+<li>
+<p><a href="../../trails/cnd.html">Приложения на C/C++</a></p>
+</li>
+</ul>
+</div>
<div class="paragraph">
<p><a href="/about/contact_form.html?to=3&subject=Feedback:%20PHP%20Quickstart">Отправить отзыв по этому учебному курсу</a></p>
</div>
diff --git a/content/kb/docs/php/wish-list-lesson9.html b/content/kb/docs/php/wish-list-lesson9.html
index 71dacec..3fff7b5 100644
--- a/content/kb/docs/php/wish-list-lesson9.html
+++ b/content/kb/docs/php/wish-list-lesson9.html
@@ -110,74 +110,6 @@
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
-<p>Tutorial contents:</p>
-</div>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p><a href="wish-list-tutorial-main-page.html">Creating a Database Driven Application With PHP - Main page</a>
-2.
-Creating the Database</p>
-</li>
-<li>
-<p><a href="wish-list-lesson1.html">Creating a MySQL Database</a></p>
-</li>
-<li>
-<p><a href="wish-list-oracle-lesson1.html">Creating Oracle Database Tables</a>
-3.
-<a href="wish-list-lesson2.html">Designing the Application. Reading from the Database</a></p>
-</li>
-<li>
-<p><a href="wish-list-lesson3.html">+Creating a New Application User +</a></p>
-</li>
-<li>
-<p><a href="wish-list-lesson4.html">Optimizing the Code</a></p>
-</li>
-<li>
-<p><a href="wish-list-lesson5.html">Adding Security. Implementing Application User Logon</a></p>
-</li>
-<li>
-<p><a href="wish-list-lesson6.html">+ Adding a New Wish to the Database+</a></p>
-</li>
-<li>
-<p><a href="wish-list-lesson7.html">Updating and Deleting Entries in the Database</a></p>
-</li>
-<li>
-<p><a href="wish-list-lesson8.html">+ Making the Application Look Better Using the CSS Technology+</a>
-10.
-<strong>⇒Deploying the Application on a Remote Web Server</strong></p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="#previousLessonSourceCode">Application Source Code from the Previous Lesson</a></p>
-</li>
-<li>
-<p><a href="#registerEmailAccount">Registering an Email Account</a></p>
-</li>
-<li>
-<p><a href="#registerHostingAccount">Registering a Hosting Account</a></p>
-</li>
-<li>
-<p><a href="#registeringFTPAccount">Registering an FTP Account</a></p>
-</li>
-<li>
-<p><a href="#creatingRemoteDatabase">Creating a Remote Database</a></p>
-</li>
-<li>
-<p><a href="#settingUpPHPProjectWithSources">Setting Up a PHP Project with Existing Sources</a></p>
-</li>
-<li>
-<p><a href="#updatingClassWishDB">Updating the Class WishDB</a></p>
-</li>
-<li>
-<p><a href="#nextSteps">Next Steps</a></p>
-</li>
-</ul>
-</div>
-</li>
-</ol>
-</div>
-<div class="paragraph">
<p>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.</p>
</div>
<div class="paragraph">
@@ -326,8 +258,8 @@ Creating the Database</p>
<div class="sect1">
<h2 id="_setting_up_a_php_project_with_existing_sources_and_remote_web_site_run_configuration">Setting Up a PHP Project with Existing Sources and Remote Web Site Run Configuration</h2>
<div class="sectionbody">
-<div class="olist arabic">
-<ol class="arabic">
+<div class="ulist">
+<ul>
<li>
<p><a href="#previousLessonSourceCode">Download the source files</a> that correspond to the state of the application after the previous lesson is completed. Extract the files.</p>
</li>
@@ -350,7 +282,7 @@ Creating the Database</p>
<li>
<p>Complete the project creation.</p>
</li>
-</ol>
+</ul>
</div>
</div>
</div>
@@ -372,10 +304,10 @@ Creating the Database</p>
</div>
<div class="listingblock">
<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java"> 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>";</code></pre>
+<pre class="prettyprint highlight"><code class="language-php" data-lang="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>";</code></pre>
</div>
</div>
<div class="paragraph">
@@ -383,10 +315,10 @@ Creating the Database</p>
</div>
<div class="listingblock">
<div class="content">
-<pre class="prettyprint highlight"><code class="language-java" data-lang="java"> var $user = "phpuser";
- var $pass = "phpuserpw";
- var $dbName = "wishlist";
- var $dbHost = "phpuser";</code></pre>
+<pre class="prettyprint highlight"><code class="language-php" data-lang="php">var $user = "phpuser";
+var $pass = "phpuserpw";
+var $dbName = "wishlist";
+var $dbHost = "phpuser";</code></pre>
</div>
</div>
</div>
@@ -394,11 +326,15 @@ Creating the Database</p>
<div class="sect1">
<h2 id="_next_steps">Next Steps</h2>
<div class="sectionbody">
-<div class="paragraph">
+<div class="ulist">
+<ul>
+<li>
<p><a href="wish-list-lesson8.html"><< Previous lesson</a></p>
-</div>
-<div class="paragraph">
+</li>
+<li>
<p><a href="wish-list-tutorial-main-page.html">Back to the Tutorial main page</a></p>
+</li>
+</ul>
</div>
</div>
</div>
diff --git a/content/kb/docs/php_ca.html b/content/kb/docs/php_ca.html
index 9a6d9fc..751ec46 100644
--- a/content/kb/docs/php_ca.html
+++ b/content/kb/docs/php_ca.html
@@ -96,42 +96,57 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_desenvolupant_aplicacions_php_en_l_ide_netbeans">Desenvolupant aplicacions PHP en l’IDE NetBeans</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_configuring_your_environment_for_php_development">Configuring Your Environment for PHP Development</a></li>
+<li><a href="#_testing_and_debugging">Testing and Debugging</a></li>
+<li><a href="#_frameworks">Frameworks</a></li>
+<li><a href="#_general_php_tutorials">General PHP Tutorials</a></li>
+<li><a href="#_creating_a_database_driven_application_with_php">Creating a Database Driven Application With PHP</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
+<li><a href="#_other_resources">Other Resources</a>
+<ul class="sectlevel2">
+<li><a href="#_online_magazine_articles">Online Magazine Articles</a></li>
+<li><a href="#_the_ide_databases_and_versioning">The IDE, Databases, and Versioning</a></li>
+<li><a href="#_weblogs">Weblogs</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_desenvolupant_aplicacions_php_en_l_ide_netbeans">Desenvolupant aplicacions PHP en l’IDE NetBeans</h4>
+<div class="sect1">
+<h2 id="_desenvolupant_aplicacions_php_en_l_ide_netbeans">Desenvolupant aplicacions PHP en l’IDE NetBeans</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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 <a href="http://blogs.oracle.com/netbeansphp/">Blog de NetBeans per a PHP</a> per a l’última informació.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="../../kb/docs/php/quickstart.html">NetBeans IDE PHP Quick Start Tutorial</a></p>
</li>
<li>
-<p><a href="../../kb/docs/php/project-setup.html">Setting Up a PHP Project</a>
-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[]</p>
+<p><a href="../../kb/docs/php/project-setup.html">Setting Up a PHP Project</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>Configuring Your Environment for PHP Development</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_configuring_your_environment_for_php_development">Configuring Your Environment for PHP Development</h3>
<div class="ulist">
<ul>
<li>
@@ -151,9 +166,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Testing and Debugging</strong></p>
</div>
+<div class="sect2">
+<h3 id="_testing_and_debugging">Testing and Debugging</h3>
<div class="ulist">
<ul>
<li>
@@ -167,9 +182,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Frameworks</strong></p>
</div>
+<div class="sect2">
+<h3 id="_frameworks">Frameworks</h3>
<div class="ulist">
<ul>
<li>
@@ -192,9 +207,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>General PHP Tutorials</strong></p>
</div>
+<div class="sect2">
+<h3 id="_general_php_tutorials">General PHP Tutorials</h3>
<div class="ulist">
<ul>
<li>
@@ -205,18 +220,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Creating a Database Driven Application With PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_creating_a_database_driven_application_with_php">Creating a Database Driven Application With PHP</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../../kb/docs/php/wish-list-tutorial-main-page.html">Main Page: Creating a Database Driven Application With PHP</a>
-*
-Part 1: Creating the Database</p>
+<p><a href="../../kb/docs/php/wish-list-tutorial-main-page.html">Main Page: Creating a Database Driven Application With PHP</a></p>
</li>
<li>
-<p><a href="../../kb/docs/php/wish-list-lesson1.html">1a: Creating a MySQL Database</a></p>
+<p>Part 1: Creating the Database <a href="../../kb/docs/php/wish-list-lesson1.html">1a: Creating a MySQL Database</a></p>
</li>
<li>
<p><a href="../docs/php/wish-list-oracle-lesson1.html">1b: Creating Oracle Database Tables</a></p>
@@ -243,12 +256,16 @@ Part 1: Creating the Database</p>
<p><a href="../../kb/docs/php/wish-list-lesson8.html">Part 8: Making the Application Look Better Using CSS</a></p>
</li>
<li>
-<p><a href="../../kb/docs/php/wish-list-lesson9.html">Part 9: Deploying the Application on a Remote Web Server</a>
-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[]</p>
+<p><a href="../../kb/docs/php/wish-list-lesson9.html">Part 9: Deploying the Application on a Remote Web Server</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -271,17 +288,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -295,20 +306,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
-<div class="paragraph">
-<p><strong>Online Magazine Articles</strong></p>
</div>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_online_magazine_articles">Online Magazine Articles</h3>
<div class="ulist">
<ul>
<li>
@@ -319,9 +323,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>The IDE, Databases, and Versioning</strong></p>
</div>
+<div class="sect2">
+<h3 id="_the_ide_databases_and_versioning">The IDE, Databases, and Versioning</h3>
<div class="ulist">
<ul>
<li>
@@ -344,17 +348,19 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Weblogs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_weblogs">Weblogs</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">NetBeans for PHP blog</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">NetBeans for PHP blog</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/php_fr.html b/content/kb/docs/php_fr.html
index 31372cc..4543d61 100644
--- a/content/kb/docs/php_fr.html
+++ b/content/kb/docs/php_fr.html
@@ -96,42 +96,57 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_développer_des_applications_php_dans_l_ide_netbeans">Développer des applications PHP dans l’IDE NetBeans</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
-<li><a href="#_tutorials_and_articles">Tutorials and Articles</a></li>
+<li><a href="#_tutorials_and_articles">Tutorials and Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_configuring_your_environment_for_php_development">Configuring Your Environment for PHP Development</a></li>
+<li><a href="#_testing_and_debugging">Testing and Debugging</a></li>
+<li><a href="#_frameworks">Frameworks</a></li>
+<li><a href="#_general_php_tutorials">General PHP Tutorials</a></li>
+<li><a href="#_creating_a_database_driven_application_with_php">Creating a Database Driven Application With PHP</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
+<li><a href="#_other_resources">Other Resources</a>
+<ul class="sectlevel2">
+<li><a href="#_online_magazine_articles">Online Magazine Articles</a></li>
+<li><a href="#_the_ide_databases_and_versioning">The IDE, Databases, and Versioning</a></li>
+<li><a href="#_weblogs">Weblogs</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_développer_des_applications_php_dans_l_ide_netbeans">Développer des applications PHP dans l’IDE NetBeans</h4>
+<div class="sect1">
+<h2 id="_développer_des_applications_php_dans_l_ide_netbeans">Développer des applications PHP dans l’IDE NetBeans</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="../../kb/docs/php/quickstart.html">NetBeans IDE PHP Quick Start Tutorial</a></p>
</li>
<li>
-<p><a href="../../kb/docs/php/project-setup.html">Setting Up a PHP Project</a>
-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[]</p>
+<p><a href="../../kb/docs/php/project-setup.html">Setting Up a PHP Project</a></p>
</li>
</ul>
</div>
-<h1 id="_tutorials_and_articles" class="sect0">Tutorials and Articles</h1>
-<div class="paragraph">
-<p><strong>Configuring Your Environment for PHP Development</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutorials_and_articles">Tutorials and Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_configuring_your_environment_for_php_development">Configuring Your Environment for PHP Development</h3>
<div class="ulist">
<ul>
<li>
@@ -151,9 +166,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Testing and Debugging</strong></p>
</div>
+<div class="sect2">
+<h3 id="_testing_and_debugging">Testing and Debugging</h3>
<div class="ulist">
<ul>
<li>
@@ -167,9 +182,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Frameworks</strong></p>
</div>
+<div class="sect2">
+<h3 id="_frameworks">Frameworks</h3>
<div class="ulist">
<ul>
<li>
@@ -192,9 +207,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>General PHP Tutorials</strong></p>
</div>
+<div class="sect2">
+<h3 id="_general_php_tutorials">General PHP Tutorials</h3>
<div class="ulist">
<ul>
<li>
@@ -205,18 +220,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Creating a Database Driven Application With PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_creating_a_database_driven_application_with_php">Creating a Database Driven Application With PHP</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../../kb/docs/php/wish-list-tutorial-main-page.html">Main Page: Creating a Database Driven Application With PHP</a>
-*
-Part 1: Creating the Database</p>
+<p><a href="../../kb/docs/php/wish-list-tutorial-main-page.html">Main Page: Creating a Database Driven Application With PHP</a></p>
</li>
<li>
-<p><a href="../../kb/docs/php/wish-list-lesson1.html">1a: Creating a MySQL Database</a></p>
+<p>Part 1: Creating the Database <a href="../../kb/docs/php/wish-list-lesson1.html">1a: Creating a MySQL Database</a></p>
</li>
<li>
<p><a href="../docs/php/wish-list-oracle-lesson1.html">1b: Creating Oracle Database Tables</a></p>
@@ -243,12 +256,16 @@ Part 1: Creating the Database</p>
<p><a href="../../kb/docs/php/wish-list-lesson8.html">Part 8: Making the Application Look Better Using CSS</a></p>
</li>
<li>
-<p><a href="../../kb/docs/php/wish-list-lesson9.html">Part 9: Deploying the Application on a Remote Web Server</a>
-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[]</p>
+<p><a href="../../kb/docs/php/wish-list-lesson9.html">Part 9: Deploying the Application on a Remote Web Server</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -271,17 +288,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="../docs/screencasts.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -295,20 +306,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
-<div class="paragraph">
-<p><strong>Online Magazine Articles</strong></p>
</div>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_online_magazine_articles">Online Magazine Articles</h3>
<div class="ulist">
<ul>
<li>
@@ -319,9 +323,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>The IDE, Databases, and Versioning</strong></p>
</div>
+<div class="sect2">
+<h3 id="_the_ide_databases_and_versioning">The IDE, Databases, and Versioning</h3>
<div class="ulist">
<ul>
<li>
@@ -344,17 +348,19 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Weblogs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_weblogs">Weblogs</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">NetBeans for PHP blog</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">NetBeans for PHP blog</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/php_ja.html b/content/kb/docs/php_ja.html
index 0ddbb44..5c154df 100644
--- a/content/kb/docs/php_ja.html
+++ b/content/kb/docs/php_ja.html
@@ -96,12 +96,27 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel0">
+<ul class="sectlevel1">
<li><a href="#_開始">開始</a></li>
-<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a></li>
+<li><a href="#_チュートリアルおよび記事">チュートリアルおよび記事</a>
+<ul class="sectlevel2">
+<li><a href="#_html5およびjavascriptのプロジェクト開発">HTML5およびJavaScriptのプロジェクト開発</a></li>
+<li><a href="#_php開発のための環境の構成">PHP開発のための環境の構成</a></li>
+<li><a href="#_テストとデバッグ">テストとデバッグ</a></li>
+<li><a href="#_フレームワーク">フレームワーク</a></li>
+<li><a href="#_全般的なphpチュートリアル">全般的なPHPチュートリアル</a></li>
+<li><a href="#_phpを使用するデータベース駆動型アプリケーションの作成">PHPを使用するデータベース駆動型アプリケーションの作成</a></li>
+</ul>
+</li>
<li><a href="#_スクリーンキャスト">スクリーンキャスト</a></li>
<li><a href="#_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</a></li>
-<li><a href="#_その他のリソース">その他のリソース</a></li>
+<li><a href="#_その他のリソース">その他のリソース</a>
+<ul class="sectlevel2">
+<li><a href="#_オンライン_マガジンの記事">オンライン・マガジンの記事</a></li>
+<li><a href="#_ide_データベース_およびバージョン管理">IDE、データベース、およびバージョン管理</a></li>
+<li><a href="#_ブログ">ブログ</a></li>
+</ul>
+</li>
</ul>
</div>
<div id="preamble">
@@ -109,14 +124,11 @@
<div class="paragraph">
<p>次に示すのは、NetBeans IDEを使用してPHPアプリケーションやHTML5アプリケーションを開発するためのリソースです。NetBeans IDEによるこれらのテクノロジのサポートは急速に進化しています。最新情報については、<a href="http://blogs.oracle.com/netbeansphp/">NetBeans for PHPブログ</a>と<a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans WebClientブログ</a>を参照してください。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-</div>
-<h1 id="_開始" class="sect0">開始</h1>
+<div class="sect1">
+<h2 id="_開始">開始</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -132,15 +144,17 @@
<p><a href="../../kb/docs/php/ajax-quickstart.html">PHPアプリケーションでのAjax入門</a></p>
</li>
<li>
-<p><a href="../docs/webclient/cordova-gettingstarted.html">Cordovaアプリケーションの作成の開始</a>
-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[]</p>
+<p><a href="../docs/webclient/cordova-gettingstarted.html">Cordovaアプリケーションの作成の開始</a></p>
</li>
</ul>
</div>
-<h1 id="_チュートリアルおよび記事" class="sect0">チュートリアルおよび記事</h1>
-<div class="paragraph">
-<p><strong>HTML5およびJavaScriptのプロジェクト開発</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_チュートリアルおよび記事">チュートリアルおよび記事</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_html5およびjavascriptのプロジェクト開発">HTML5およびJavaScriptのプロジェクト開発</h3>
<div class="ulist">
<ul>
<li>
@@ -163,9 +177,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>PHP開発のための環境の構成</strong></p>
</div>
+<div class="sect2">
+<h3 id="_php開発のための環境の構成">PHP開発のための環境の構成</h3>
<div class="ulist">
<ul>
<li>
@@ -185,9 +199,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>テストとデバッグ</strong></p>
</div>
+<div class="sect2">
+<h3 id="_テストとデバッグ">テストとデバッグ</h3>
<div class="ulist">
<ul>
<li>
@@ -201,9 +215,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>フレームワーク</strong></p>
</div>
+<div class="sect2">
+<h3 id="_フレームワーク">フレームワーク</h3>
<div class="ulist">
<ul>
<li>
@@ -226,9 +240,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>全般的なPHPチュートリアル</strong></p>
</div>
+<div class="sect2">
+<h3 id="_全般的なphpチュートリアル">全般的なPHPチュートリアル</h3>
<div class="ulist">
<ul>
<li>
@@ -239,18 +253,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>PHPを使用するデータベース駆動型アプリケーションの作成</strong></p>
</div>
+<div class="sect2">
+<h3 id="_phpを使用するデータベース駆動型アプリケーションの作成">PHPを使用するデータベース駆動型アプリケーションの作成</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/php/wish-list-tutorial-main-page.html">メイン・ページ: PHPを使用するデータベース駆動型アプリケーションの作成</a>
-*
-パート1: データベースの作成</p>
+<p><a href="../docs/php/wish-list-tutorial-main-page.html">メイン・ページ: PHPを使用するデータベース駆動型アプリケーションの作成</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson1.html">1a: MySQLデータベースの作成</a></p>
+<p>パート1: データベースの作成 <a href="../docs/php/wish-list-lesson1.html">1a: MySQLデータベースの作成</a></p>
</li>
<li>
<p><a href="../docs/php/wish-list-oracle-lesson1.html">1b: Oracleデータベース表の作成</a></p>
@@ -277,12 +289,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/php/wish-list-lesson8.html">パート8: CSSを使用したアプリケーションの外観の改良</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson9.html">パート9: リモートWebサーバーへのアプリケーションのデプロイ</a>
-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[]</p>
+<p><a href="../docs/php/wish-list-lesson9.html">パート9: リモートWebサーバーへのアプリケーションのデプロイ</a></p>
</li>
</ul>
</div>
-<h1 id="_スクリーンキャスト" class="sect0">スクリーンキャスト</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_スクリーンキャスト">スクリーンキャスト</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -341,17 +357,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="/community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_コミュニティの寄稿ドキュメント" class="sect0">コミュニティの寄稿ドキュメント</h1>
+<div class="sect1">
+<h2 id="_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -365,19 +375,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="../../images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-<h1 id="_その他のリソース" class="sect0">その他のリソース</h1>
+<div class="sect1">
+<h2 id="_その他のリソース">その他のリソース</h2>
+<div class="sectionbody">
<div class="paragraph">
-<p><strong>_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド</strong></p>
+<p>===_NetBeans IDEによるアプリケーションの開発_ユーザーズ・ガイド</p>
</div>
<div class="ulist">
<ul>
@@ -389,9 +393,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>オンライン・マガジンの記事</strong></p>
-</div>
+<div class="sect2">
+<h3 id="_オンライン_マガジンの記事">オンライン・マガジンの記事</h3>
<div class="ulist">
<ul>
<li>
@@ -405,9 +408,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>IDE、データベース、およびバージョン管理</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ide_データベース_およびバージョン管理">IDE、データベース、およびバージョン管理</h3>
<div class="ulist">
<ul>
<li>
@@ -430,20 +433,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>ブログ</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ブログ">ブログ</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">PHP向けのNetBeansブログ</a></p>
</li>
<li>
-<p><a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Webクライアント・ブログ</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Webクライアント・ブログ</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/php_pt_BR.html b/content/kb/docs/php_pt_BR.html
index 1398b98..4ae86ec 100644
--- a/content/kb/docs/php_pt_BR.html
+++ b/content/kb/docs/php_pt_BR.html
@@ -96,12 +96,28 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel0">
+<ul class="sectlevel1">
<li><a href="#_conceitos_básicos">Conceitos Básicos</a></li>
-<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a></li>
+<li><a href="#_tutoriais_e_artigos">Tutoriais e Artigos</a>
+<ul class="sectlevel2">
+<li><a href="#_desenvolvimento_de_projeto_em_html5_e_javascript">Desenvolvimento de Projeto em HTML5 e JavaScript</a></li>
+<li><a href="#_configurando_o_ambiente_para_o_desenvolvimento_em_php">Configurando o Ambiente para o Desenvolvimento em PHP</a></li>
+<li><a href="#_testando_e_depurando">Testando e Depurando</a></li>
+<li><a href="#_frameworks">Frameworks</a></li>
+<li><a href="#_tutoriais_gerais_de_php">Tutoriais Gerais de PHP</a></li>
+<li><a href="#_criando_uma_aplicação_direcionada_a_banco_de_dados_com_php">Criando uma Aplicação Direcionada a Banco de Dados com PHP</a></li>
+</ul>
+</li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</a></li>
-<li><a href="#_outros_recursos">Outros Recursos</a></li>
+<li><a href="#_outros_recursos">Outros Recursos</a>
+<ul class="sectlevel2">
+<li><a href="#_em_desenvolvendo_aplicações_com_o_netbeans_ide_em_guia_do_usuário"><em>Desenvolvendo Aplicações com o NetBeans IDE</em> Guia do Usuário</a></li>
+<li><a href="#_artigos_de_revistas_on_line">Artigos de Revistas On-Line</a></li>
+<li><a href="#_o_ide_bancos_de_dados_e_controle_de_versão">O IDE, Bancos de Dados e Controle de Versão</a></li>
+<li><a href="#_weblogs">Weblogs</a></li>
+</ul>
+</li>
</ul>
</div>
<div id="preamble">
@@ -109,14 +125,11 @@
<div class="paragraph">
<p>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 <a href="http://blogs.oracle.com/netbeansphp/">blog NetBeans para PHP</a> e o <a href="https://blogs.oracle.com/netbeanswebclient/">blog do NetBeans WebClient</a> para obter as informações mais recentes.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-</div>
-<h1 id="_conceitos_básicos" class="sect0">Conceitos Básicos</h1>
+<div class="sect1">
+<h2 id="_conceitos_básicos">Conceitos Básicos</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -137,10 +150,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<h1 id="_tutoriais_e_artigos" class="sect0">Tutoriais e Artigos</h1>
-<div class="paragraph">
-<p><strong>Desenvolvimento de Projeto em HTML5 e JavaScript</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_tutoriais_e_artigos">Tutoriais e Artigos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_desenvolvimento_de_projeto_em_html5_e_javascript">Desenvolvimento de Projeto em HTML5 e JavaScript</h3>
<div class="ulist">
<ul>
<li>
@@ -163,9 +179,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Configurando o Ambiente para o Desenvolvimento em PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_configurando_o_ambiente_para_o_desenvolvimento_em_php">Configurando o Ambiente para o Desenvolvimento em PHP</h3>
<div class="ulist">
<ul>
<li>
@@ -185,9 +201,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Testando e Depurando</strong></p>
</div>
+<div class="sect2">
+<h3 id="_testando_e_depurando">Testando e Depurando</h3>
<div class="ulist">
<ul>
<li>
@@ -201,9 +217,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Frameworks</strong></p>
</div>
+<div class="sect2">
+<h3 id="_frameworks">Frameworks</h3>
<div class="ulist">
<ul>
<li>
@@ -226,9 +242,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Tutoriais Gerais de PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_tutoriais_gerais_de_php">Tutoriais Gerais de PHP</h3>
<div class="ulist">
<ul>
<li>
@@ -239,18 +255,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Criando uma Aplicação Direcionada a Banco de Dados com PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_criando_uma_aplicação_direcionada_a_banco_de_dados_com_php">Criando uma Aplicação Direcionada a Banco de Dados com PHP</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/php/wish-list-tutorial-main-page.html">Página Principal: Criando uma Aplicação Direcionada a Banco de Dados com PHP</a>
-*
-Parte 1: Criando o Banco de Dados</p>
+<p><a href="../docs/php/wish-list-tutorial-main-page.html">Página Principal: Criando uma Aplicação Direcionada a Banco de Dados com PHP</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson1.html">1a: Criando um Banco de Dados MySQL</a></p>
+<p>Parte 1: Criando o Banco de Dados <a href="../docs/php/wish-list-lesson1.html">1a: Criando um Banco de Dados MySQL</a></p>
</li>
<li>
<p><a href="../docs/php/wish-list-oracle-lesson1.html">1b: Criando Tabelas de Banco de Dados Oracle</a></p>
@@ -277,12 +291,16 @@ Parte 1: Criando o Banco de Dados</p>
<p><a href="../docs/php/wish-list-lesson8.html">Parte 8: Melhorando a Aparência da Aplicação com CSS</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson9.html">Parte 9: Implantando a Aplicação em um Servidor Web Remoto</a>
-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[]</p>
+<p><a href="../docs/php/wish-list-lesson9.html">Parte 9: Implantando a Aplicação em um Servidor Web Remoto</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -341,17 +359,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="/community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_documentos_de_contribuição_da_comunidade" class="sect0">Documentos de Contribuição da Comunidade</h1>
+<div class="sect1">
+<h2 id="_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -365,20 +377,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
-</div>
-<h1 id="_outros_recursos" class="sect0">Outros Recursos</h1>
-<div class="paragraph">
-<p><strong><em>Desenvolvendo Aplicações com o NetBeans IDE</em> Guia do Usuário</strong></p>
</div>
+<div class="sect1">
+<h2 id="_outros_recursos">Outros Recursos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_em_desenvolvendo_aplicações_com_o_netbeans_ide_em_guia_do_usuário"><em>Desenvolvendo Aplicações com o NetBeans IDE</em> Guia do Usuário</h3>
<div class="ulist">
<ul>
<li>
@@ -389,9 +394,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Artigos de Revistas On-Line</strong></p>
</div>
+<div class="sect2">
+<h3 id="_artigos_de_revistas_on_line">Artigos de Revistas On-Line</h3>
<div class="ulist">
<ul>
<li>
@@ -405,9 +410,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>O IDE, Bancos de Dados e Controle de Versão</strong></p>
</div>
+<div class="sect2">
+<h3 id="_o_ide_bancos_de_dados_e_controle_de_versão">O IDE, Bancos de Dados e Controle de Versão</h3>
<div class="ulist">
<ul>
<li>
@@ -430,20 +435,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Weblogs</strong></p>
</div>
+<div class="sect2">
+<h3 id="_weblogs">Weblogs</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">Blog sobre NetBeans para PHP</a></p>
</li>
<li>
-<p>Blog <a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Web Client (Cliente Web do NetBeans)</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p>Blog <a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Web Client (Cliente Web do NetBeans)</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/php_ru.html b/content/kb/docs/php_ru.html
index 1930126..2ca1fe1 100644
--- a/content/kb/docs/php_ru.html
+++ b/content/kb/docs/php_ru.html
@@ -96,12 +96,28 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel0">
+<ul class="sectlevel1">
<li><a href="#_Начало_работы">Начало работы</a></li>
-<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a></li>
+<li><a href="#_Учебные_курсы_и_статьи">Учебные курсы и статьи</a>
+<ul class="sectlevel2">
+<li><a href="#_Разработка_проектов_на_html5_и_javascript">Разработка проектов на HTML5 и JavaScript</a></li>
+<li><a href="#_Настройка_среды_для_разработки_на_языке_php">Настройка среды для разработки на языке PHP</a></li>
+<li><a href="#_Тестирование_и_отладка">Тестирование и отладка</a></li>
+<li><a href="#_Платформы">Платформы</a></li>
+<li><a href="#_Учебные_курсы_по_работе_с_php">Учебные курсы по работе с PHP</a></li>
+<li><a href="#_Создание_приложения_на_основе_базы_данных_с_помощью_языка_php">Создание приложения на основе базы данных с помощью языка PHP</a></li>
+</ul>
+</li>
<li><a href="#_Экранные_демонстрации">Экранные демонстрации</a></li>
<li><a href="#_Документы_от_сообщества">Документы от сообщества</a></li>
-<li><a href="#_Другие_источники">Другие источники</a></li>
+<li><a href="#_Другие_источники">Другие источники</a>
+<ul class="sectlevel2">
+<li><a href="#_em_Разработка_приложений_в_ide_netbeans_em_Руководство_пользователя"><em>Разработка приложений в IDE NetBeans</em> - Руководство пользователя</a></li>
+<li><a href="#_Статьи_сетевого_журнала">Статьи сетевого журнала</a></li>
+<li><a href="#_Среда_ide_базы_данных_и_управление_версиями">Среда IDE, базы данных и управление версиями</a></li>
+<li><a href="#_Блоги">Блоги</a></li>
+</ul>
+</li>
</ul>
</div>
<div id="preamble">
@@ -109,14 +125,11 @@
<div class="paragraph">
<p>Ниже перечислены ресурсы, используемые IDE NetBeans для разработки приложений PHP и приложений HTML5. Поддержка IDE NetBeans для этих технологий постоянно расширяется. Ознакомьтесь с блогом <a href="http://blogs.oracle.com/netbeansphp/">NetBeans для PHP</a> и блогом <a href="https://blogs.oracle.com/netbeanswebclient/">Веб-клиент NetBeans</a>для получения последних сведений.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-</div>
-<h1 id="_Начало_работы" class="sect0">Начало работы</h1>
+<div class="sect1">
+<h2 id="_Начало_работы">Начало работы</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -132,15 +145,17 @@
<p><a href="../../kb/docs/php/ajax-quickstart.html">+Введение в Ajax в приложениях PHP +</a></p>
</li>
<li>
-<p><a href="../docs/webclient/cordova-gettingstarted.html">Общие сведения о создании приложений Cordova</a>
-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[]</p>
+<p><a href="../docs/webclient/cordova-gettingstarted.html">Общие сведения о создании приложений Cordova</a></p>
</li>
</ul>
</div>
-<h1 id="_Учебные_курсы_и_статьи" class="sect0">Учебные курсы и статьи</h1>
-<div class="paragraph">
-<p><strong>Разработка проектов на HTML5 и JavaScript</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_Учебные_курсы_и_статьи">Учебные курсы и статьи</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_Разработка_проектов_на_html5_и_javascript">Разработка проектов на HTML5 и JavaScript</h3>
<div class="ulist">
<ul>
<li>
@@ -163,9 +178,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Настройка среды для разработки на языке PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Настройка_среды_для_разработки_на_языке_php">Настройка среды для разработки на языке PHP</h3>
<div class="ulist">
<ul>
<li>
@@ -185,9 +200,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Тестирование и отладка</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Тестирование_и_отладка">Тестирование и отладка</h3>
<div class="ulist">
<ul>
<li>
@@ -201,9 +216,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Платформы</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Платформы">Платформы</h3>
<div class="ulist">
<ul>
<li>
@@ -226,9 +241,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Учебные курсы по работе с PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Учебные_курсы_по_работе_с_php">Учебные курсы по работе с PHP</h3>
<div class="ulist">
<ul>
<li>
@@ -239,15 +254,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Создание приложения на основе базы данных с помощью языка PHP</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Создание_приложения_на_основе_базы_данных_с_помощью_языка_php">Создание приложения на основе базы данных с помощью языка PHP</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/php/wish-list-tutorial-main-page.html">Главная страница: создание приложения на основе базы данных с помощью языка PHP</a>
-*
-Часть 1. Создание базы данных</p>
+<p><a href="../docs/php/wish-list-tutorial-main-page.html">Главная страница: создание приложения на основе базы данных с помощью языка PHP</a></p>
</li>
<li>
<p><a href="../docs/php/wish-list-lesson1.html">1а: создание базы данных MySQL</a></p>
@@ -277,12 +290,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/php/wish-list-lesson8.html">Часть 8. Усовершенствование внешнего облика приложения с использованием CSS</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson9.html">Часть 9. Развертывание приложения на удаленном веб-сервере</a>
-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[]</p>
+<p><a href="../docs/php/wish-list-lesson9.html">Часть 9. Развертывание приложения на удаленном веб-сервере</a></p>
</li>
</ul>
</div>
-<h1 id="_Экранные_демонстрации" class="sect0">Экранные демонстрации</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_Экранные_демонстрации">Экранные демонстрации</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -341,17 +358,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="/community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_Документы_от_сообщества" class="sect0">Документы от сообщества</h1>
+<div class="sect1">
+<h2 id="_Документы_от_сообщества">Документы от сообщества</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -365,20 +376,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
-<h1 id="_Другие_источники" class="sect0">Другие источники</h1>
-<div class="paragraph">
-<p><strong><em>Разработка приложений в IDE NetBeans</em> - Руководство пользователя</strong></p>
</div>
+<div class="sect1">
+<h2 id="_Другие_источники">Другие источники</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_em_Разработка_приложений_в_ide_netbeans_em_Руководство_пользователя"><em>Разработка приложений в IDE NetBeans</em> - Руководство пользователя</h3>
<div class="ulist">
<ul>
<li>
@@ -389,9 +393,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Статьи сетевого журнала</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Статьи_сетевого_журнала">Статьи сетевого журнала</h3>
<div class="ulist">
<ul>
<li>
@@ -405,9 +409,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Среда IDE, базы данных и управление версиями</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Среда_ide_базы_данных_и_управление_версиями">Среда IDE, базы данных и управление версиями</h3>
<div class="ulist">
<ul>
<li>
@@ -430,20 +434,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Блоги</strong></p>
</div>
+<div class="sect2">
+<h3 id="_Блоги">Блоги</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">Блог "NetBeans для PHP"</a></p>
</li>
<li>
-<p><a href="https://blogs.oracle.com/netbeanswebclient/">Блог NetBeans Web Client</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://blogs.oracle.com/netbeanswebclient/">Блог NetBeans Web Client</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/php_zh_CN.html b/content/kb/docs/php_zh_CN.html
index 4ec47b1..b4c5c95 100644
--- a/content/kb/docs/php_zh_CN.html
+++ b/content/kb/docs/php_zh_CN.html
@@ -96,12 +96,27 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel0">
+<ul class="sectlevel1">
<li><a href="#_入门指南">入门指南</a></li>
-<li><a href="#_教程和文章">教程和文章</a></li>
+<li><a href="#_教程和文章">教程和文章</a>
+<ul class="sectlevel2">
+<li><a href="#_html5_和_javascript_项目开发">HTML5 和 JavaScript 项目开发</a></li>
+<li><a href="#_为进行_php_开发配置环境">为进行 PHP 开发配置环境</a></li>
+<li><a href="#_测试和调试">测试和调试</a></li>
+<li><a href="#_框架">框架</a></li>
+<li><a href="#_常规_php_教程">常规 PHP 教程</a></li>
+<li><a href="#_使用_php_创建数据库驱动的应用程序">使用 PHP 创建数据库驱动的应用程序</a></li>
+</ul>
+</li>
<li><a href="#_截屏视频">截屏视频</a></li>
<li><a href="#_社区提供的文档">社区提供的文档</a></li>
-<li><a href="#_其他资源">其他资源</a></li>
+<li><a href="#_其他资源">其他资源</a>
+<ul class="sectlevel2">
+<li><a href="#_在线期刊文章">在线期刊文章</a></li>
+<li><a href="#_ide_数据库和版本控制">IDE、数据库和版本控制</a></li>
+<li><a href="#_博客">博客</a></li>
+</ul>
+</li>
</ul>
</div>
<div id="preamble">
@@ -109,14 +124,11 @@
<div class="paragraph">
<p>下面是一些关于使用 NetBeans IDE 开发 PHP 应用程序和 HTML5 应用程序的资源。NetBeans IDE 对这些技术的支持正在快速发展。有关最新信息,请参阅 <a href="http://blogs.oracle.com/netbeansphp/">NetBeans for PHP 博客</a>和 <a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans WebClient 博客</a>。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-</div>
-</div>
-<h1 id="_入门指南" class="sect0">入门指南</h1>
+<div class="sect1">
+<h2 id="_入门指南">入门指南</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -132,15 +144,17 @@
<p><a href="../../kb/docs/php/ajax-quickstart.html">PHP 应用程序中的 Ajax 简介</a></p>
</li>
<li>
-<p><a href="../docs/webclient/cordova-gettingstarted.html">Cordova 应用程序创建入门指南</a>
-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[]</p>
+<p><a href="../docs/webclient/cordova-gettingstarted.html">Cordova 应用程序创建入门指南</a></p>
</li>
</ul>
</div>
-<h1 id="_教程和文章" class="sect0">教程和文章</h1>
-<div class="paragraph">
-<p><strong>HTML5 和 JavaScript 项目开发</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_教程和文章">教程和文章</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_html5_和_javascript_项目开发">HTML5 和 JavaScript 项目开发</h3>
<div class="ulist">
<ul>
<li>
@@ -163,9 +177,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>为进行 PHP 开发配置环境</strong></p>
</div>
+<div class="sect2">
+<h3 id="_为进行_php_开发配置环境">为进行 PHP 开发配置环境</h3>
<div class="ulist">
<ul>
<li>
@@ -185,9 +199,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>测试和调试</strong></p>
</div>
+<div class="sect2">
+<h3 id="_测试和调试">测试和调试</h3>
<div class="ulist">
<ul>
<li>
@@ -201,9 +215,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>框架</strong></p>
</div>
+<div class="sect2">
+<h3 id="_框架">框架</h3>
<div class="ulist">
<ul>
<li>
@@ -226,9 +240,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>常规 PHP 教程</strong></p>
</div>
+<div class="sect2">
+<h3 id="_常规_php_教程">常规 PHP 教程</h3>
<div class="ulist">
<ul>
<li>
@@ -239,18 +253,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>使用 PHP 创建数据库驱动的应用程序</strong></p>
</div>
+<div class="sect2">
+<h3 id="_使用_php_创建数据库驱动的应用程序">使用 PHP 创建数据库驱动的应用程序</h3>
<div class="ulist">
<ul>
<li>
-<p><a href="../docs/php/wish-list-tutorial-main-page.html">主页:使用 PHP 创建数据库驱动的应用程序</a>
-*
-第 1 部分:创建数据库</p>
+<p><a href="../docs/php/wish-list-tutorial-main-page.html">主页:使用 PHP 创建数据库驱动的应用程序</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson1.html">1a:创建 MySQL 数据库</a></p>
+<p>第 1 部分:创建数据库 <a href="../docs/php/wish-list-lesson1.html">1a:创建 MySQL 数据库</a></p>
</li>
<li>
<p><a href="../docs/php/wish-list-oracle-lesson1.html">1b:创建 Oracle 数据库表</a></p>
@@ -277,12 +289,16 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
<p><a href="../docs/php/wish-list-lesson8.html">第 8 部分:使用 CSS 改进应用程序的外观</a></p>
</li>
<li>
-<p><a href="../docs/php/wish-list-lesson9.html">第 9 部分:将应用程序部署到远程 Web 服务器</a>
-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[]</p>
+<p><a href="../docs/php/wish-list-lesson9.html">第 9 部分:将应用程序部署到远程 Web 服务器</a></p>
</li>
</ul>
</div>
-<h1 id="_截屏视频" class="sect0">截屏视频</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_截屏视频">截屏视频</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -341,17 +357,11 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="/community/media.html"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_社区提供的文档" class="sect0">社区提供的文档</h1>
+<div class="sect1">
+<h2 id="_社区提供的文档">社区提供的文档</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -365,19 +375,13 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="images_www/v6/arrow-button.gif" alt="arrow button"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="../../images_www/v6/trails/trails-box-tr.png" alt="] image::../../images_www/v6/trails/trails-box-tl.png[">
</div>
</div>
-<h1 id="_其他资源" class="sect0">其他资源</h1>
+<div class="sect1">
+<h2 id="_其他资源">其他资源</h2>
+<div class="sectionbody">
<div class="paragraph">
-<p><strong>_使用 NetBeans IDE 开发应用程序_用户指南</strong></p>
+<p>===_使用 NetBeans IDE 开发应用程序_用户指南</p>
</div>
<div class="ulist">
<ul>
@@ -389,9 +393,8 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>在线期刊文章</strong></p>
-</div>
+<div class="sect2">
+<h3 id="_在线期刊文章">在线期刊文章</h3>
<div class="ulist">
<ul>
<li>
@@ -405,9 +408,9 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>IDE、数据库和版本控制</strong></p>
</div>
+<div class="sect2">
+<h3 id="_ide_数据库和版本控制">IDE、数据库和版本控制</h3>
<div class="ulist">
<ul>
<li>
@@ -430,20 +433,22 @@ image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>博客</strong></p>
</div>
+<div class="sect2">
+<h3 id="_博客">博客</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://blogs.oracle.com/netbeansphp/entry/configuring_a_netbeans_php_project#comments">"NetBeans for PHP" 博客</a></p>
</li>
<li>
-<p><a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Web 客户端博客</a>
-image::../../images_www/v6/trails/trails-box-br.png[] image::../../images_www/v6/trails/trails-box-bl.png[]</p>
+<p><a href="https://blogs.oracle.com/netbeanswebclient/">NetBeans Web 客户端博客</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/platform.html b/content/kb/docs/platform.html
index 3e1a547..e0f2f3c 100644
--- a/content/kb/docs/platform.html
+++ b/content/kb/docs/platform.html
@@ -96,23 +96,51 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_what_is_the_netbeans_platform">What is the NetBeans Platform?</a></li>
<li><a href="#_getting_started">Getting Started</a></li>
<li><a href="#_porting">Porting</a></li>
-<li><a href="#_using_the_netbeans_apis">Using the NetBeans APIs</a></li>
+<li><a href="#_using_the_netbeans_apis">Using the NetBeans APIs</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeans_platform_fundamentals">NetBeans Platform Fundamentals</a></li>
+<li><a href="#_netbeans_platform_for_beginners">NetBeans Platform for Beginners</a></li>
+<li><a href="#_essential_netbeans_platform_reference_card">Essential NetBeans Platform Reference Card</a></li>
+<li><a href="#_applications_built_on_the_netbeans_platform">Applications Built on the NetBeans Platform</a></li>
+<li><a href="#_netbeans_apis_for_developing_code_editors">NetBeans APIs for Developing Code Editors</a></li>
+<li><a href="#_netbeans_apis_for_visualizing_data">NetBeans APIs for Visualizing Data</a></li>
+<li><a href="#_miscellaneous_netbeans_platform_tutorials">Miscellaneous NetBeans Platform Tutorials</a></li>
+<li><a href="#_command_line">Command Line</a></li>
+</ul>
+</li>
<li><a href="#_youtube_five_simple_ways_to_extend_netbeans_ide">YouTube: Five Simple Ways to Extend NetBeans IDE</a></li>
-<li><a href="#_using_maven_with_the_netbeans_platform">Using Maven with the NetBeans Platform</a></li>
+<li><a href="#_using_maven_with_the_netbeans_platform">Using Maven with the NetBeans Platform</a>
+<ul class="sectlevel2">
+<li><a href="#_general_introductions">General Introductions</a></li>
+<li><a href="#_netbeans_platform_tutorials">NetBeans Platform Tutorials</a></li>
+<li><a href="#_miscellaneous">Miscellaneous</a></li>
<li><a href="#_diagnostics">Diagnostics</a></li>
+</ul>
+</li>
<li><a href="#_using_osgi_with_the_netbeans_platform">Using OSGi with the NetBeans Platform</a></li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_community_contributed_docs">Community-Contributed Docs</a></li>
-<li><a href="#_reference_material">Reference Material</a></li>
-<li><a href="#_other_resources">Other Resources</a></li>
+<li><a href="#_reference_material">Reference Material</a>
+<ul class="sectlevel2">
+<li><a href="#_official_netbeans_platform_reference_material">Official NetBeans Platform Reference Material</a></li>
+</ul>
+</li>
+<li><a href="#_other_resources">Other Resources</a>
+<ul class="sectlevel2">
+<li><a href="#_online_magazine_articles">Online Magazine Articles</a></li>
+<li><a href="#_netbeans_platform_blogs">NetBeans Platform Blogs</a></li>
+<li><a href="#_netbeans_platform_books">NetBeans Platform Books</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_what_is_the_netbeans_platform">What is the NetBeans Platform?</h4>
+<div class="sect1">
+<h2 id="_what_is_the_netbeans_platform">What is the NetBeans Platform?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>The NetBeans Platform is a broad Java framework on which you can base large desktop applications. NetBeans IDE itself is <a href="http://platform.netbeans.org/screenshots.html">one of the hundreds of applications</a> 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.</p>
</div>
@@ -122,13 +150,11 @@
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-tr.png" alt="] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_getting_started" class="sect0">Getting Started</h1>
+<div class="sect1">
+<h2 id="_getting_started">Getting Started</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -150,37 +176,38 @@
<p><a href="https://platform.netbeans.org/tutorials/nbm-dukescript.html">NetBeans Platform Plugins with DukeScript</a></p>
</li>
<li>
-<p>What’s New in NetBeans Platform <a href="http://platform.netbeans.org/whatsnew/65.html">6.5</a>, <a href="http://platform.netbeans.org/whatsnew/67.html">6.7</a>, <a href="http://platform.netbeans.org/whatsnew/68.html">6.8</a>, <a href="http://platform.netbeans.org/whatsnew/69.html">6.9</a>, <a href="http://platform.netbeans.org/whatsnew/70.html">7.0</a>, <a href="http://platform.netbeans.org/whatsnew/71.html">7.1</a>, <a href="http://platform.netbeans.org/whatsnew/72.html">7.2</ [...]
-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[]</p>
+<p>What’s New in NetBeans Platform <a href="http://platform.netbeans.org/whatsnew/65.html">6.5</a>, <a href="http://platform.netbeans.org/whatsnew/67.html">6.7</a>, <a href="http://platform.netbeans.org/whatsnew/68.html">6.8</a>, <a href="http://platform.netbeans.org/whatsnew/69.html">6.9</a>, <a href="http://platform.netbeans.org/whatsnew/70.html">7.0</a>, <a href="http://platform.netbeans.org/whatsnew/71.html">7.1</a>, <a href="http://platform.netbeans.org/whatsnew/72.html">7.2</ [...]
</li>
</ul>
</div>
-<h1 id="_porting" class="sect0">Porting</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_porting">Porting</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-porting-basic.html">Porting Swing Components</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-javafx.html">Porting JavaFX Components</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-javafx.html">Porting JavaFX Components</a></p>
</li>
</ul>
</div>
-<h1 id="_using_the_netbeans_apis" class="sect0">Using the NetBeans APIs</h1>
-<div class="paragraph">
-<p><strong>NetBeans Platform Fundamentals</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_using_the_netbeans_apis">Using the NetBeans APIs</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeans_platform_fundamentals">NetBeans Platform Fundamentals</h3>
<div class="paragraph">
<p>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!</p>
</div>
-<div class="ulist">
-<ul>
-<li>
-<p>NetBeans Platform for Beginners</p>
-</li>
-</ul>
</div>
+<div class="sect2">
+<h3 id="_netbeans_platform_for_beginners">NetBeans Platform for Beginners</h3>
<div class="imageblock left">
<div class="content">
<a class="image" href="https://leanpub.com/nbp4beginners"><img src="../../images_www/screenshots/platform/nbp4beginners.jpg" alt="nbp4beginners"></a>
@@ -197,30 +224,33 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://wiki.netbeans.org/NbmIdioms">NetBeans APIs in a Nutshell</a></p>
</li>
-<li>
-<p>Essential NetBeans Platform Reference Card</p>
-</li>
</ul>
</div>
+</div>
+<div class="sect2">
+<h3 id="_essential_netbeans_platform_reference_card">Essential NetBeans Platform Reference Card</h3>
<div class="imageblock left">
<div class="content">
<a class="image" href="http://refcardz.dzone.com/refcardz/netbeans-platform-70"><img src="../../images_www/screenshots/platform/refcard70.png" alt="refcard70"></a>
</div>
</div>
+<div class="sect3">
+<h4 id="_quick_overviews">Quick Overviews</h4>
<div class="ulist">
<ul>
<li>
-<p>Quick Overviews</p>
-</li>
-<li>
<p><a href="http://netbeans.dzone.com/articles/netbeans-lookups-explained">NetBeans Lookups Explained!</a></p>
</li>
<li>
<p><a href="http://netbeans.dzone.com/news/netbeans-extension-points">How Do NetBeans Extension Points Work?</a></p>
</li>
-<li>
-<p>Selection Management Series</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_selection_management_series">Selection Management Series</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-selection-1.html">Part 1: Selection Management Tutorial</a></p>
</li>
@@ -235,15 +265,15 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Applications Built on the NetBeans Platform</strong></p>
</div>
+</div>
+<div class="sect2">
+<h3 id="_applications_built_on_the_netbeans_platform">Applications Built on the NetBeans Platform</h3>
+<div class="sect3">
+<h4 id="_applications">Applications</h4>
<div class="ulist">
<ul>
<li>
-<p>Applications</p>
-</li>
-<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-paintapp.html">Paint Application Tutorial</a></p>
</li>
<li>
@@ -255,9 +285,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-povray-1.html">POV-Ray Renderer Tutorial</a></p>
</li>
-<li>
-<p>Common Scenarios</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_common_scenarios">Common Scenarios</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-crud.html">Create/Read/Update/Delete (CRUD)</a></p>
</li>
@@ -272,9 +306,10 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>NetBeans APIs for Developing Code Editors</strong></p>
</div>
+</div>
+<div class="sect2">
+<h3 id="_netbeans_apis_for_developing_code_editors">NetBeans APIs for Developing Code Editors</h3>
<div class="ulist">
<ul>
<li>
@@ -318,9 +353,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>NetBeans APIs for Visualizing Data</strong></p>
</div>
+<div class="sect2">
+<h3 id="_netbeans_apis_for_visualizing_data">NetBeans APIs for Visualizing Data</h3>
<div class="ulist">
<ul>
<li>
@@ -346,9 +381,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Miscellaneous NetBeans Platform Tutorials</strong></p>
</div>
+<div class="sect2">
+<h3 id="_miscellaneous_netbeans_platform_tutorials">Miscellaneous NetBeans Platform Tutorials</h3>
<div class="paragraph">
<p><em>(alphabetically ordered)</em></p>
</div>
@@ -389,41 +424,52 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Command Line</strong></p>
</div>
+<div class="sect2">
+<h3 id="_command_line">Command Line</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-ant.html">Ant</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">Maven</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">Maven</a></p>
</li>
</ul>
</div>
-<h1 id="_youtube_five_simple_ways_to_extend_netbeans_ide" class="sect0">YouTube: Five Simple Ways to Extend NetBeans IDE</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_youtube_five_simple_ways_to_extend_netbeans_ide">YouTube: Five Simple Ways to Extend NetBeans IDE</h2>
+<div class="sectionbody">
<div class="imageblock left">
<div class="content">
-<a class="image" href="http://www.youtube.com/watch?v=h4k5JpluJM8"><img src="../../images_www/screenshots/platform/five-easy-extend.png" alt="five easy extend" height="]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["></a>
+<a class="image" href="http://www.youtube.com/watch?v=h4k5JpluJM8"><img src="../../images_www/screenshots/platform/five-easy-extend.png" alt="five easy extend"></a>
+</div>
+</div>
</div>
</div>
-<h1 id="_using_maven_with_the_netbeans_platform" class="sect0">Using Maven with the NetBeans Platform</h1>
+<div class="sect1">
+<h2 id="_using_maven_with_the_netbeans_platform">Using Maven with the NetBeans Platform</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_general_introductions">General Introductions</h3>
<div class="ulist">
<ul>
<li>
-<p>General Introductions</p>
-</li>
-<li>
<p><a href="http://wiki.netbeans.org/MavenBestPractices">Maven Best Practices in NetBeans IDE</a></p>
</li>
<li>
<p><a href="http://mojo.codehaus.org/nbm-maven-plugin/">About the NetBeans Module Maven Plugin</a></p>
</li>
-<li>
-<p>NetBeans Platform Tutorials</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_netbeans_platform_tutorials">NetBeans Platform Tutorials</h3>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">NetBeans Platform Maven Command Line Tutorial</a></p>
</li>
@@ -439,9 +485,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-crud.html">NetBeans Platform CRUD Tutorial Using Maven</a></p>
</li>
-<li>
-<p>Miscellaneous</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_miscellaneous">Miscellaneous</h3>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container">Mavenized NetBeans Platform Runtime Container</a></p>
</li>
@@ -452,36 +502,44 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://netbeans.dzone.com/nb-how-create-javahelp-mavenized">Creating JavaHelp with Maven and the NetBeans Platform</a></p>
</li>
<li>
-<p><a href="http://netbeans.dzone.com/videos/screencast-maven-and-netbeans">Screencast: Maven and the NetBeans Platform</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[]</p>
+<p><a href="http://netbeans.dzone.com/videos/screencast-maven-and-netbeans">Screencast: Maven and the NetBeans Platform</a></p>
</li>
</ul>
</div>
-<h1 id="_diagnostics" class="sect0">Diagnostics</h1>
+</div>
+<div class="sect2">
+<h3 id="_diagnostics">Diagnostics</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-test.html">NetBeans Platform Test Infrastructure Tutorial</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-gesture.html">NetBeans Platform Gesture Collection Infrastructure Tutorial</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-gesture.html">NetBeans Platform Gesture Collection Infrastructure Tutorial</a></p>
</li>
</ul>
</div>
-<h1 id="_using_osgi_with_the_netbeans_platform" class="sect0">Using OSGi with the NetBeans Platform</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_using_osgi_with_the_netbeans_platform">Using OSGi with the NetBeans Platform</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html">NetBeans Platform Quick Start Using OSGi</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-emf.html">NetBeans Platform EMF Integration Tutorial</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-emf.html">NetBeans Platform EMF Integration Tutorial</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -492,17 +550,11 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="https://netbeans.org/kb/docs/screencasts.html"><img src=":https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_community_contributed_docs" class="sect0">Community-Contributed Docs</h1>
+<div class="sect1">
+<h2 id="_community_contributed_docs">Community-Contributed Docs</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -525,21 +577,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src=":https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_reference_material" class="sect0">Reference Material</h1>
-<div class="paragraph">
-<p>*Official NetBeans Platform Reference Material
-*</p>
</div>
+<div class="sect1">
+<h2 id="_reference_material">Reference Material</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_official_netbeans_platform_reference_material">Official NetBeans Platform Reference Material</h3>
<div class="ulist">
<ul>
<li>
@@ -579,16 +623,18 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://bits.netbeans.org/dev/javadoc/layers.html">Description of Layer Registrations in NetBeans APIs</a></p>
</li>
<li>
-<p><a href="http://bits.netbeans.org/dev/javadoc/apichanges.html">Latest NetBeans API Changes</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[]</p>
+<p><a href="http://bits.netbeans.org/dev/javadoc/apichanges.html">Latest NetBeans API Changes</a></p>
</li>
</ul>
</div>
-<h1 id="_other_resources" class="sect0">Other Resources</h1>
-<div class="paragraph">
-<p>*Online Magazine Articles
-*</p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_other_resources">Other Resources</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_online_magazine_articles">Online Magazine Articles</h3>
<div class="ulist">
<ul>
<li>
@@ -602,10 +648,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*NetBeans Platform Blogs
-*</p>
</div>
+<div class="sect2">
+<h3 id="_netbeans_platform_blogs">NetBeans Platform Blogs</h3>
<div class="ulist">
<ul>
<li>
@@ -613,10 +658,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*NetBeans Platform Books
-*</p>
</div>
+<div class="sect2">
+<h3 id="_netbeans_platform_books">NetBeans Platform Books</h3>
<div class="ulist">
<ul>
<li>
@@ -641,11 +685,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://www.apress.com/9781430224174">"The Definitive Guide to NetBeans Platform 6.5"</a></p>
</li>
<li>
-<p><a href="http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802">"Rich Client Programming: Plugging into the NetBeans Platform"</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[]</p>
+<p><a href="http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802">"Rich Client Programming: Plugging into the NetBeans Platform"</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/platform_ca.html b/content/kb/docs/platform_ca.html
index c27be01..d39e155 100644
--- a/content/kb/docs/platform_ca.html
+++ b/content/kb/docs/platform_ca.html
@@ -96,18 +96,30 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_què_és_la_plataforma_netbeans">Què és la plataforma NetBeans?</a></li>
<li><a href="#_com_començar">Com començar</a></li>
-<li><a href="#_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</a></li>
-<li><a href="#_screencasts">Screencasts</a></li>
+<li><a href="#_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</a>
+<ul class="sectlevel2">
+<li><a href="#_aplicacions_construïdes_en_la_plataforma_netbeans">Aplicacions construïdes en la plataforma NetBeans</a></li>
+<li><a href="#_trets_fonamentals_de_la_plataforma_netbeans">Trets Fonamentals de la plataforma NetBeans</a></li>
+</ul>
+</li>
<li><a href="#_aplicacions_d_exemple">Aplicacions d’exemple</a></li>
<li><a href="#_documents_aportats_per_la_comunitat">Documents aportats per la comunitat</a></li>
-<li><a href="#_altres_recursos">Altres recursos</a></li>
+<li><a href="#_altres_recursos">Altres recursos</a>
+<ul class="sectlevel2">
+<li><a href="#_recursos_oficials_de_la_plataforma_netbeans">Recursos oficials de la plataforma NetBeans</a></li>
+<li><a href="#_articles_de_revistes_en_línia">Articles de revistes en línia</a></li>
+<li><a href="#_blogs_de_la_plataforma_netbeans">Blogs de la plataforma NetBeans</a></li>
+<li><a href="#_llibres_de_la_pataforma_netbeans">Llibres de la pataforma NetBeans</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_què_és_la_plataforma_netbeans">Què és la plataforma NetBeans?</h4>
+<div class="sect1">
+<h2 id="_què_és_la_plataforma_netbeans">Què és la plataforma NetBeans?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>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.</p>
</div>
@@ -117,13 +129,11 @@
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-tr.png" alt="] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_com_començar" class="sect0">Com començar</h1>
+<div class="sect1">
+<h2 id="_com_començar">Com començar</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -133,15 +143,17 @@
<p><a href="http://platform.netbeans.org/tutorials/nbm-quick-start.html">Inici ràpid a la plataforma NetBeans</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-porting-basic.html">Guia d'aprenentatge de portabilitat de la plataforma NetBeans</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-porting-basic.html">Guia d'aprenentatge de portabilitat de la plataforma NetBeans</a></p>
</li>
</ul>
</div>
-<h1 id="_guies_d_aprenentatge_i_articles" class="sect0">Guies d’aprenentatge i Articles</h1>
-<div class="paragraph">
-<p><strong>Aplicacions construïdes en la plataforma NetBeans</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_guies_d_aprenentatge_i_articles">Guies d’aprenentatge i Articles</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_aplicacions_construïdes_en_la_plataforma_netbeans">Aplicacions construïdes en la plataforma NetBeans</h3>
<div class="ulist">
<ul>
<li>
@@ -158,9 +170,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Trets Fonamentals de la plataforma NetBeans</strong></p>
</div>
+<div class="sect2">
+<h3 id="_trets_fonamentals_de_la_plataforma_netbeans">Trets Fonamentals de la plataforma NetBeans</h3>
<div class="ulist">
<ul>
<li>
@@ -172,9 +184,12 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-idioms.html">APIs de NetBeans en essència</a></p>
</li>
-<li>
-<p>Sèries introducció a resolució</p>
-</li>
+</ul>
+</div>
+<div class="sect3">
+<h4 id="_sèries_introducció_a_resolució">Sèries introducció a resolució</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://www.ssw.uni-linz.ac.at/Teaching/Lectures/SpezialLVA/TulachWielenga/part1.html">Exemple WordApp - 1a Part</a></p>
</li>
@@ -184,9 +199,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://www.ssw.uni-linz.ac.at/Teaching/Lectures/SpezialLVA/TulachWielenga/part3.html">Exemple WordApp - 3a Part</a></p>
</li>
-<li>
-<p>Sèries de gestió de selecció</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_sèries_de_gestió_de_selecció">Sèries de gestió de selecció</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-selection-1.html">1a Part: Guia d'aprenentatge gestió de selecció</a></p>
</li>
@@ -201,9 +220,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>APIS de NetBeans pel desenvolupament o expansió d’un editor</strong></p>
</div>
+<div class="sect3">
+<h4 id="_apis_de_netbeans_pel_desenvolupament_o_expansió_d_un_editor">APIS de NetBeans pel desenvolupament o expansió d’un editor</h4>
<div class="ulist">
<ul>
<li>
@@ -235,9 +254,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>APIs de NetBeans per a la visualització de dades</strong></p>
</div>
+<div class="sect3">
+<h4 id="_apis_de_netbeans_per_a_la_visualització_de_dades">APIs de NetBeans per a la visualització de dades</h4>
<div class="ulist">
<ul>
<li>
@@ -260,9 +279,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>APIs miscel·lànies de NetBeans</strong></p>
</div>
+<div class="sect3">
+<h4 id="_apis_miscel_lànies_de_netbeans">APIs miscel·lànies de NetBeans</h4>
<div class="ulist">
<ul>
<li>
@@ -281,12 +300,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://platform.netbeans.org/tutorials/nbm-projectsamples.html">Guia d'aprenentatge del mòdul mostra de projecte</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-filetemplates.html">Guia d'aprenentatge del mòdul plantilla de fitxer</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-filetemplates.html">Guia d'aprenentatge del mòdul plantilla de fitxer</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+<div class="sect3">
+<h4 id="_screencasts">Screencasts</h4>
<div class="ulist">
<ul>
<li>
@@ -324,17 +344,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="https://netbeans.org/kb/docs/screencasts.html"><img src=":https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_aplicacions_d_exemple" class="sect0">Aplicacions d’exemple</h1>
+<div class="sect1">
+<h2 id="_aplicacions_d_exemple">Aplicacions d’exemple</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -348,17 +364,11 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="https://netbeans.org/kb/samples/index.html"><img src=":https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_documents_aportats_per_la_comunitat" class="sect0">Documents aportats per la comunitat</h1>
+<div class="sect1">
+<h2 id="_documents_aportats_per_la_comunitat">Documents aportats per la comunitat</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -381,21 +391,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src=":https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
</div>
-<h1 id="_altres_recursos" class="sect0">Altres recursos</h1>
-<div class="paragraph">
-<p>*Recursos oficials de la plataforma NetBeans
-*</p>
-</div>
+<div class="sect1">
+<h2 id="_altres_recursos">Altres recursos</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_recursos_oficials_de_la_plataforma_netbeans">Recursos oficials de la plataforma NetBeans</h3>
<div class="ulist">
<ul>
<li>
@@ -436,10 +438,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Articles de revistes en línia
-*</p>
</div>
+<div class="sect2">
+<h3 id="_articles_de_revistes_en_línia">Articles de revistes en línia</h3>
<div class="ulist">
<ul>
<li>
@@ -453,28 +454,28 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Blogs de la plataforma NetBeans
-*</p>
</div>
+<div class="sect2">
+<h3 id="_blogs_de_la_plataforma_netbeans">Blogs de la plataforma NetBeans</h3>
<div class="paragraph">
<p><a href="http://blogs.oracle.com/geertjan">Geertjan Wielenga</a>,<a href="http://blogs.oracle.com/scblog">Sandip Chitale</a>,<a href="http://blogs.oracle.com/jglick">Jesse Glick</a>,<a href="http://weblogs.java.net/blog/timboudreau/">Tim Boudreau</a><a href="http://blogs.kiyut.com/tonny/">Tonny Kohar</a>,<a href="http://eppleton.com/blog/">Toni Epple</a></p>
</div>
-<div class="paragraph">
-<p>*Llibres de la pataforma NetBeans
-*</p>
</div>
+<div class="sect2">
+<h3 id="_llibres_de_la_pataforma_netbeans">Llibres de la pataforma NetBeans</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://apress.com/book/view/9781430224174">"La guia definitiva a la plataforma NetBeans"</a></p>
</li>
<li>
-<p><a href="http://www.sun.com/books/catalog/rich_client_programming.xml">"Programant un client ric: connectant-ho a la plataforma NetBeans"</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[]</p>
+<p><a href="http://www.sun.com/books/catalog/rich_client_programming.xml">"Programant un client ric: connectant-ho a la plataforma NetBeans"</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/platform_ja.html b/content/kb/docs/platform_ja.html
index 03bf50e..1fdd6d2 100644
--- a/content/kb/docs/platform_ja.html
+++ b/content/kb/docs/platform_ja.html
@@ -96,24 +96,49 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_netbeansプラットフォームとは">NetBeansプラットフォームとは</a></li>
<li><a href="#_開始">開始</a></li>
<li><a href="#_移植">移植</a></li>
-<li><a href="#_netbeans_apiの使用">NetBeans APIの使用</a></li>
+<li><a href="#_netbeans_apiの使用">NetBeans APIの使用</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeansプラットフォームの基礎">NetBeansプラットフォームの基礎</a></li>
+<li><a href="#_重要なnetbeansプラットフォーム_リファレンス_カード">重要なNetBeansプラットフォーム・リファレンス・カード</a></li>
+<li><a href="#_netbeansプラットフォーム上でビルドされたアプリケーション">NetBeansプラットフォーム上でビルドされたアプリケーション</a></li>
+<li><a href="#_コード_エディタを開発するためのnetbeans_api">コード・エディタを開発するためのNetBeans API</a></li>
+<li><a href="#_データの視覚化のためのnetbeans_api">データの視覚化のためのNetBeans API</a></li>
+<li><a href="#_netbeansプラットフォームのその他のチュートリアル">NetBeansプラットフォームのその他のチュートリアル</a></li>
+<li><a href="#_コマンドライン">コマンドライン</a></li>
+</ul>
+</li>
<li><a href="#_youtube_netbeans_ideを拡張する5つの簡単な方法">YouTube: NetBeans IDEを拡張する5つの簡単な方法</a></li>
-<li><a href="#_mavenとnetbeansプラットフォームの使用">MavenとNetBeansプラットフォームの使用</a></li>
+<li><a href="#_mavenとnetbeansプラットフォームの使用">MavenとNetBeansプラットフォームの使用</a>
+<ul class="sectlevel2">
+<li><a href="#_一般的な紹介">一般的な紹介</a></li>
+</ul>
+</li>
<li><a href="#_診断">診断</a></li>
<li><a href="#_osgiとnetbeansプラットフォームの使用">OSGiとNetBeansプラットフォームの使用</a></li>
<li><a href="#_スクリーンキャスト">スクリーンキャスト</a></li>
<li><a href="#_サンプル_アプリケーション">サンプル・アプリケーション</a></li>
<li><a href="#_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</a></li>
-<li><a href="#_参考資料">参考資料</a></li>
-<li><a href="#_その他のリソース">その他のリソース</a></li>
+<li><a href="#_参考資料">参考資料</a>
+<ul class="sectlevel2">
+<li><a href="#_netbeansプラットフォームの公式参考資料">NetBeansプラットフォームの公式参考資料</a></li>
+</ul>
+</li>
+<li><a href="#_その他のリソース">その他のリソース</a>
+<ul class="sectlevel2">
+<li><a href="#_オンライン_マガジンの記事">オンライン・マガジンの記事</a></li>
+<li><a href="#_netbeansプラットフォームに関するブログ">NetBeansプラットフォームに関するブログ</a></li>
+<li><a href="#_netbeansプラットフォームに関する書籍">NetBeansプラットフォームに関する書籍</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_netbeansプラットフォームとは">NetBeansプラットフォームとは</h4>
+<div class="sect1">
+<h2 id="_netbeansプラットフォームとは">NetBeansプラットフォームとは</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>NetBeansプラットフォームは、大規模なデスクトップ・アプリケーションの基礎にすることができる、広範なJavaフレームワークです。NetBeans IDE自体は、NetBeansプラットフォームに基づいた<a href="http://platform.netbeans.org/screenshots.html">数百のアプリケーションの1つ</a>です。NetBeansプラットフォームは、ウィンドウ、アクション、ファイル、およびアプリケーションに一般的なその他の多くの処理を容易にするAPIを含んでいます。</p>
</div>
@@ -123,13 +148,11 @@
<div class="paragraph">
<p>NetBeans IDE自体に新しいモジュールを作成することもできます。たとえば、好みの最先端技術をNetBeans IDEのユーザーが使用できるようにするモジュールを作成できます。または、追加のエディタ機能を提供するモジュールを作成することもできます。</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-tr.png" alt="] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_開始" class="sect0">開始</h1>
+<div class="sect1">
+<h2 id="_開始">開始</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -148,27 +171,32 @@
<p><a href="http://platform.netbeans.org/tutorials/nbm-quick-start.html">NetBeansプラットフォームのクイック・スタート</a></p>
</li>
<li>
-<p>NetBeansプラットフォーム<a href="http://platform.netbeans.org/whatsnew/65.html">6.5</a>、<a href="http://platform.netbeans.org/whatsnew/67.html">6.7</a>、<a href="http://platform.netbeans.org/whatsnew/68.html">6.8</a>、<a href="http://platform.netbeans.org/whatsnew/69.html">6.9</a>、<a href="http://platform.netbeans.org/whatsnew/70.html">7.0</a>、<a href="http://platform.netbeans.org/whatsnew/71.html">7.1</a>、<a href="http://platform.netbeans.org/whatsnew/72.html">7.2</a>、<a href="http://bits.netb [...]
-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[]</p>
+<p>NetBeansプラットフォーム<a href="http://platform.netbeans.org/whatsnew/65.html">6.5</a>、<a href="http://platform.netbeans.org/whatsnew/67.html">6.7</a>、<a href="http://platform.netbeans.org/whatsnew/68.html">6.8</a>、<a href="http://platform.netbeans.org/whatsnew/69.html">6.9</a>、<a href="http://platform.netbeans.org/whatsnew/70.html">7.0</a>、<a href="http://platform.netbeans.org/whatsnew/71.html">7.1</a>、<a href="http://platform.netbeans.org/whatsnew/72.html">7.2</a>、<a href="http://bits.netb [...]
</li>
</ul>
</div>
-<h1 id="_移植" class="sect0">移植</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_移植">移植</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-porting-basic.html">Swingコンポーネントの移植</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-javafx.html">JavaFXコンポーネントの移植</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-javafx.html">JavaFXコンポーネントの移植</a></p>
</li>
</ul>
</div>
-<h1 id="_netbeans_apiの使用" class="sect0">NetBeans APIの使用</h1>
-<div class="paragraph">
-<p><strong>NetBeansプラットフォームの基礎</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_netbeans_apiの使用">NetBeans APIの使用</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeansプラットフォームの基礎">NetBeansプラットフォームの基礎</h3>
<div class="paragraph">
<p>NetBeansプラットフォームの初心者ですか。初心者の場合は、前述の開始の項にあるドキュメントに従った後に、次のドキュメントを読んで学習パスを続行してください。特に、次にリストされている4つの「セレクション管理シリーズ」では、NetBeansプラットフォームの様々な部分を統合する方法が示されます。</p>
</div>
@@ -183,11 +211,11 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://wiki.netbeans.org/NbmIdioms">NutshellでのNetBeans API</a></p>
</li>
-<li>
-<p>重要なNetBeansプラットフォーム・リファレンス・カード</p>
-</li>
</ul>
</div>
+</div>
+<div class="sect2">
+<h3 id="_重要なnetbeansプラットフォーム_リファレンス_カード">重要なNetBeansプラットフォーム・リファレンス・カード</h3>
<div class="imageblock left">
<div class="content">
<a class="image" href="http://refcardz.dzone.com/refcardz/netbeans-platform-70"><img src="../../images_www/screenshots/platform/refcard70.png" alt="refcard70"></a>
@@ -221,15 +249,14 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>NetBeansプラットフォーム上でビルドされたアプリケーション</strong></p>
</div>
+<div class="sect2">
+<h3 id="_netbeansプラットフォーム上でビルドされたアプリケーション">NetBeansプラットフォーム上でビルドされたアプリケーション</h3>
+<div class="sect3">
+<h4 id="_アプリケーション">アプリケーション</h4>
<div class="ulist">
<ul>
<li>
-<p>アプリケーション</p>
-</li>
-<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-paintapp.html">ペイント・アプリケーションのチュートリアル</a></p>
</li>
<li>
@@ -241,9 +268,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-povray-1.html">POV-Rayレンダラのチュートリアル</a></p>
</li>
-<li>
-<p>一般的なシナリオ</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_一般的なシナリオ">一般的なシナリオ</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-crud.html">作成/読取り/更新/削除(CRUD)</a></p>
</li>
@@ -261,9 +292,10 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>コード・エディタを開発するためのNetBeans API</strong></p>
</div>
+</div>
+<div class="sect2">
+<h3 id="_コード_エディタを開発するためのnetbeans_api">コード・エディタを開発するためのNetBeans API</h3>
<div class="ulist">
<ul>
<li>
@@ -307,9 +339,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>データの視覚化のためのNetBeans API</strong></p>
</div>
+<div class="sect2">
+<h3 id="_データの視覚化のためのnetbeans_api">データの視覚化のためのNetBeans API</h3>
<div class="ulist">
<ul>
<li>
@@ -335,9 +367,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>NetBeansプラットフォームのその他のチュートリアル</strong></p>
</div>
+<div class="sect2">
+<h3 id="_netbeansプラットフォームのその他のチュートリアル">NetBeansプラットフォームのその他のチュートリアル</h3>
<div class="paragraph">
<p><em>(アルファベット順)</em></p>
</div>
@@ -378,41 +410,51 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>コマンドライン</strong></p>
</div>
+<div class="sect2">
+<h3 id="_コマンドライン">コマンドライン</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-ant.html">Ant</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">Maven</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">Maven</a></p>
</li>
</ul>
</div>
-<h1 id="_youtube_netbeans_ideを拡張する5つの簡単な方法" class="sect0">YouTube: NetBeans IDEを拡張する5つの簡単な方法</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_youtube_netbeans_ideを拡張する5つの簡単な方法">YouTube: NetBeans IDEを拡張する5つの簡単な方法</h2>
+<div class="sectionbody">
<div class="imageblock left">
<div class="content">
<a class="image" href="http://www.youtube.com/watch?v=h4k5JpluJM8"><img src="../../images_www/screenshots/platform/five-easy-extend.png" alt="five easy extend" height="]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["></a>
</div>
</div>
-<h1 id="_mavenとnetbeansプラットフォームの使用" class="sect0">MavenとNetBeansプラットフォームの使用</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_mavenとnetbeansプラットフォームの使用">MavenとNetBeansプラットフォームの使用</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_一般的な紹介">一般的な紹介</h3>
<div class="ulist">
<ul>
<li>
-<p>一般的な紹介</p>
-</li>
-<li>
<p><a href="http://wiki.netbeans.org/MavenBestPractices">NetBeans IDEでのMavenのベスト・プラクティス</a></p>
</li>
<li>
<p><a href="http://mojo.codehaus.org/nbm-maven-plugin/">NetBeansモジュールのMavenプラグインについて</a></p>
</li>
-<li>
-<p>NetBeansプラットフォームのチュートリアル</p>
-</li>
+</ul>
+</div>
+<div class="sect3">
+<h4 id="_netbeansプラットフォームのチュートリアル">NetBeansプラットフォームのチュートリアル</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">NetBeansプラットフォームのMavenコマンドラインのチュートリアル</a></p>
</li>
@@ -428,9 +470,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-crud.html">Mavenを使用したNetBeansプラットフォームのCRUDのチュートリアル</a></p>
</li>
-<li>
-<p>その他</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_その他">その他</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container">Mavenized NetBeansプラットフォーム実行時コンテナ</a></p>
</li>
@@ -441,36 +487,47 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://netbeans.dzone.com/nb-how-create-javahelp-mavenized">MavenおよびNetBeansプラットフォームを使用したJavaHelpの作成</a></p>
</li>
<li>
-<p><a href="http://netbeans.dzone.com/videos/screencast-maven-and-netbeans">スクリーンキャスト: MavenおよびNetBeansプラットフォーム</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[]</p>
+<p><a href="http://netbeans.dzone.com/videos/screencast-maven-and-netbeans">スクリーンキャスト: MavenおよびNetBeansプラットフォーム</a></p>
</li>
</ul>
</div>
-<h1 id="_診断" class="sect0">診断</h1>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_診断">診断</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-test.html">NetBeansプラットフォームのテスト・インフラストラクチャのチュートリアル</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-gesture.html">NetBeansプラットフォームのジェスチャー収集インフラストラクチャのチュートリアル</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-gesture.html">NetBeansプラットフォームのジェスチャー収集インフラストラクチャのチュートリアル</a></p>
</li>
</ul>
</div>
-<h1 id="_osgiとnetbeansプラットフォームの使用" class="sect0">OSGiとNetBeansプラットフォームの使用</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_osgiとnetbeansプラットフォームの使用">OSGiとNetBeansプラットフォームの使用</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html">OSGiを使用したNetBeansプラットフォーム・クイック・スタート</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-emf.html">NetBeansプラットフォームEMF統合のチュートリアル</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-emf.html">NetBeansプラットフォームEMF統合のチュートリアル</a></p>
</li>
</ul>
</div>
-<h1 id="_スクリーンキャスト" class="sect0">スクリーンキャスト</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_スクリーンキャスト">スクリーンキャスト</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -481,17 +538,11 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="https://netbeans.org/kb/docs/screencasts.html"><img src="https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_サンプル_アプリケーション" class="sect0">サンプル・アプリケーション</h1>
+<div class="sect1">
+<h2 id="_サンプル_アプリケーション">サンプル・アプリケーション</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -505,17 +556,11 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="https://netbeans.org/kb/samples/index.html"><img src="https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
-</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
</div>
-</div>
-<h1 id="_コミュニティの寄稿ドキュメント" class="sect0">コミュニティの寄稿ドキュメント</h1>
+<div class="sect1">
+<h2 id="_コミュニティの寄稿ドキュメント">コミュニティの寄稿ドキュメント</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -538,21 +583,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="http://wiki.netbeans.org/CommunityDocs_Contributions"><img src="https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
-</div>
-</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
</div>
-<h1 id="_参考資料" class="sect0">参考資料</h1>
-<div class="paragraph">
-<p>*NetBeansプラットフォームの公式参考資料
-*</p>
</div>
+<div class="sect1">
+<h2 id="_参考資料">参考資料</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_netbeansプラットフォームの公式参考資料">NetBeansプラットフォームの公式参考資料</h3>
<div class="ulist">
<ul>
<li>
@@ -589,16 +626,18 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://bits.netbeans.org/dev/javadoc/layers.html">NetBeans APIでのレイヤー登録の説明</a></p>
</li>
<li>
-<p><a href="http://bits.netbeans.org/dev/javadoc/apichanges.html">NetBeans APIの最新の変更</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[]</p>
+<p><a href="http://bits.netbeans.org/dev/javadoc/apichanges.html">NetBeans APIの最新の変更</a></p>
</li>
</ul>
</div>
-<h1 id="_その他のリソース" class="sect0">その他のリソース</h1>
-<div class="paragraph">
-<p>*オンライン・マガジンの記事
-*</p>
</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_その他のリソース">その他のリソース</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_オンライン_マガジンの記事">オンライン・マガジンの記事</h3>
<div class="ulist">
<ul>
<li>
@@ -612,10 +651,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*NetBeansプラットフォームに関するブログ
-*</p>
</div>
+<div class="sect2">
+<h3 id="_netbeansプラットフォームに関するブログ">NetBeansプラットフォームに関するブログ</h3>
<div class="ulist">
<ul>
<li>
@@ -623,10 +661,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*NetBeansプラットフォームに関する書籍
-*</p>
</div>
+<div class="sect2">
+<h3 id="_netbeansプラットフォームに関する書籍">NetBeansプラットフォームに関する書籍</h3>
<div class="ulist">
<ul>
<li>
@@ -639,11 +676,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://www.apress.com/9781430224174">The Definitive Guide to NetBeans Platform 6.5</a></p>
</li>
<li>
-<p><a href="http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802">Rich Client Programming: Plugging into the NetBeans Platform</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[]</p>
+<p><a href="http://www.amazon.com/Rich-Client-Programming-Plugging-NetBeans/dp/0132354802">Rich Client Programming: Plugging into the NetBeans Platform</a></p>
</li>
</ul>
</div>
+</div>
+</div>
+</div>
<section class='tools'>
<ul class="menu align-center">
diff --git a/content/kb/docs/platform_pt_BR.html b/content/kb/docs/platform_pt_BR.html
index 53b4f47..16fb5a3 100644
--- a/content/kb/docs/platform_pt_BR.html
+++ b/content/kb/docs/platform_pt_BR.html
@@ -96,24 +96,48 @@
<div id="toc" class="toc">
<div id="toctitle"></div>
-<ul class="sectlevel3">
+<ul class="sectlevel1">
<li><a href="#_o_que_é_a_plataforma_netbeans">O que é a Plataforma NetBeans?</a></li>
<li><a href="#_introdução">Introdução</a></li>
<li><a href="#_portabilidade">Portabilidade</a></li>
-<li><a href="#_usando_as_apis_do_netbeans">Usando as APIs do NetBeans</a></li>
+<li><a href="#_usando_as_apis_do_netbeans">Usando as APIs do NetBeans</a>
+<ul class="sectlevel2">
+<li><a href="#_princípios_básicos_da_plataforma_netbeans">Princípios Básicos da Plataforma NetBeans</a></li>
+<li><a href="#_aplicações_construídas_na_plataforma_netbeans">Aplicações Construídas na Plataforma NetBeans</a></li>
+<li><a href="#_apis_netbeans_para_desenvolvimento_de_editores_de_código">APIs NetBeans para Desenvolvimento de Editores de Código</a></li>
+<li><a href="#_apis_netbeans_para_visualização_de_dados">APIs NetBeans para Visualização de Dados</a></li>
+<li><a href="#_diversos_tutoriais_da_plataforma_netbeans">Diversos Tutoriais da Plataforma NetBeans</a></li>
+<li><a href="#_linha_de_comando">Linha de Comando</a></li>
+</ul>
+</li>
<li><a href="#_youtube_cinco_maneiras_simples_de_estender_o_netbeans_ide">YouTube: Cinco Maneiras Simples de Estender o NetBeans IDE</a></li>
-<li><a href="#_utilizando_maven_com_a_plataforma_netbeans">Utilizando Maven com a Plataforma NetBeans</a></li>
+<li><a href="#_utilizando_maven_com_a_plataforma_netbeans">Utilizando Maven com a Plataforma NetBeans</a>
+<ul class="sectlevel2">
+<li><a href="#_introduções_gerais">Introduções Gerais</a></li>
+</ul>
+</li>
<li><a href="#_diagnóstico">Diagnóstico</a></li>
<li><a href="#_utilizando_osgi_com_a_plataforma_netbeans">Utilizando OSGi com a plataforma NetBeans</a></li>
<li><a href="#_screencasts">Screencasts</a></li>
<li><a href="#_aplicações_de_amostra">Aplicações de Amostra</a></li>
<li><a href="#_documentos_de_contribuição_da_comunidade">Documentos de Contribuição da Comunidade</a></li>
-<li><a href="#_material_de_referência">Material de Referência</a></li>
-<li><a href="#_outros_recursos">Outros Recursos</a></li>
+<li><a href="#_material_de_referência">Material de Referência</a>
+<ul class="sectlevel2">
+<li><a href="#_material_de_referência_oficial_da_plataforma_netbeans">Material de Referência Oficial da Plataforma NetBeans</a></li>
+</ul>
+</li>
+<li><a href="#_outros_recursos">Outros Recursos</a>
+<ul class="sectlevel2">
+<li><a href="#_artigos_de_revistas_on_line">Artigos de Revistas On-Line</a></li>
+<li><a href="#_blogs_da_plataforma_netbeans">Blogs da Plataforma NetBeans</a></li>
+<li><a href="#_livros_da_plataforma_netbeans">Livros da Plataforma NetBeans</a></li>
+</ul>
+</li>
</ul>
</div>
-<div class="sect3">
-<h4 id="_o_que_é_a_plataforma_netbeans">O que é a Plataforma NetBeans?</h4>
+<div class="sect1">
+<h2 id="_o_que_é_a_plataforma_netbeans">O que é a Plataforma NetBeans?</h2>
+<div class="sectionbody">
<div class="paragraph">
<p>A Plataforma NetBeans é uma ampla framework Java em que você pode basear grandes aplicações desktop. O NetBeans IDE é, em si, <a href="http://platform.netbeans.org/screenshots.html">uma das centenas de aplicações</a> 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.</p>
</div>
@@ -123,13 +147,11 @@
<div class="paragraph">
<p>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.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-tr.png" alt="] image::https://netbeans.org/images_www/v6/trails/trails-box-tl.png[">
-</div>
</div>
</div>
-<h1 id="_introdução" class="sect0">Introdução</h1>
+<div class="sect1">
+<h2 id="_introdução">Introdução</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -148,27 +170,32 @@
<p><a href="http://platform.netbeans.org/tutorials/nbm-quick-start.html">Início Rápido da Plataforma NetBeans</a></p>
</li>
<li>
-<p>Novidades na Plataforma NetBeans <a href="http://platform.netbeans.org/whatsnew/65.html">6.5</a>, <a href="http://platform.netbeans.org/whatsnew/67.html">6.7</a>, <a href="http://platform.netbeans.org/whatsnew/68.html">6.8</a>, <a href="http://platform.netbeans.org/whatsnew/69.html">6.9</a>, <a href="http://platform.netbeans.org/whatsnew/70.html">7.0</a>, <a href="http://platform.netbeans.org/whatsnew/71.html">7.1</a>, <a href="http://platform.netbeans.org/whatsnew/72.html">7.2</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[]</p>
+<p>Novidades na Plataforma NetBeans <a href="http://platform.netbeans.org/whatsnew/65.html">6.5</a>, <a href="http://platform.netbeans.org/whatsnew/67.html">6.7</a>, <a href="http://platform.netbeans.org/whatsnew/68.html">6.8</a>, <a href="http://platform.netbeans.org/whatsnew/69.html">6.9</a>, <a href="http://platform.netbeans.org/whatsnew/70.html">7.0</a>, <a href="http://platform.netbeans.org/whatsnew/71.html">7.1</a>, <a href="http://platform.netbeans.org/whatsnew/72.html">7.2</a>, < [...]
</li>
</ul>
</div>
-<h1 id="_portabilidade" class="sect0">Portabilidade</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_portabilidade">Portabilidade</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-porting-basic.html">Portabilidade de Componentes de Swing</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-javafx.html">Portabilidade de Componentes JavaFX</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-javafx.html">Portabilidade de Componentes JavaFX</a></p>
</li>
</ul>
</div>
-<h1 id="_usando_as_apis_do_netbeans" class="sect0">Usando as APIs do NetBeans</h1>
-<div class="paragraph">
-<p><strong>Princípios Básicos da Plataforma NetBeans</strong></p>
</div>
+</div>
+<div class="sect1">
+<h2 id="_usando_as_apis_do_netbeans">Usando as APIs do NetBeans</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_princípios_básicos_da_plataforma_netbeans">Princípios Básicos da Plataforma NetBeans</h3>
<div class="paragraph">
<p>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!</p>
</div>
@@ -183,30 +210,33 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://wiki.netbeans.org/NbmIdioms">APIs NetBeans em Poucas Palavras</a></p>
</li>
-<li>
-<p>Cartão de Referência Essencial da Plataforma NetBeans</p>
-</li>
</ul>
</div>
+<div class="sect3">
+<h4 id="_cartão_de_referência_essencial_da_plataforma_netbeans">Cartão de Referência Essencial da Plataforma NetBeans</h4>
<div class="imageblock left">
<div class="content">
<a class="image" href="http://refcardz.dzone.com/refcardz/netbeans-platform-70"><img src="../../images_www/screenshots/platform/refcard70.png" alt="refcard70"></a>
</div>
</div>
+</div>
+<div class="sect3">
+<h4 id="_visões_gerais_rápidas">Visões Gerais Rápidas</h4>
<div class="ulist">
<ul>
<li>
-<p>Visões Gerais Rápidas</p>
-</li>
-<li>
<p><a href="http://netbeans.dzone.com/articles/netbeans-lookups-explained">Pesquisas NetBeans Explicadas!</a></p>
</li>
<li>
<p><a href="http://netbeans.dzone.com/news/netbeans-extension-points">Como Funcionam os Pontos de Extensão do NetBeans?</a></p>
</li>
-<li>
-<p>Série de Gerenciamento da Seleção</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_série_de_gerenciamento_da_seleção">Série de Gerenciamento da Seleção</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-selection-1.html">Parte 1: Tutorial de Gerenciamento da Seleção</a></p>
</li>
@@ -221,15 +251,15 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Aplicações Construídas na Plataforma NetBeans</strong></p>
</div>
+</div>
+<div class="sect2">
+<h3 id="_aplicações_construídas_na_plataforma_netbeans">Aplicações Construídas na Plataforma NetBeans</h3>
+<div class="sect3">
+<h4 id="_aplicações">Aplicações</h4>
<div class="ulist">
<ul>
<li>
-<p>Aplicações</p>
-</li>
-<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-paintapp.html">Tutorial da Aplicação Paint</a></p>
</li>
<li>
@@ -241,9 +271,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-povray-1.html">Tutorial do Renderizador do POV-Ray</a></p>
</li>
-<li>
-<p>Cenários Comuns</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_cenários_comuns">Cenários Comuns</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-crud.html">Create/Read/Update/Delete (CRUD)</a></p>
</li>
@@ -261,9 +295,10 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>APIs NetBeans para Desenvolvimento de Editores de Código</strong></p>
</div>
+</div>
+<div class="sect2">
+<h3 id="_apis_netbeans_para_desenvolvimento_de_editores_de_código">APIs NetBeans para Desenvolvimento de Editores de Código</h3>
<div class="ulist">
<ul>
<li>
@@ -307,9 +342,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>APIs NetBeans para Visualização de Dados</strong></p>
</div>
+<div class="sect2">
+<h3 id="_apis_netbeans_para_visualização_de_dados">APIs NetBeans para Visualização de Dados</h3>
<div class="ulist">
<ul>
<li>
@@ -335,9 +370,9 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p>*Diversos Tutoriais da Plataforma NetBeans *</p>
</div>
+<div class="sect2">
+<h3 id="_diversos_tutoriais_da_plataforma_netbeans">Diversos Tutoriais da Plataforma NetBeans</h3>
<div class="paragraph">
<p>_(classificados em ordem alfabética) _</p>
</div>
@@ -378,41 +413,51 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="paragraph">
-<p><strong>Linha de Comando</strong></p>
</div>
+<div class="sect2">
+<h3 id="_linha_de_comando">Linha de Comando</h3>
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-ant.html">Ant</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">Maven</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">Maven</a></p>
</li>
</ul>
</div>
-<h1 id="_youtube_cinco_maneiras_simples_de_estender_o_netbeans_ide" class="sect0">YouTube: Cinco Maneiras Simples de Estender o NetBeans IDE</h1>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_youtube_cinco_maneiras_simples_de_estender_o_netbeans_ide">YouTube: Cinco Maneiras Simples de Estender o NetBeans IDE</h2>
+<div class="sectionbody">
<div class="imageblock left">
<div class="content">
<a class="image" href="http://www.youtube.com/watch?v=h4k5JpluJM8"><img src="../../images_www/screenshots/platform/five-easy-extend.png" alt="five easy extend" height="]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["></a>
</div>
</div>
-<h1 id="_utilizando_maven_com_a_plataforma_netbeans" class="sect0">Utilizando Maven com a Plataforma NetBeans</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_utilizando_maven_com_a_plataforma_netbeans">Utilizando Maven com a Plataforma NetBeans</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_introduções_gerais">Introduções Gerais</h3>
<div class="ulist">
<ul>
<li>
-<p>Introduções Gerais</p>
-</li>
-<li>
<p><a href="http://wiki.netbeans.org/MavenBestPractices">Melhores Práticas do Maven no NetBeans IDE</a></p>
</li>
<li>
<p><a href="http://mojo.codehaus.org/nbm-maven-plugin/">Sobre o Plug-in Maven do Módulo NetBeans</a></p>
</li>
-<li>
-<p>Tutoriais da Plataforma NetBeans</p>
-</li>
+</ul>
+</div>
+<div class="sect3">
+<h4 id="_tutoriais_da_plataforma_netbeans">Tutoriais da Plataforma NetBeans</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-commandline.html">Tutorial da Linha de Comando Maven da Plataforma NetBeans</a></p>
</li>
@@ -428,9 +473,13 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-maven-crud.html">Tutorial do CRUD da Plataforma NetBeans Usando Maven</a></p>
</li>
-<li>
-<p>Diversos</p>
-</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_diversos">Diversos</h4>
+<div class="ulist">
+<ul>
<li>
<p><a href="http://blogs.oracle.com/geertjan/entry/mavenized_netbeans_platform_runtime_container">Contêiner do Runtime da Plataforma NetBeans Mavenizada</a></p>
</li>
@@ -441,36 +490,47 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
<p><a href="http://netbeans.dzone.com/nb-how-create-javahelp-mavenized">Criando JavaHelp com Maven e com a Plataforma NetBeans</a></p>
</li>
<li>
-<p><a href="http://netbeans.dzone.com/videos/screencast-maven-and-netbeans">Screencast: Maven e a Plataforma NetBeans</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[]</p>
+<p><a href="http://netbeans.dzone.com/videos/screencast-maven-and-netbeans">Screencast: Maven e a Plataforma NetBeans</a></p>
</li>
</ul>
</div>
-<h1 id="_diagnóstico" class="sect0">Diagnóstico</h1>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_diagnóstico">Diagnóstico</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-test.html">Tutorial da Infraestrutura de Teste da Plataforma NetBeans</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-gesture.html">Tutorial da Infraestutura da Coleção da Gestão da Plataforma Netbeans</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-gesture.html">Tutorial da Infraestutura da Coleção da Gestão da Plataforma Netbeans</a></p>
</li>
</ul>
</div>
-<h1 id="_utilizando_osgi_com_a_plataforma_netbeans" class="sect0">Utilizando OSGi com a plataforma NetBeans</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_utilizando_osgi_com_a_plataforma_netbeans">Utilizando OSGi com a plataforma NetBeans</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
<p><a href="http://platform.netbeans.org/tutorials/nbm-osgi-quickstart.html">Início Rápido da Plataforma NetBeans Utilizando OSGi</a></p>
</li>
<li>
-<p><a href="http://platform.netbeans.org/tutorials/nbm-emf.html">Tutorial de Integração de EMF da Plataforma NetBeans</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[]</p>
+<p><a href="http://platform.netbeans.org/tutorials/nbm-emf.html">Tutorial de Integração de EMF da Plataforma NetBeans</a></p>
</li>
</ul>
</div>
-<h1 id="_screencasts" class="sect0">Screencasts</h1>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_screencasts">Screencasts</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -481,17 +541,11 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="https://netbeans.org/kb/docs/screencasts.html"><img src=":https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
-</div>
-<h1 id="_aplicações_de_amostra" class="sect0">Aplicações de Amostra</h1>
+<div class="sect1">
+<h2 id="_aplicações_de_amostra">Aplicações de Amostra</h2>
+<div class="sectionbody">
<div class="ulist">
<ul>
<li>
@@ -505,17 +559,11 @@ image::https://netbeans.org/images_www/v6/trails/trails-box-br.png[] image::http
</li>
</ul>
</div>
-<div class="imageblock left">
-<div class="content">
-<a class="image" href="https://netbeans.org/kb/samples/index.html"><img src=":https://netbeans.org/images_www/v6/arrow-button1.gif" alt="arrow button1"></a>
</div>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="https://netbeans.org/images_www/v6/trails/trails-box-br.png" alt="] 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[">
-</div>
... 3267 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