Updated sdl and stl TDevelop documentation toc files. This relates to bug 1859.

6 files changed, 255 insertions, 240 deletions

diff --git a/doc/extras/CMakeLists.txt b/doc/extras/CMakeLists.txt
index dd7c977f..ef6d0ec3 100644
--- a/doc/extras/CMakeLists.txt
+++ b/doc/extras/CMakeLists.txt
@@ -13,6 +13,6 @@ add_subdirectory( w3c )
 
 install(
   FILES
-    sdl.toc opengl.toc
+    sdl1_2.toc sdl2_0.toc opengl.toc
   DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs
 )
diff --git a/doc/extras/Makefile.am b/doc/extras/Makefile.am
index 0e7893c4..b08a4110 100644
--- a/doc/extras/Makefile.am
+++ b/doc/extras/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS=w3c
 
 tocdir = ${kde_datadir}/kdevdocumentation/tocs
-toc_DATA = sdl.toc opengl.toc
+toc_DATA = sdl1_2.toc sdl2_0.toc opengl.toc
 
 #indexdir = ${kde_datadir}/devdoctreeview/indices
 #index_DATA = 
diff --git a/doc/extras/sdl.toc b/doc/extras/sdl.toc
deleted file mode 100644
index 01b7e7d7..00000000
--- a/doc/extras/sdl.toc
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE tdeveloptoc>
-<tdeveloptoc>
-<title>SDL</title>
-<base href="http://sdldoc.csn.ul.ie"/>
-<tocsect1 name="I. SDL Guide" url="guide.php">
-	<tocsect2 name="Preface" url="guidepreface.php">
-		<tocsect3 name="About SDL" url="guidepreface.php#GUIDEABOUTSDL" />
-		<tocsect3 name="About SDLdoc" url="guideaboutsdldoc.php" />
-		<tocsect3 name="Credits" url="guidecredits.php" />
-	</tocsect2>
-	<tocsect2 name="1. The Basics" url="guidethebasics.php">
-		<tocsect3 name="Introduction" url="guidethebasics.php#GUIDEINTRODUCTION" />
-		<tocsect3 name="Initializing SDL" url="guidebasicsinit.php" />
-	</tocsect2>
-	<tocsect2 name="2. Graphics and Video" url="guidevideo.php">
-		<tocsect3 name="Introduction to SDL Video" url="guidevideo.php#GUIDEVIDEOINTRO" />
-		<tocsect3 name="Using OpenGL With SDL" url="guidevideoopengl.php" />
-	</tocsect2>
-	<tocsect2 name="3. Input handling" url="guideinput.php">
-		<tocsect3 name="Handling Joysticks" url="guideinput.php#GUIDEINPUTJOYSTICK" />
-		<tocsect3 name="Handling the Keyboard" url="guideinputkeyboard.php" />
-	</tocsect2>
-	<tocsect2 name="4. Examples" url="guideexamples.php">
-		<tocsect3 name="Introduction" url="guideexamples.php#AEN369" />
-		<tocsect3 name="Event Examples" url="guideeventexamples.php" />
-		<tocsect3 name="Audio Examples" url="guideaudioexamples.php" />
-		<tocsect3 name="CDROM Examples" url="guidecdromexamples.php" />
-		<tocsect3 name="Time Examples" url="guidetimeexamples.php" />
-	</tocsect2>
-</tocsect1>
-<tocsect1 name="II. SDL Reference" url="reference.php">
-	<tocsect2 name="5. General" url="general.php">
-		<tocsect3 name="SDL_Init" url="sdlinit.php" />
-		<tocsect3 name="SDL_InitSubSystem" url="sdlinitsubsystem.php" />
-		<tocsect3 name="SDL_QuitSubSystem" url="sdlquitsubsystem.php" />
-		<tocsect3 name="SDL_Quit" url="sdlquit.php" />
-		<tocsect3 name="SDL_WasInit" url="sdlwasinit.php" />
-		<tocsect3 name="SDL_GetError" url="sdlgeterror.php" />
-	</tocsect2>
-	<tocsect2 name="6. Video" url="video.php">
-		<tocsect3 name="SDL_GetVideoSurface" url="sdlgetvideosurface.php" />
-		<tocsect3 name="SDL_GetVideoInfo" url="sdlgetvideoinfo.php" />
-		<tocsect3 name="SDL_VideoDriverName" url="sdlvideodrivername.php" />
-		<tocsect3 name="SDL_ListModes" url="sdllistmodes.php" />
-		<tocsect3 name="SDL_VideoModeOK" url="sdlvideomodeok.php" />
-		<tocsect3 name="SDL_SetVideoMode" url="sdlsetvideomode.php" />
-		<tocsect3 name="SDL_UpdateRect" url="sdlupdaterect.php" />
-		<tocsect3 name="SDL_UpdateRects" url="sdlupdaterects.php" />
-		<tocsect3 name="SDL_Flip" url="sdlflip.php" />
-		<tocsect3 name="SDL_SetColors" url="sdlsetcolors.php" />
-		<tocsect3 name="SDL_SetPalette" url="sdlsetpalette.php" />
-		<tocsect3 name="SDL_SetGamma" url="sdlsetgamma.php" />
-		<tocsect3 name="SDL_GetGammaRamp" url="sdlgetgammaramp.php" />
-		<tocsect3 name="SDL_SetGammaRamp" url="sdlsetgammaramp.php" />
-		<tocsect3 name="SDL_MapRGB" url="sdlmaprgb.php" />
-		<tocsect3 name="SDL_MapRGBA" url="sdlmaprgba.php" />
-		<tocsect3 name="SDL_GetRGB" url="sdlgetrgb.php" />
-		<tocsect3 name="SDL_GetRGBA" url="sdlgetrgba.php" />
-		<tocsect3 name="SDL_CreateRGBSurface" url="sdlcreatergbsurface.php" />
-		<tocsect3 name="SDL_CreateRGBSurfaceFrom" url="sdlcreatergbsurfacefrom.php" />
-		<tocsect3 name="SDL_FreeSurface" url="sdlfreesurface.php" />
-		<tocsect3 name="SDL_LockSurface" url="sdllocksurface.php" />
-		<tocsect3 name="SDL_UnlockSurface" url="sdlunlocksurface.php" />
-		<tocsect3 name="SDL_LoadBMP" url="sdlloadbmp.php" />
-		<tocsect3 name="SDL_SaveBMP" url="sdlsavebmp.php" />
-		<tocsect3 name="SDL_SetColorKey" url="sdlsetcolorkey.php" />
-		<tocsect3 name="SDL_SetAlpha" url="sdlsetalpha.php" />
-		<tocsect3 name="SDL_SetClipRect" url="sdlsetcliprect.php" />
-		<tocsect3 name="SDL_GetClipRect" url="sdlgetcliprect.php" />
-		<tocsect3 name="SDL_ConvertSurface" url="sdlconvertsurface.php" />
-		<tocsect3 name="SDL_BlitSurface" url="sdlblitsurface.php" />
-		<tocsect3 name="SDL_FillRect" url="sdlfillrect.php" />
-		<tocsect3 name="SDL_DisplayFormat" url="sdldisplayformat.php" />
-		<tocsect3 name="SDL_DisplayFormatAlpha" url="sdldisplayformatalpha.php" />
-		<tocsect3 name="SDL_WarpMouse" url="sdlwarpmouse.php" />
-		<tocsect3 name="SDL_CreateCursor" url="sdlcreatecursor.php" />
-		<tocsect3 name="SDL_FreeCursor" url="sdlfreecursor.php" />
-		<tocsect3 name="SDL_SetCursor" url="sdlsetcursor.php" />
-		<tocsect3 name="SDL_GetCursor" url="sdlgetcursor.php" />
-		<tocsect3 name="SDL_ShowCursor" url="sdlshowcursor.php" />
-		<tocsect3 name="SDL_GL_LoadLibrary" url="sdlglloadlibrary.php" />
-		<tocsect3 name="SDL_GL_GetProcAddress" url="sdlglgetprocaddress.php" />
-		<tocsect3 name="SDL_GL_GetAttribute" url="sdlglgetattribute.php" />
-		<tocsect3 name="SDL_GL_SetAttribute" url="sdlglsetattribute.php" />
-		<tocsect3 name="SDL_GL_SwapBuffers" url="sdlglswapbuffers.php" />
-		<tocsect3 name="SDL_CreateYUVOverlay" url="sdlcreateyuvoverlay.php" />
-		<tocsect3 name="SDL_LockYUVOverlay" url="sdllockyuvoverlay.php" />
-		<tocsect3 name="SDL_UnlockYUVOverlay" url="sdlunlockyuvoverlay.php" />
-		<tocsect3 name="SDL_DisplayYUVOverlay" url="sdldisplayyuvoverlay.php" />
-		<tocsect3 name="SDL_FreeYUVOverlay" url="sdlfreeyuvoverlay.php" />
-		<tocsect3 name="SDL_GLattr" url="sdlglattr.php" />
-		<tocsect3 name="SDL_Rect" url="sdlrect.php" />
-		<tocsect3 name="SDL_Color" url="sdlcolor.php" />
-		<tocsect3 name="SDL_Palette" url="sdlpalette.php" />
-		<tocsect3 name="SDL_PixelFormat" url="sdlpixelformat.php" />
-		<tocsect3 name="SDL_Surface" url="sdlsurface.php" />
-		<tocsect3 name="SDL_VideoInfo" url="sdlvideoinfo.php" />
-		<tocsect3 name="SDL_Overlay" url="sdloverlay.php" />
-	</tocsect2>
-	<tocsect2 name="7. Window Management" url="wm.php">
-		<tocsect3 name="SDL_WM_SetCaption" url="sdlwmsetcaption.php" />
-		<tocsect3 name="SDL_WM_GetCaption" url="sdlwmgetcaption.php" />
-		<tocsect3 name="SDL_WM_SetIcon" url="sdlwmseticon.php" />
-		<tocsect3 name="SDL_WM_IconifyWindow" url="sdlwmiconifywindow.php" />
-		<tocsect3 name="SDL_WM_ToggleFullScreen" url="sdlwmtogglefullscreen.php" />
-		<tocsect3 name="SDL_WM_GrabInput" url="sdlwmgrabinput.php" />
-	</tocsect2>
-	<tocsect2 name="8. Events" url="event.php">
-		<tocsect3 name="Introduction" url="event.php#AEN3307" />
-		<tocsect3 name="SDL Event Structures." url="eventstructures.php" />
-		<tocsect3 name="Event Functions." url="eventfunctions.php" />
-	</tocsect2>
-	<tocsect2 name="9. Joystick" url="joystick.php">
-		<tocsect3 name="SDL_NumJoysticks" url="sdlnumjoysticks.php" />
-		<tocsect3 name="SDL_JoystickName" url="sdljoystickname.php" />
-		<tocsect3 name="SDL_JoystickOpen" url="sdljoystickopen.php" />
-		<tocsect3 name="SDL_JoystickOpened" url="sdljoystickopened.php" />
-		<tocsect3 name="SDL_JoystickIndex" url="sdljoystickindex.php" />
-		<tocsect3 name="SDL_JoystickNumAxes" url="sdljoysticknumaxes.php" />
-		<tocsect3 name="SDL_JoystickNumBalls" url="sdljoysticknumballs.php" />
-		<tocsect3 name="SDL_JoystickNumHats" url="sdljoysticknumhats.php" />
-		<tocsect3 name="SDL_JoystickNumButtons" url="sdljoysticknumbuttons.php" />
-		<tocsect3 name="SDL_JoystickUpdate" url="sdljoystickupdate.php" />
-		<tocsect3 name="SDL_JoystickGetAxis" url="sdljoystickgetaxis.php" />
-		<tocsect3 name="SDL_JoystickGetHat" url="sdljoystickgethat.php" />
-		<tocsect3 name="SDL_JoystickGetButton" url="sdljoystickgetbutton.php" />
-		<tocsect3 name="SDL_JoystickGetBall" url="sdljoystickgetball.php" />
-		<tocsect3 name="SDL_JoystickClose" url="sdljoystickclose.php" />
-	</tocsect2>
-	<tocsect2 name="10. Audio" url="audio.php">
-		<tocsect3 name="SDL_AudioSpec" url="sdlaudiospec.php" />
-		<tocsect3 name="SDL_OpenAudio" url="sdlopenaudio.php" />
-		<tocsect3 name="SDL_PauseAudio" url="sdlpauseaudio.php" />
-		<tocsect3 name="SDL_GetAudioStatus" url="sdlgetaudiostatus.php" />
-		<tocsect3 name="SDL_LoadWAV" url="sdlloadwav.php" />
-		<tocsect3 name="SDL_FreeWAV" url="sdlfreewav.php" />
-		<tocsect3 name="SDL_AudioCVT" url="sdlaudiocvt.php" />
-		<tocsect3 name="SDL_BuildAudioCVT" url="sdlbuildaudiocvt.php" />
-		<tocsect3 name="SDL_ConvertAudio" url="sdlconvertaudio.php" />
-		<tocsect3 name="SDL_MixAudio" url="sdlmixaudio.php" />
-		<tocsect3 name="SDL_LockAudio" url="sdllockaudio.php" />
-		<tocsect3 name="SDL_UnlockAudio" url="sdlunlockaudio.php" />
-		<tocsect3 name="SDL_CloseAudio" url="sdlcloseaudio.php" />
-	</tocsect2>
-	<tocsect2 name="11. CD-ROM" url="cdrom.php">
-		<tocsect3 name="SDL_CDNumDrives" url="sdlcdnumdrives.php" />
-		<tocsect3 name="SDL_CDName" url="sdlcdname.php" />
-		<tocsect3 name="SDL_CDOpen" url="sdlcdopen.php" />
-		<tocsect3 name="SDL_CDStatus" url="sdlcdstatus.php" />
-		<tocsect3 name="SDL_CDPlay" url="sdlcdplay.php" />
-		<tocsect3 name="SDL_CDPlayTracks" url="sdlcdplaytracks.php" />
-		<tocsect3 name="SDL_CDPause" url="sdlcdpause.php" />
-		<tocsect3 name="SDL_CDResume" url="sdlcdresume.php" />
-		<tocsect3 name="SDL_CDStop" url="sdlcdstop.php" />
-		<tocsect3 name="SDL_CDEject" url="sdlcdeject.php" />
-		<tocsect3 name="SDL_CDClose" url="sdlcdclose.php" />
-		<tocsect3 name="SDL_CD" url="sdlcd.php" />
-		<tocsect3 name="SDL_CDtrack" url="sdlcdtrack.php" />
-	</tocsect2>
-	<tocsect2 name="12. Multi-threaded Programming" url="thread.php">
-		<tocsect3 name="SDL_CreateThread" url="sdlcreatethread.php" />
-		<tocsect3 name="SDL_ThreadID" url="sdlthreadid.php" />
-		<tocsect3 name="SDL_GetThreadID" url="sdlgetthreadid.php" />
-		<tocsect3 name="SDL_WaitThread" url="sdlwaitthread.php" />
-		<tocsect3 name="SDL_KillThread" url="sdlkillthread.php" />
-		<tocsect3 name="SDL_CreateMutex" url="sdlcreatemutex.php" />
-		<tocsect3 name="SDL_DestroyMutex" url="sdldestroymutex.php" />
-		<tocsect3 name="SDL_mutexP" url="sdlmutexp.php" />
-		<tocsect3 name="SDL_mutexV" url="sdlmutexv.php" />
-		<tocsect3 name="SDL_CreateSemaphore" url="sdlcreatesemaphore.php" />
-		<tocsect3 name="SDL_DestroySemaphore" url="sdldestroysemaphore.php" />
-		<tocsect3 name="SDL_SemWait" url="sdlsemwait.php" />
-		<tocsect3 name="SDL_SemTryWait" url="sdlsemtrywait.php" />
-		<tocsect3 name="SDL_SemWaitTimeout" url="sdlsemwaittimeout.php" />
-		<tocsect3 name="SDL_SemPost" url="sdlsempost.php" />
-		<tocsect3 name="SDL_SemValue" url="sdlsemvalue.php" />
-		<tocsect3 name="SDL_CreateCond" url="sdlcreatecond.php" />
-		<tocsect3 name="SDL_DestroyCond" url="sdldestroycond.php" />
-		<tocsect3 name="SDL_CondSignal" url="sdlcondsignal.php" />
-		<tocsect3 name="SDL_CondBroadcast" url="sdlcondbroadcast.php" />
-		<tocsect3 name="SDL_CondWait" url="sdlcondwait.php" />
-		<tocsect3 name="SDL_CondWaitTimeout" url="sdlcondwaittimeout.php" />
-	</tocsect2>
-	<tocsect2 name="13. Time" url="time.php">
-		<tocsect3 name="SDL_GetTicks" url="sdlgetticks.php" />
-		<tocsect3 name="SDL_Delay" url="sdldelay.php" />
-		<tocsect3 name="SDL_AddTimer" url="sdladdtimer.php" />
-		<tocsect3 name="SDL_RemoveTimer" url="sdlremovetimer.php" />
-		<tocsect3 name="SDL_SetTimer" url="sdlsettimer.php" />
-	</tocsect2>
-</tocsect1>
-<tocsect1 name="List of Tables">
-	<tocsect2 name="8-1. SDL Keysym definitions" url="sdlkey.php#AEN4336" />
-	<tocsect2 name="8-2. SDL modifier definitions" url="sdlkey.php#SDLMOD" />
-</tocsect1>
-	<tocsect1 name="List of Examples">
-	<tocsect2 name="1-1. Initializing SDL" url="guidebasicsinit.php#AEN60" />
-	<tocsect2 name="2-1. Initializing the Video Display" url="guidevideo.php#AEN71" />
-	<tocsect2 name="2-2. Initializing the Best Video Mode" url="guidevideo.php#AEN77" />
-	<tocsect2 name="2-3. Loading and Displaying a BMP File" url="guidevideo.php#AEN83" />
-	<tocsect2 name="2-4. getpixel()" url="guidevideo.php#AEN90" />
-	<tocsect2 name="2-5. putpixel()" url="guidevideo.php#AEN93" />
-	<tocsect2 name="2-6. Using putpixel()" url="guidevideo.php#AEN97" />
-	<tocsect2 name="2-7. Initializing SDL with OpenGL" url="guidevideoopengl.php#AEN114" />
-	<tocsect2 name="2-8. SDL and OpenGL" url="guidevideoopengl.php#AEN128" />
-	<tocsect2 name="3-1. Initializing SDL with Joystick Support" url="guideinput.php#AEN141" />
-	<tocsect2 name="3-2. Querying the Number of Available Joysticks" url="guideinput.php#AEN154" />
-	<tocsect2 name="3-3. Opening a Joystick" url="guideinput.php#AEN183" />
-	<tocsect2 name="3-4. Joystick Axis Events" url="guideinput.php#AEN191" />
-	<tocsect2 name="3-5. More Joystick Axis Events" url="guideinput.php#AEN195" />
-	<tocsect2 name="3-6. Joystick Button Events" url="guideinput.php#AEN203" />
-	<tocsect2 name="3-7. Joystick Ball Events" url="guideinput.php#AEN217" />
-	<tocsect2 name="3-8. Joystick Hat Events" url="guideinput.php#AEN244" />
-	<tocsect2 name="3-9. Querying Joystick Characteristics" url="guideinput.php#AEN265" />
-	<tocsect2 name="3-10. Reading Keyboard Events" url="guideinputkeyboard.php#AEN334" />
-	<tocsect2 name="3-11. Interpreting Key Event Information" url="guideinputkeyboard.php#AEN351" />
-	<tocsect2 name="3-12. Proper Game Movement" url="guideinputkeyboard.php#AEN363" />
-</tocsect1>
-</tdeveloptoc>
diff --git a/doc/extras/sdl1_2.toc b/doc/extras/sdl1_2.toc
new file mode 100644
index 00000000..a3a2975d
--- /dev/null
+++ b/doc/extras/sdl1_2.toc
@@ -0,0 +1,219 @@
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
+<title>SDL 1.2</title>
+<base href="http://www.libsdl.org/release/SDL-1.2.15/docs/html"/>
+<tocsect1 name="I. SDL Guide" url="guide.html">
+	<tocsect2 name="Preface" url="guidepreface.html">
+		<tocsect3 name="About SDL" url="guidepreface.html#GUIDEABOUTSDL" />
+		<tocsect3 name="About SDLdoc" url="guideaboutsdldoc.html" />
+		<tocsect3 name="Credits" url="guidecredits.html" />
+	</tocsect2>
+	<tocsect2 name="1. The Basics" url="guidethebasics.html">
+		<tocsect3 name="Introduction" url="guidethebasics.html#GUIDEINTRODUCTION" />
+		<tocsect3 name="Initializing SDL" url="guidebasicsinit.html" />
+	</tocsect2>
+	<tocsect2 name="2. Graphics and Video" url="guidevideo.html">
+		<tocsect3 name="Introduction to SDL Video" url="guidevideo.html#GUIDEVIDEOINTRO" />
+		<tocsect3 name="Using OpenGL With SDL" url="guidevideoopengl.html" />
+	</tocsect2>
+	<tocsect2 name="3. Input handling" url="guideinput.html">
+		<tocsect3 name="Handling Joysticks" url="guideinput.html#GUIDEINPUTJOYSTICK" />
+		<tocsect3 name="Handling the Keyboard" url="guideinputkeyboard.html" />
+	</tocsect2>
+	<tocsect2 name="4. Examples" url="guideexamples.html">
+		<tocsect3 name="Introduction" url="guideexamples.html#AEN369" />
+		<tocsect3 name="Event Examples" url="guideeventexamples.html" />
+		<tocsect3 name="Audio Examples" url="guideaudioexamples.html" />
+		<tocsect3 name="CDROM Examples" url="guidecdromexamples.html" />
+		<tocsect3 name="Time Examples" url="guidetimeexamples.html" />
+	</tocsect2>
+</tocsect1>
+<tocsect1 name="II. SDL Reference" url="reference.html">
+	<tocsect2 name="5. General" url="general.html">
+		<tocsect3 name="SDL_Init" url="sdlinit.html" />
+		<tocsect3 name="SDL_InitSubSystem" url="sdlinitsubsystem.html" />
+		<tocsect3 name="SDL_QuitSubSystem" url="sdlquitsubsystem.html" />
+		<tocsect3 name="SDL_Quit" url="sdlquit.html" />
+		<tocsect3 name="SDL_WasInit" url="sdlwasinit.html" />
+		<tocsect3 name="SDL_GetError" url="sdlgeterror.html" />
+	</tocsect2>
+	<tocsect2 name="6. Video" url="video.html">
+		<tocsect3 name="SDL_GetVideoSurface" url="sdlgetvideosurface.html" />
+		<tocsect3 name="SDL_GetVideoInfo" url="sdlgetvideoinfo.html" />
+		<tocsect3 name="SDL_VideoDriverName" url="sdlvideodrivername.html" />
+		<tocsect3 name="SDL_ListModes" url="sdllistmodes.html" />
+		<tocsect3 name="SDL_VideoModeOK" url="sdlvideomodeok.html" />
+		<tocsect3 name="SDL_SetVideoMode" url="sdlsetvideomode.html" />
+		<tocsect3 name="SDL_UpdateRect" url="sdlupdaterect.html" />
+		<tocsect3 name="SDL_UpdateRects" url="sdlupdaterects.html" />
+		<tocsect3 name="SDL_Flip" url="sdlflip.html" />
+		<tocsect3 name="SDL_SetColors" url="sdlsetcolors.html" />
+		<tocsect3 name="SDL_SetPalette" url="sdlsetpalette.html" />
+		<tocsect3 name="SDL_SetGamma" url="sdlsetgamma.html" />
+		<tocsect3 name="SDL_GetGammaRamp" url="sdlgetgammaramp.html" />
+		<tocsect3 name="SDL_SetGammaRamp" url="sdlsetgammaramp.html" />
+		<tocsect3 name="SDL_MapRGB" url="sdlmaprgb.html" />
+		<tocsect3 name="SDL_MapRGBA" url="sdlmaprgba.html" />
+		<tocsect3 name="SDL_GetRGB" url="sdlgetrgb.html" />
+		<tocsect3 name="SDL_GetRGBA" url="sdlgetrgba.html" />
+		<tocsect3 name="SDL_CreateRGBSurface" url="sdlcreatergbsurface.html" />
+		<tocsect3 name="SDL_CreateRGBSurfaceFrom" url="sdlcreatergbsurfacefrom.html" />
+		<tocsect3 name="SDL_FreeSurface" url="sdlfreesurface.html" />
+		<tocsect3 name="SDL_LockSurface" url="sdllocksurface.html" />
+		<tocsect3 name="SDL_UnlockSurface" url="sdlunlocksurface.html" />
+		<tocsect3 name="SDL_LoadBMP" url="sdlloadbmp.html" />
+		<tocsect3 name="SDL_SaveBMP" url="sdlsavebmp.html" />
+		<tocsect3 name="SDL_SetColorKey" url="sdlsetcolorkey.html" />
+		<tocsect3 name="SDL_SetAlpha" url="sdlsetalpha.html" />
+		<tocsect3 name="SDL_SetClipRect" url="sdlsetcliprect.html" />
+		<tocsect3 name="SDL_GetClipRect" url="sdlgetcliprect.html" />
+		<tocsect3 name="SDL_ConvertSurface" url="sdlconvertsurface.html" />
+		<tocsect3 name="SDL_BlitSurface" url="sdlblitsurface.html" />
+		<tocsect3 name="SDL_FillRect" url="sdlfillrect.html" />
+		<tocsect3 name="SDL_DisplayFormat" url="sdldisplayformat.html" />
+		<tocsect3 name="SDL_DisplayFormatAlpha" url="sdldisplayformatalpha.html" />
+		<tocsect3 name="SDL_WarpMouse" url="sdlwarpmouse.html" />
+		<tocsect3 name="SDL_CreateCursor" url="sdlcreatecursor.html" />
+		<tocsect3 name="SDL_FreeCursor" url="sdlfreecursor.html" />
+		<tocsect3 name="SDL_SetCursor" url="sdlsetcursor.html" />
+		<tocsect3 name="SDL_GetCursor" url="sdlgetcursor.html" />
+		<tocsect3 name="SDL_ShowCursor" url="sdlshowcursor.html" />
+		<tocsect3 name="SDL_GL_LoadLibrary" url="sdlglloadlibrary.html" />
+		<tocsect3 name="SDL_GL_GetProcAddress" url="sdlglgetprocaddress.html" />
+		<tocsect3 name="SDL_GL_GetAttribute" url="sdlglgetattribute.html" />
+		<tocsect3 name="SDL_GL_SetAttribute" url="sdlglsetattribute.html" />
+		<tocsect3 name="SDL_GL_SwapBuffers" url="sdlglswapbuffers.html" />
+		<tocsect3 name="SDL_CreateYUVOverlay" url="sdlcreateyuvoverlay.html" />
+		<tocsect3 name="SDL_LockYUVOverlay" url="sdllockyuvoverlay.html" />
+		<tocsect3 name="SDL_UnlockYUVOverlay" url="sdlunlockyuvoverlay.html" />
+		<tocsect3 name="SDL_DisplayYUVOverlay" url="sdldisplayyuvoverlay.html" />
+		<tocsect3 name="SDL_FreeYUVOverlay" url="sdlfreeyuvoverlay.html" />
+		<tocsect3 name="SDL_GLattr" url="sdlglattr.html" />
+		<tocsect3 name="SDL_Rect" url="sdlrect.html" />
+		<tocsect3 name="SDL_Color" url="sdlcolor.html" />
+		<tocsect3 name="SDL_Palette" url="sdlpalette.html" />
+		<tocsect3 name="SDL_PixelFormat" url="sdlpixelformat.html" />
+		<tocsect3 name="SDL_Surface" url="sdlsurface.html" />
+		<tocsect3 name="SDL_VideoInfo" url="sdlvideoinfo.html" />
+		<tocsect3 name="SDL_Overlay" url="sdloverlay.html" />
+	</tocsect2>
+	<tocsect2 name="7. Window Management" url="wm.html">
+		<tocsect3 name="SDL_WM_SetCaption" url="sdlwmsetcaption.html" />
+		<tocsect3 name="SDL_WM_GetCaption" url="sdlwmgetcaption.html" />
+		<tocsect3 name="SDL_WM_SetIcon" url="sdlwmseticon.html" />
+		<tocsect3 name="SDL_WM_IconifyWindow" url="sdlwmiconifywindow.html" />
+		<tocsect3 name="SDL_WM_ToggleFullScreen" url="sdlwmtogglefullscreen.html" />
+		<tocsect3 name="SDL_WM_GrabInput" url="sdlwmgrabinput.html" />
+	</tocsect2>
+	<tocsect2 name="8. Events" url="event.html">
+		<tocsect3 name="Introduction" url="event.html#AEN3307" />
+		<tocsect3 name="SDL Event Structures." url="eventstructures.html" />
+		<tocsect3 name="Event Functions." url="eventfunctions.html" />
+	</tocsect2>
+	<tocsect2 name="9. Joystick" url="joystick.html">
+		<tocsect3 name="SDL_NumJoysticks" url="sdlnumjoysticks.html" />
+		<tocsect3 name="SDL_JoystickName" url="sdljoystickname.html" />
+		<tocsect3 name="SDL_JoystickOpen" url="sdljoystickopen.html" />
+		<tocsect3 name="SDL_JoystickOpened" url="sdljoystickopened.html" />
+		<tocsect3 name="SDL_JoystickIndex" url="sdljoystickindex.html" />
+		<tocsect3 name="SDL_JoystickNumAxes" url="sdljoysticknumaxes.html" />
+		<tocsect3 name="SDL_JoystickNumBalls" url="sdljoysticknumballs.html" />
+		<tocsect3 name="SDL_JoystickNumHats" url="sdljoysticknumhats.html" />
+		<tocsect3 name="SDL_JoystickNumButtons" url="sdljoysticknumbuttons.html" />
+		<tocsect3 name="SDL_JoystickUpdate" url="sdljoystickupdate.html" />
+		<tocsect3 name="SDL_JoystickGetAxis" url="sdljoystickgetaxis.html" />
+		<tocsect3 name="SDL_JoystickGetHat" url="sdljoystickgethat.html" />
+		<tocsect3 name="SDL_JoystickGetButton" url="sdljoystickgetbutton.html" />
+		<tocsect3 name="SDL_JoystickGetBall" url="sdljoystickgetball.html" />
+		<tocsect3 name="SDL_JoystickClose" url="sdljoystickclose.html" />
+	</tocsect2>
+	<tocsect2 name="10. Audio" url="audio.html">
+		<tocsect3 name="SDL_AudioSpec" url="sdlaudiospec.html" />
+		<tocsect3 name="SDL_OpenAudio" url="sdlopenaudio.html" />
+		<tocsect3 name="SDL_PauseAudio" url="sdlpauseaudio.html" />
+		<tocsect3 name="SDL_GetAudioStatus" url="sdlgetaudiostatus.html" />
+		<tocsect3 name="SDL_LoadWAV" url="sdlloadwav.html" />
+		<tocsect3 name="SDL_FreeWAV" url="sdlfreewav.html" />
+		<tocsect3 name="SDL_AudioCVT" url="sdlaudiocvt.html" />
+		<tocsect3 name="SDL_BuildAudioCVT" url="sdlbuildaudiocvt.html" />
+		<tocsect3 name="SDL_ConvertAudio" url="sdlconvertaudio.html" />
+		<tocsect3 name="SDL_MixAudio" url="sdlmixaudio.html" />
+		<tocsect3 name="SDL_LockAudio" url="sdllockaudio.html" />
+		<tocsect3 name="SDL_UnlockAudio" url="sdlunlockaudio.html" />
+		<tocsect3 name="SDL_CloseAudio" url="sdlcloseaudio.html" />
+	</tocsect2>
+	<tocsect2 name="11. CD-ROM" url="cdrom.html">
+		<tocsect3 name="SDL_CDNumDrives" url="sdlcdnumdrives.html" />
+		<tocsect3 name="SDL_CDName" url="sdlcdname.html" />
+		<tocsect3 name="SDL_CDOpen" url="sdlcdopen.html" />
+		<tocsect3 name="SDL_CDStatus" url="sdlcdstatus.html" />
+		<tocsect3 name="SDL_CDPlay" url="sdlcdplay.html" />
+		<tocsect3 name="SDL_CDPlayTracks" url="sdlcdplaytracks.html" />
+		<tocsect3 name="SDL_CDPause" url="sdlcdpause.html" />
+		<tocsect3 name="SDL_CDResume" url="sdlcdresume.html" />
+		<tocsect3 name="SDL_CDStop" url="sdlcdstop.html" />
+		<tocsect3 name="SDL_CDEject" url="sdlcdeject.html" />
+		<tocsect3 name="SDL_CDClose" url="sdlcdclose.html" />
+		<tocsect3 name="SDL_CD" url="sdlcd.html" />
+		<tocsect3 name="SDL_CDtrack" url="sdlcdtrack.html" />
+	</tocsect2>
+	<tocsect2 name="12. Multi-threaded Programming" url="thread.html">
+		<tocsect3 name="SDL_CreateThread" url="sdlcreatethread.html" />
+		<tocsect3 name="SDL_ThreadID" url="sdlthreadid.html" />
+		<tocsect3 name="SDL_GetThreadID" url="sdlgetthreadid.html" />
+		<tocsect3 name="SDL_WaitThread" url="sdlwaitthread.html" />
+		<tocsect3 name="SDL_KillThread" url="sdlkillthread.html" />
+		<tocsect3 name="SDL_CreateMutex" url="sdlcreatemutex.html" />
+		<tocsect3 name="SDL_DestroyMutex" url="sdldestroymutex.html" />
+		<tocsect3 name="SDL_mutexP" url="sdlmutexp.html" />
+		<tocsect3 name="SDL_mutexV" url="sdlmutexv.html" />
+		<tocsect3 name="SDL_CreateSemaphore" url="sdlcreatesemaphore.html" />
+		<tocsect3 name="SDL_DestroySemaphore" url="sdldestroysemaphore.html" />
+		<tocsect3 name="SDL_SemWait" url="sdlsemwait.html" />
+		<tocsect3 name="SDL_SemTryWait" url="sdlsemtrywait.html" />
+		<tocsect3 name="SDL_SemWaitTimeout" url="sdlsemwaittimeout.html" />
+		<tocsect3 name="SDL_SemPost" url="sdlsempost.html" />
+		<tocsect3 name="SDL_SemValue" url="sdlsemvalue.html" />
+		<tocsect3 name="SDL_CreateCond" url="sdlcreatecond.html" />
+		<tocsect3 name="SDL_DestroyCond" url="sdldestroycond.html" />
+		<tocsect3 name="SDL_CondSignal" url="sdlcondsignal.html" />
+		<tocsect3 name="SDL_CondBroadcast" url="sdlcondbroadcast.html" />
+		<tocsect3 name="SDL_CondWait" url="sdlcondwait.html" />
+		<tocsect3 name="SDL_CondWaitTimeout" url="sdlcondwaittimeout.html" />
+	</tocsect2>
+	<tocsect2 name="13. Time" url="time.html">
+		<tocsect3 name="SDL_GetTicks" url="sdlgetticks.html" />
+		<tocsect3 name="SDL_Delay" url="sdldelay.html" />
+		<tocsect3 name="SDL_AddTimer" url="sdladdtimer.html" />
+		<tocsect3 name="SDL_RemoveTimer" url="sdlremovetimer.html" />
+		<tocsect3 name="SDL_SetTimer" url="sdlsettimer.html" />
+	</tocsect2>
+</tocsect1>
+<tocsect1 name="List of Tables">
+	<tocsect2 name="8-1. SDL Keysym definitions" url="sdlkey.html#AEN4336" />
+	<tocsect2 name="8-2. SDL modifier definitions" url="sdlkey.html#SDLMOD" />
+</tocsect1>
+	<tocsect1 name="List of Examples">
+	<tocsect2 name="1-1. Initializing SDL" url="guidebasicsinit.html#AEN60" />
+	<tocsect2 name="2-1. Initializing the Video Display" url="guidevideo.html#AEN71" />
+	<tocsect2 name="2-2. Initializing the Best Video Mode" url="guidevideo.html#AEN77" />
+	<tocsect2 name="2-3. Loading and Displaying a BMP File" url="guidevideo.html#AEN83" />
+	<tocsect2 name="2-4. getpixel()" url="guidevideo.html#AEN90" />
+	<tocsect2 name="2-5. putpixel()" url="guidevideo.html#AEN93" />
+	<tocsect2 name="2-6. Using putpixel()" url="guidevideo.html#AEN97" />
+	<tocsect2 name="2-7. Initializing SDL with OpenGL" url="guidevideoopengl.html#AEN114" />
+	<tocsect2 name="2-8. SDL and OpenGL" url="guidevideoopengl.html#AEN128" />
+	<tocsect2 name="3-1. Initializing SDL with Joystick Support" url="guideinput.html#AEN141" />
+	<tocsect2 name="3-2. Querying the Number of Available Joysticks" url="guideinput.html#AEN154" />
+	<tocsect2 name="3-3. Opening a Joystick" url="guideinput.html#AEN183" />
+	<tocsect2 name="3-4. Joystick Axis Events" url="guideinput.html#AEN191" />
+	<tocsect2 name="3-5. More Joystick Axis Events" url="guideinput.html#AEN195" />
+	<tocsect2 name="3-6. Joystick Button Events" url="guideinput.html#AEN203" />
+	<tocsect2 name="3-7. Joystick Ball Events" url="guideinput.html#AEN217" />
+	<tocsect2 name="3-8. Joystick Hat Events" url="guideinput.html#AEN244" />
+	<tocsect2 name="3-9. Querying Joystick Characteristics" url="guideinput.html#AEN265" />
+	<tocsect2 name="3-10. Reading Keyboard Events" url="guideinputkeyboard.html#AEN334" />
+	<tocsect2 name="3-11. Interpreting Key Event Information" url="guideinputkeyboard.html#AEN351" />
+	<tocsect2 name="3-12. Proper Game Movement" url="guideinputkeyboard.html#AEN363" />
+</tocsect1>
+</tdeveloptoc>
diff --git a/doc/extras/sdl2_0.toc b/doc/extras/sdl2_0.toc
new file mode 100644
index 00000000..7d7d6f02
--- /dev/null
+++ b/doc/extras/sdl2_0.toc
@@ -0,0 +1,15 @@
+<!DOCTYPE tdeveloptoc>
+<tdeveloptoc>
+<title>SDL 2.0</title>
+<base href="https://wiki.libsdl.org/"/>
+
+<tocsect1 name="FrontPage" url="FrontPage"/>
+<tocsect1 name="Introduction" url="Introduction"/>
+<tocsect1 name="Support" url="Support"/>
+<tocsect1 name="API By Name" url="CategoryAPI"/>
+<tocsect1 name="API By Category" url="APIByCategory"/>
+<tocsect1 name="Contributing" url="Contributing"/>
+<tocsect1 name="Recent Changes" url="RecentChanges"/>
+<tocsect1 name="FindPage" url="FindPage"/>
+
+</tdeveloptoc>
diff --git a/languages/cpp/doc/stl.toc b/languages/cpp/doc/stl.toc
index 09681836..48a7b835 100644
--- a/languages/cpp/doc/stl.toc
+++ b/languages/cpp/doc/stl.toc
@@ -198,23 +198,23 @@
   <tocsect2 name="Introduction" url="functors.html"/>
   <tocsect2 name="Function Object Concepts" url="">
     <tocsect3 name="Generator" url="Generator.html"/>
