Branch: master

65360534 2014-10-03 07:46:21 Michele Calgaro
Updated some of the TDevelop documentation toc files. This relates to bug 1859.
A languages/cpp/doc/gnome_bugs.toc
A languages/java/doc/java_bugs_oracle.toc
M doc/extras/w3c/w3c-dom-level2-html.toc
M languages/cpp/doc/CMakeLists.txt
M languages/cpp/doc/Makefile.am
M languages/java/doc/CMakeLists.txt
M languages/java/doc/Makefile.am
R languages/cpp/doc/gtk_bugs.toc
R languages/java/doc/java_bugs_sun.toc
diff --git a/doc/extras/w3c/w3c-dom-level2-html.toc b/doc/extras/w3c/w3c-dom-level2-html.toc
index e41c517..45f9798 100644
--- a/doc/extras/w3c/w3c-dom-level2-html.toc
+++ b/doc/extras/w3c/w3c-dom-level2-html.toc
@@ -1,6 +1,6 @@
 <!DOCTYPE tdeveloptoc>
 <tdeveloptoc>
-<title>Document Object Model (DOM) Level 2 HTML Specification</title>
+<title>DOM Level 2 HTML Specification</title>
 <base href="http://www.w3.org/TR/DOM-Level-2-HTML" />
  <tocsect1 name="1. Document Object Model HTML" url="html.html">
  <tocsect2 name="1.1. Introduction" url="html.html#ID-1176245063">
diff --git a/languages/cpp/doc/CMakeLists.txt b/languages/cpp/doc/CMakeLists.txt
index de3ca22..1d86155 100644
--- a/languages/cpp/doc/CMakeLists.txt
+++ b/languages/cpp/doc/CMakeLists.txt
@@ -13,9 +13,9 @@
     c++_bugs_gcc.toc 
     clanlib.toc
     cppannotations.toc
+    gnome_bugs.toc
     gnome1.toc
     gnustep.toc
-    gtk_bugs.toc
     kde2book.toc
     kdetemplates.toc
     libc.toc 
diff --git a/languages/cpp/doc/Makefile.am b/languages/cpp/doc/Makefile.am
index a6604eb..bedd0fd 100644
--- a/languages/cpp/doc/Makefile.am
+++ b/languages/cpp/doc/Makefile.am
@@ -3,9 +3,9 @@
     c++_bugs_gcc.toc \
     clanlib.toc \
     cppannotations.toc \
+    gnome_bugs.toc \
     gnome1.toc \
     gnustep.toc \
-    gtk_bugs.toc \
     kde2book.toc \
     kdetemplates.toc \
     libc.toc \
diff --git a/languages/cpp/doc/gnome_bugs.toc b/languages/cpp/doc/gnome_bugs.toc
new file mode 100644
index 0000000..ef57b20
--- /dev/null
+++ b/languages/cpp/doc/gnome_bugs.toc
@@ -0,0 +1,7 @@
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
+<title>GNOME bugs</title>
+<base href="http://bugzilla.gnome.org/"/>
+<tocsect1 name="Query" url="query.cgi">
+</tocsect1>
+</tdeveloptoc>
diff --git a/languages/cpp/doc/gtk_bugs.toc b/languages/cpp/doc/gtk_bugs.toc
deleted file mode 100644
index 940be9b..0000000
--- a/languages/cpp/doc/gtk_bugs.toc
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE tdeveloptoc>
-<tdeveloptoc>
-<title>GTK bugs</title>
-<base href="http://bugzilla.gnome.org/"/>
-<tocsect1 name="Query" url="query.cgi">
-</tocsect1>
-</tdeveloptoc>
diff --git a/languages/java/doc/CMakeLists.txt b/languages/java/doc/CMakeLists.txt
index 685a980..c619894 100644
--- a/languages/java/doc/CMakeLists.txt
+++ b/languages/java/doc/CMakeLists.txt
@@ -10,5 +10,5 @@
 #################################################
 
 install( FILES
-    sw.toc java_bugs_gcc.toc java_bugs_sun.toc
+    sw.toc java_bugs_gcc.toc java_bugs_oracle.toc
   DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
diff --git a/languages/java/doc/Makefile.am b/languages/java/doc/Makefile.am
index adb0f24..d6eebba 100644
--- a/languages/java/doc/Makefile.am
+++ b/languages/java/doc/Makefile.am
@@ -1,6 +1,5 @@
 tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_sun.toc
+toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_oracle.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
-#index_DATA = 
-
+#index_DATA =
diff --git a/languages/java/doc/java_bugs_oracle.toc b/languages/java/doc/java_bugs_oracle.toc
new file mode 100644
index 0000000..f33af81
--- /dev/null
+++ b/languages/java/doc/java_bugs_oracle.toc
@@ -0,0 +1,7 @@
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
+<title>Java bugs (Oracle)</title>
+<base href="http://bugs.java.com/"/>
+<tocsect1 name="Query" url="">
+</tocsect1>
+</tdeveloptoc>
diff --git a/languages/java/doc/java_bugs_sun.toc b/languages/java/doc/java_bugs_sun.toc
deleted file mode 100644
index 9a59005..0000000
--- a/languages/java/doc/java_bugs_sun.toc
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE tdeveloptoc>
-<tdeveloptoc>
-<title>Java bugs (Sun)</title>
-<base href="http://developer.java.sun.com/developer/bugParade/"/>
-<tocsect1 name="Query" url="index.jshtml">
-</tocsect1>
-</tdeveloptoc>