diff --git a/languages/ada/doc/ada.toc b/languages/ada/doc/ada.toc
index ace75856..189bcaec 100644
--- a/languages/ada/doc/ada.toc
+++ b/languages/ada/doc/ada.toc
@@ -114,7 +114,7 @@
   </tocsect2>
   <tocsect2 name="13. Representation Issues" url="rm9x-13.html">
 	  <tocsect3 name="Representation Items" url="rm9x-13-01.html"></tocsect3>
-	  <tocsect3 name="Pragma Pack" url="rm9x-13" url="rm9x-13-02.html"></tocsect3>
+	  <tocsect3 name="Pragma Pack" url="rm9x-13-02.html"></tocsect3>
 	  <tocsect3 name="Representation Attributes" url="rm9x-13-03.html"></tocsect3>
 	  <tocsect3 name="Enumeration Representation Clauses" url="rm9x-13-04.html"></tocsect3>
 	  <tocsect3 name="Record Layout" url="rm9x-13-05.html"></tocsect3>
diff --git a/languages/bash/doc/CMakeLists.txt b/languages/bash/doc/CMakeLists.txt
index 0d2d2a83..65472a5a 100644
--- a/languages/bash/doc/CMakeLists.txt
+++ b/languages/bash/doc/CMakeLists.txt
@@ -9,6 +9,5 @@
 #
 #################################################
 