-    <tocsect3 name="UnaryFunction" url="Unary Function.html"/>
-    <tocsect3 name="BinaryFunction" url="Binary Function.html"/>
-    <tocsect3 name="AdaptableGenerator" url="Adaptable Generator.html"/>
-    <tocsect3 name="AdaptableUnaryFunction" url="Adaptable Unary Function.html"/>
-    <tocsect3 name="AdaptableBinaryFunction" url="Adaptable Binary Function.html"/>
+    <tocsect3 name="UnaryFunction" url="UnaryFunction.html"/>
+    <tocsect3 name="BinaryFunction" url="BinaryFunction.html"/>
+    <tocsect3 name="AdaptableGenerator" url="AdaptableGenerator.html"/>
+    <tocsect3 name="AdaptableUnaryFunction" url="AdaptableUnaryFunction.html"/>
+    <tocsect3 name="AdaptableBinaryFunction" url="AdaptableBinaryFunction.html"/>
     <tocsect3 name="Predicate" url="Predicate.html"/>
-    <tocsect3 name="BinaryPredicate" url="Binary Predicate.html"/>
-    <tocsect3 name="AdaptablePredicate" url="Adaptable Predicate.html"/>
-    <tocsect3 name="AdaptableBinaryPredicate" url="Adaptable Binary Predicate.html"/>
+    <tocsect3 name="BinaryPredicate" url="BinaryPredicate.html"/>
+    <tocsect3 name="AdaptablePredicate" url="AdaptablePredicate.html"/>
+    <tocsect3 name="AdaptableBinaryPredicate" url="AdaptableBinaryPredicate.html"/>
     <tocsect3 name="StrictWeakOrdering" url="StrictWeakOrdering.html"/>