-install( FILES
-    bash.toc bash_bugs.toc
-  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
+install( FILES bash.toc
+         DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs )
diff --git a/languages/bash/doc/Makefile.am b/languages/bash/doc/Makefile.am
index 1474d939..72b33ce6 100644
--- a/languages/bash/doc/Makefile.am
+++ b/languages/bash/doc/Makefile.am
@@ -1,6 +1,2 @@
 tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = bash.toc bash_bugs.toc
-
-#indexdir = ${kde_datadir}/devdoctreeview/indices
-#index_DATA = 
-
+toc_DATA = bash.toc
diff --git a/languages/bash/doc/bash.toc b/languages/bash/doc/bash.toc
index 75151d6b..899a9c02 100644
--- a/languages/bash/doc/bash.toc
+++ b/languages/bash/doc/bash.toc
@@ -1,80 +1,85 @@
 <!DOCTYPE tdeveloptoc>
 <tdeveloptoc>
 <title>Bash Reference Manual</title>
-<base href="http://bashdb.sourceforge.net/"/>
-<tocsect1 name="Introduction" url="bashref.html#SEC1">
-	<tocsect2 name="What is Bash?" url="bashref.html#SEC2"/>
-	<tocsect2 name="What is a Shell?" url="bashref.html#SEC3"/>
+<base href="http://www.gnu.org/software/bash/manual"/>
+<tocsect1 name="01. Introduction" url="bashref.html#Introduction">
+	<tocsect2 name="1.1 What is Bash?" url="bashref.html#What-is-Bash_003f"/>
+	<tocsect2 name="1.2 What is a Shell?" url="bashref.html#What-is-a-shell_003f"/>
 </tocsect1>
-<tocsect1 name="Definitions" url="bashref.html#SEC4"></tocsect1>
-<tocsect1 name="Basic Shell Features" url="bashref.html#SEC5">
-	<tocsect2 name="Shell Syntax" url="bashref.html#SEC6"/>
-	<tocsect2 name="Shell Commands" url="bashref.html#SEC15"/>
-	<tocsect2 name="Shell Functions" url="bashref.html#SEC22"/>
-	<tocsect2 name="Shell Parameters" url="bashref.html#SEC23"/>
-	<tocsect2 name="Shell Expansions" url="bashref.html#SEC26"/>
-	<tocsect2 name="Shell Redirections" url="bashref.html#SEC37"/>
-	<tocsect2 name="Executeing Commands" url="bashref.html#SEC47"/>
-	<tocsect2 name="Shell Scripts" url="bashref.html#SEC54"/>
+<tocsect1 name="02. Definitions" url="bashref.html#Definitions"></tocsect1>
+<tocsect1 name="03. Basic Shell Features" url="bashref.html#Basic-Shell-Features">
+	<tocsect2 name="3.1 Shell Syntax" url="bashref.html#Shell-Syntax"/>
+	<tocsect2 name="3.2 Shell Commands" url="bashref.html#Shell-Commands"/>
+	<tocsect2 name="3.3 Shell Functions" url="bashref.html#Shell-Functions"/>
+	<tocsect2 name="3.4 Shell Parameters" url="bashref.html#Shell-Parameters"/>
+	<tocsect2 name="3.5 Shell Expansions" url="bashref.html#Shell-Expansions"/>
+	<tocsect2 name="3.6 Shell Redirections" url="bashref.html#Redirections"/>
+	<tocsect2 name="3.7 Executeing Commands" url="bashref.html#Executing-Commands"/>
+	<tocsect2 name="3.8 Shell Scripts" url="bashref.html#Shell-Scripts"/>
 </tocsect1>
-<tocsect1 name="Shell Builtin Commands" url="bashref.html#SEC55">
-	<tocsect2 name="Bourne Shell Builtins" url="bashref.html#SEC56"/>
-	<tocsect2 name="Bash Builtin Commands" url="bashref.html#SEC57"/>
-	<tocsect2 name="The Set Builtin" url="bashref.html#SEC58"/>
-	<tocsect2 name="Special Builtins" url="bashref.html#SEC59"/>
+<tocsect1 name="04. Shell Builtin Commands" url="bashref.html#Shell-Builtin-Commands">
+	<tocsect2 name="4.1 Bourne Shell Builtins" url="bashref.html#Bourne-Shell-Builtins"/>
+	<tocsect2 name="4.2 Bash Builtin Commands" url="bashref.html#Bash-Builtins"/>
+	<tocsect2 name="4.3 Modifying Shell Behavior" url="bashref.html#Modifying-Shell-Behavior"/>
+	<tocsect2 name="4.4 Special Builtins" url="bashref.html#Special-Builtins"/>
 </tocsect1>
-<tocsect1 name="Shell Variables" url="bashref.html#SEC60">
-	<tocsect2 name="Bourne Shell Variables" url="bashref.html#SEC61"/>
-	<tocsect2 name="Bash Variables" url="bashref.html#SEC62"/>
+<tocsect1 name="05. Shell Variables" url="bashref.html#Shell-Variables">
+	<tocsect2 name="5.1 Bourne Shell Variables" url="bashref.html#Bourne-Shell-Variables"/>
+	<tocsect2 name="5.2 Bash Variables" url="bashref.html#Bash-Variables"/>
 </tocsect1>
-<tocsect1 name="Bash Features" url="bashref.html#SEC63">
-	<tocsect2 name="Invoking Bash" url="bashref.html#SEC64"/>
-	<tocsect2 name="Bash Startup Files" url="bashref.html#SEC65"/>
-	<tocsect2 name="Bash Conditional Expressions" url="bashref.html#SEC77"/>
-	<tocsect2 name="Shell Arithmetic" url="bashref.html#SEC78"/>
-	<tocsect2 name="Aliases" url="bashref.html#SEC79"/>
-	<tocsect2 name="Arrays" url="bashref.html#SEC80"/>
-	<tocsect2 name="The Directory Stack" url="bashref.html#SEC81"/>
-	<tocsect2 name="Controlling the Prompt" url="bashref.html#SEC83"/>
-	<tocsect2 name="The Restricted Shell" url="bashref.html#SEC84"/>
-	<tocsect2 name="Bash POSIX Mode" url="bashref.html#SEC85"/>
+<tocsect1 name="06. Bash Features" url="bashref.html#Bash-Features">
+	<tocsect2 name="6.1  Invoking Bash" url="bashref.html#Invoking-Bash"/>
+	<tocsect2 name="6.2  Bash Startup Files" url="bashref.html#Bash-Startup-Files"/>
+	<tocsect2 name="6.3  Interactive Shells" url="bashref.html#Interactive-Shells"/>
+	<tocsect2 name="6.4  Bash Conditional Expressions" url="bashref.html#Bash-Conditional-Expressions"/>
+	<tocsect2 name="6.5  Shell Arithmetic" url="bashref.html#Shell-Arithmetic"/>
+	<tocsect2 name="6.6  Aliases" url="bashref.html#Aliases"/>
+	<tocsect2 name="6.7  Arrays" url="bashref.html#Arrays"/>
+	<tocsect2 name="6.8  The Directory Stack" url="bashref.html#The-Directory-Stack"/>
+	<tocsect2 name="6.9  Controlling the Prompt" url="bashref.html#Printing-a-Prompt"/>
+	<tocsect2 name="6.10 The Restricted Shell" url="bashref.html#The-Restricted-Shell"/>
+	<tocsect2 name="6.11 Bash POSIX Mode" url="bashref.html#Bash-POSIX-Mode"/>
 </tocsect1>
-<tocsect1 name="Job Control" url="bashref.html#SEC86">
-	<tocsect2 name="Job Control Basics" url="bashref.html#SEC87"/>
-	<tocsect2 name="Job Control Builtins" url="bashref.html#SEC88"/>
-	<tocsect2 name="Job Control Variables" url="bashref.html#SEC89"/>
+<tocsect1 name="07. Job Control" url="bashref.html#Job-Control">
+	<tocsect2 name="7.1 Job Control Basics" url="bashref.html#Job-Control-Basics"/>
+	<tocsect2 name="7.2 Job Control Builtins" url="bashref.html#Job-Control-Builtins"/>
+	<tocsect2 name="7.3 Job Control Variables" url="bashref.html#Job-Control-Variables"/>
 </tocsect1>
-<tocsect1 name="Using History Interactively" url="bashref.html#SEC114">
-	<tocsect2 name="Bash History Facilities" url="bashref.html#SEC115"/>
-	<tocsect2 name="Bash Hisotry Builtins" url="bashref.html#SEC116"/>
-	<tocsect2 name="History Expansion" url="bashref.html#SEC117"/>
+<tocsect1 name="08. Command Line Editing" url="bashref.html#Command-Line-Editing">
+	<tocsect2 name="8.1 Introduciton to Line Editing" url="bashref.html#Introduction-and-Notation"/>
+	<tocsect2 name="8.2 Readline Interaction" url="bashref.html#Readline-Interaction"/>
+	<tocsect2 name="8.3 Readline Init File" url="bashref.html#Readline-Init-File"/>
+	<tocsect2 name="8.4 Bindable Readline Commands" url="bashref.html#Bindable-Readline-Commands"/>
+	<tocsect2 name="8.5 Readline VI Mode" url="bashref.html#Readline-vi-Mode"/>
+	<tocsect2 name="8.6 Programmable Completion" url="bashref.html#Programmable-Completion"/>
+	<tocsect2 name="8.7 Programmable Completion Builtins" url="bashref.html#Programmable-Completion-Builtins"/>
 </tocsect1>
-<tocsect1 name="Command Line Editing" url="bashref.html#SEC90">
-	<tocsect2 name="Introduciton to Line Editing" url="bashref.html#SEC91"/>
-	<tocsect2 name="Readline Interaction" url="bashref.html#SEC92"/>
-	<tocsect2 name="Readline Init File" url="bashref.html#SEC98"/>
-	<tocsect2 name="Bindable Readline Commands" url="bashref.html#SEC102"/>
-	<tocsect2 name="Readline VI Mode" url="bashref.html#SEC111"/>
-	<tocsect2 name="Programmable Completion" url="bashref.html#SEC112"/>
-	<tocsect2 name="Programmable Completion Builtins" url="bashref.html#SEC113"/>
+<tocsect1 name="09. Using History Interactively" url="bashref.html#Using-History-Interactively">
+	<tocsect2 name="9.1 Bash History Facilities" url="bashref.html#Bash-History-Facilities"/>
+	<tocsect2 name="9.2 Bash Hisotry Builtins" url="bashref.html#Bash-History-Builtins"/>
+	<tocsect2 name="9.3 History Expansion" url="bashref.html#History-Interaction"/>
 </tocsect1>
-<tocsect1 name="Installing Bash" url="bashref.html#SEC121">
-	<tocsect2 name="Basic Installation" url="bashref.html#SEC122"/>
-	<tocsect2 name="Compilers and Options" url="bashref.html#SEC123"/>
-	<tocsect2 name="Compileing for Multiple Architectures" url="bashref.html#SEC124"/>
-	<tocsect2 name="Installation Names" url="bashref.html#SEC125"/>
-	<tocsect2 name="Specifying the System Type" url="bashref.html#SEC126"/>
-	<tocsect2 name="Shareing Defaults" url="bashref.html#SEC127"/>
-	<tocsect2 name="Operation Controls" url="bashref.html#SEC128"/>
-	<tocsect2 name="Operational Features" url="bashref.html#SEC129"/>
+<tocsect1 name="10. Installing Bash" url="bashref.html#Installing-Bash">
+	<tocsect2 name="10.1 Basic Installation" url="bashref.html#Basic-Installation"/>
+	<tocsect2 name="10.2 Compilers and Options" url="bashref.html#Compilers-and-Options"/>
+	<tocsect2 name="10.3 Compileing for Multiple Architectures" url="bashref.html#Compiling-For-Multiple-Architectures"/>
+	<tocsect2 name="10.4 Installation Names" url="bashref.html#Installation-Names"/>
+	<tocsect2 name="10.5 Specifying the System Type" url="bashref.html#Specifying-the-System-Type"/>
+	<tocsect2 name="10.6 Sharing Defaults" url="bashref.html#Sharing-Defaults"/>
+	<tocsect2 name="10.7 Operation Controls" url="bashref.html#Operation-Controls"/>
+	<tocsect2 name="10.8 Operational Features" url="bashref.html#Optional-Features"/>
+</tocsect1>
+<tocsect1 name="Appendix A. Reporting Bugs" url="bashref.html#Reporting-Bugs"></tocsect1>
+<tocsect1 name="Appendix B. Major Differences From The Bourne Shell" url="bashref.html#Major-Differences-From-The-Bourne-Shell">
+	<tocsect2 name="B.1 Implementation Differences From The SVR4.2 Shell" url="bashref.html#Implementation-Differences-From-The-SVR4_002e2-Shell"/>
+</tocsect1>
+<tocsect1 name="Appendix C. GNU Free Documentation License" url="bashref.html#GNU-Free-Documentation-License"></tocsect1>
+<tocsect1 name="Appendix D. Indexes" url="bashref.html#Indexes">
+  <tocsect2 name="D.1 Index of Shell Builtin Commands" url="bashref.html#Builtin-Index"/>
+  <tocsect2 name="D.2 Index of Shell Reserved Words" url="bashref.html#Reserved-Word-Index"/>
+  <tocsect2 name="D.3 Parameter and Variable Index" url="bashref.html#Variable-Index"/>
+  <tocsect2 name="D.4 Function Index" url="bashref.html#Function-Index"/>
+  <tocsect2 name="D.5 Concept Index" url="bashref.html#Concept-Index"/>
 </tocsect1>
-<tocsect1 name="Reporting Bugs" url="bashref.html#SEC130"></tocsect1>
-<tocsect1 name="Major Differences From The Bourne Shell" url="bashref.html#SEC131"></tocsect1>
-<tocsect1 name="Enhancements to BASH 2.05b" url="bashref.html#SEC133"></tocsect1>
-<tocsect1 name="Index of Shell Builtin Commands" url="bashref.html#SEC134"></tocsect1>
-<tocsect1 name="Index of Shell Reserved Words" url="bashref.html#SEC135"></tocsect1>
-<tocsect1 name="Parameter and Variable Index" url="bashref.html#SEC136"></tocsect1>
-<tocsect1 name="Function Index" url="bashref.html#SEC137"></tocsect1>
-<tocsect1 name="Concept Index" url="bashref.html#SEC138"></tocsect1>
 </tdeveloptoc>
 
diff --git a/languages/bash/doc/bash_bugs.toc b/languages/bash/doc/bash_bugs.toc
deleted file mode 100644
index 6ba61863..00000000
--- a/languages/bash/doc/bash_bugs.toc
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE tdeveloptoc>
-<tdeveloptoc>
-<title>Bash bugs</title>
-<base href="http://groups.google.com/"/>
-<tocsect1 name="Query" url="groups?group=gnu.bash.bug">
-</tocsect1>
-</tdeveloptoc>