-    <tocsect3 name="MonoidOperation" url="Monoid Operation.html"/>
-    <tocsect3 name="RandomNumberGenerator" url="Random Number Generator.html"/>
+    <tocsect3 name="MonoidOperation" url="MonoidOperation.html"/>
+    <tocsect3 name="RandomNumberGenerator" url="RandomNumberGenerator.html"/>
   </tocsect2>
   <tocsect2 name="Predefined function objects" url="">
     <tocsect3 name="plus" url="plus.html"/>
     <tocsect3 name="minus" url="minus.html"/>
-    <tocsect3 name="times" url="multiplies.html"/> (formerly called "times")
+    <tocsect3 name="times" url="multiplies.html"/>
     <tocsect3 name="divides" url="divides.html"/>
     <tocsect3 name="modulus" url="modulus.html"/>
     <tocsect3 name="negate" url="negate.html"/>
@@ -244,10 +244,10 @@
     <tocsect3 name="binary_negate" url="binary_negate.html"/>
     <tocsect3 name="unary_compose" url="unary_compose.html"/>
     <tocsect3 name="binary_compose" url="binary_compose.html"/>
-    <tocsect3 name="mem_fun_t" url="mem_fun.html"/>
-    <tocsect3 name="mem_fun_ref_t" url="mem_fun_ref.html"/>
-    <tocsect3 name="mem_fun1_t" url="mem_fun1.html"/>
-    <tocsect3 name="mem_fun1_ref_t" url="mem_fun1_ref.html"/>
+    <tocsect3 name="mem_fun_t" url="mem_fun_t.html"/>
+    <tocsect3 name="mem_fun_ref_t" url="mem_fun_ref_t.html"/>
+    <tocsect3 name="mem_fun1_t" url="mem_fun1_t.html"/>
+    <tocsect3 name="mem_fun1_ref_t" url="mem_fun1_ref_t.html"/>
   </tocsect2>
 </tocsect1>
 <tocsect1 name="Utilities" url="">
@@ -268,10 +268,10 @@
   <tocsect2 name="Functions" url="">
     <tocsect3 name="construct" url="construct.html"/>
     <tocsect3 name="destroy" url="destroy.html"/>
-    <tocsect3 name="uninitialized_copy" url="uninitialized_copy"/>
-    <tocsect3 name="uninitialized_copy_n" url="uninitialized_copy_n"/>
-    <tocsect3 name="uninitialized_fill" url="uninitialized_fill"/>
-    <tocsect3 name="uninitialized_fill_n" url="uninitialized_fill_n"/>
+    <tocsect3 name="uninitialized_copy" url="uninitialized_copy.html"/>
+    <tocsect3 name="uninitialized_copy_n" url="uninitialized_copy_n.html"/>
+    <tocsect3 name="uninitialized_fill" url="uninitialized_fill.html"/>
+    <tocsect3 name="uninitialized_fill_n" url="uninitialized_fill_n.html"/>
     <tocsect3 name="temporary_buffer" url="temporary_buffer.html"/>
     <tocsect3 name="get_temporary_buffer" url="get_temporary_buffer.html"/>
     <tocsect3 name="return_temporary_buffer" url="return_temporary_buffer.html"/>