Make naming consistent

65 files changed, 268 insertions, 268 deletions

diff --git a/TODO.markdown b/TODO.markdown
deleted file mode 100644
index e10ee46..0000000
--- a/TODO.markdown
+++ /dev/null
@@ -1,128 +0,0 @@
-# Todo
-
-This is just a simple TODO list to follow progress of the port from
-gstreamer.com content to hotdoc
-
-Pages to review:
-   - Basic+tutorial+2+GStreamer+concepts.markdown
-   - Basic+tutorial+3+Dynamic+pipelines.markdown
-   - Basic+tutorial+4+Time+management.markdown
-   - Basic+tutorial+6+Media+formats+and+Pad+Capabilities.markdown
-   - Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown
-   - Basic+tutorial+8+Short-cutting+the+pipeline.markdown
-   - Basic+tutorial+9+Media+information+gathering.markdown
-   - Basic+tutorial+10+GStreamer+tools.markdown
-   - Basic+tutorial+11+Debugging+tools.markdown
-   - Basic+tutorial+12+Streaming.markdown
-   - Basic+tutorial+13+Playback+speed.markdown
-   - Basic+tutorial+14+Handy+elements.markdown
-   - Basic+tutorial+15+Clutter+integration.markdown
-   - Basic+tutorial+16+Platform-specific+elements.markdown
- - Playback+tutorials.markdown
-   - Playback+tutorial+2+Subtitle+management.markdown
-   - Playback+tutorial+3+Short-cutting+the+pipeline.markdown
-   - Playback+tutorial+4+Progressive+streaming.markdown
-   - Playback+tutorial+5+Color+Balance.markdown
-   - Playback+tutorial+6+Audio+visualization.markdown
-   - Playback+tutorial+7+Custom+playbin+sinks.markdown
-   - Playback+tutorial+8+Hardware-accelerated+video+decoding.markdown
-   - Playback+tutorial+9+Digital+audio+pass-through.markdown
- - Android+tutorials.markdown
-   - Android+tutorial+3+Video.markdown
-   - Android+tutorial+4+A+basic+media+player.markdown
-   - Android+tutorial+5+A+Complete+media+player.markdown
- - iOS+tutorials.markdown
-   - iOS+tutorial+1+Link+against+GStreamer.markdown
-   - iOS+tutorial+2+A+running+pipeline.markdown
-   - iOS+tutorial+3+Video.markdown
-   - iOS+tutorial+4+A+basic+media+player.markdown
- - [installing]
-   - Installing+for+iOS+development.markdown
-   - Installing+on+Linux.markdown
-   - Installing+on+Mac+OS+X.markdown
-   - Installing+on+Windows.markdown
- - Deploying+your+application.markdown
-   - Windows+deployment.markdown
-   - Mac+OS+X+deployment.markdown
-   - Multiplatform+deployment+using+Cerbero.markdown
- - Legal+information.markdown
- - GStreamer+reference.markdown
-
-
-Screenshots:
- - Create new ones with the official GStreamer logo and not saying "0.10.36". Affected:
-   - Android tutorial 1
-   - Android tutorial 2
- - Fix filenames of all attachments to make sense
-
-Code:
- - Change namespace from com.gst\* to org.freedesktop.gstreamer
- - Change logos to the official gstreamer logo
-
-Reviewed pages:
- - Home.markdown
- - Basic+tutorials.markdown
- - Installing+the+SDK.markdown
- - Installing+for+Android+development.markdown
- - Building+from+source+using+Cerbero.markdown
- - Table+of+Concepts.markdown
- - Tutorials.markdown
- - Android+tutorial+1+Link+against+GStreamer.markdown
- - Android+tutorial+2+A+running+pipeline.markdown
- - GStreamer+reference.markdown
- - Playback+tutorial+1+Playbin+usage.markdown
- - Basic+tutorial+1+Hello+world.markdown
- - gst-inspect.markdown
- - gst-launch.markdown
-
-For-later pages:
- - Qt+tutorials.markdown [tpm: this should all be rewritten from scratch with qmlglsink; QtGStreamer is outdated and unmaintained, we should not promote it]
-   - Basic+Media+Player.markdown
-   - QtGStreamer+vs+C+GStreamer.markdown
-   - Using+appsink%2Fappsrc+in+Qt.markdown
-
-
-Deleted pages:
- - 2012.11+Brahmaputra.markdown
- - 2012.5+Amazon.markdown
- - 2012.7+Amazon+%28Bugfix+Release+1%29.markdown
- - 2012.9+Amazon+%28Bugfix+Release+2%29.markdown
- - 2013.6+Congo.markdown
- - Contact.markdown
- - Frequently+Asked+Questions.markdown
- - Releases.markdown
- - Upcoming+tutorials.markdown
-
-
-old sitemap:
-
-        Installing the SDK
-            Installing on Linux
-            Installing on Mac OS X
-            Installing on Windows
-            Installing for Android development
-            Installing for iOS development
-            Building from source using Cerbero
-        Tutorials
-            Basic tutorials
-            Playback tutorials
-            Android tutorials
-            iOS tutorials
-            Table of Concepts
-            Upcoming tutorials
-        Deploying your application
-            Mac OS X deployment
-            Windows deployment
-            Multiplatform deployment using Cerbero
-        Releases
-            2013.6 Congo
-            2012.11 Brahmaputra
-            2012.9 Amazon (Bugfix Release 2)
-            2012.7 Amazon (Bugfix Release 1)
-            2012.5 Amazon
-        GStreamer reference
-            gst-inspect
-            gst-launch
-        Legal information
-        Frequently Asked Questions
-        Contact 
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..cfc2512
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,128 @@
+# Todo
+
+This is just a simple TODO list to follow progress of the port from
+gstreamer.com content to hotdoc
+
+Pages to review:
+   - sdk-basic-tutorial-concepts.md
+   - sdk-basic-tutorial-dynamic-pipelines.md
+   - sdk-basic-tutorial-time-management.md
+   - sdk-basic-tutorial-media-formats-and-pad-capabilities.md
+   - sdk-basic-tutorial-multithreading-and-pad-availability.md
+   - sdk-basic-tutorial-short-cutting-the-pipeline.md
+   - sdk-basic-tutorial-media-information-gathering.md
+   - sdk-basic-tutorial-gstreamer-tools.md
+   - sdk-basic-tutorial-debugging-tools.md
+   - sdk-basic-tutorial-streaming.md
+   - sdk-basic-tutorial-playback-speed.md
+   - sdk-basic-tutorial-handy-elements.md
+   - sdk-basic-tutorial-clutter-integration.md
+   - sdk-basic-tutorial-platform-specific-elements.md
+ - sdk-playback-tutorials.md
+   - sdk-playback-tutorial-subtitle-management.md
+   - sdk-playback-tutorial-short-cutting-the-pipeline.md
+   - sdk-playback-tutorial-progressive-streaming.md
+   - sdk-playback-tutorial-color-balance.md
+   - sdk-playback-tutorial-audio-visualization.md
+   - sdk-playback-tutorial-custom-playbin-sinks.md
+   - sdk-playback-tutorial-hardware-accelerated-video-decoding.md
+   - sdk-playback-tutorial-digital-audio-pass-through.md
+ - sdk-android-tutorials.md
+   - sdk-android-tutorial-video.md
+   - sdk-android-tutorial-media-player.md
+   - sdk-android-tutorial-a-complete-media-player.md
+ - sdk-ios-tutorials.md
+   - sdk-ios-tutorial-link-against-gstreamer.md
+   - sdk-ios-tutorial-a-running-pipeline.md
+   - sdk-ios-tutorial-video.md
+   - sdk-ios-tutorial-a-basic-media-player.md
+ - [installing]
+   - sdk-installing-for-ios-development.md
+   - sdk-installing-on-linux.md
+   - sdk-installing-on-mac-osx.md
+   - sdk-installing-on-windows.md
+ - sdk-deploying-your-application.md
+   - sdk-windows-deployment.md
+   - sdk-mac-osx-deployment.md
+   - sdk-multiplatform-deployment-using-cerbero.md
+ - sdk-legal-information.md
+ - sdk-api-reference.md
+
+
+Screenshots:
+ - Create new ones with the official GStreamer logo and not saying "0.10.36". Affected:
+   - Android tutorial 1
+   - Android tutorial 2
+ - Fix filenames of all attachments to make sense
+
+Code:
+ - Change namespace from com.gst\* to org.freedesktop.gstreamer
+ - Change logos to the official gstreamer logo
+
+Reviewed pages:
+ - index.md
+ - sdk-basic-tutorials.md
+ - sdk-installing.md
+ - sdk-installing-for-android-development.md
+ - sdk-building-from-source-using-cerbero.md
+ - sdk-table-of-concepts.md
+ - sdk-tutorials.md
+ - sdk-android-tutorial-link-against-gstreamer.md
+ - sdk-android-tutorial-a-running-pipeline.md
+ - sdk-api-reference.md
+ - sdk-playback-tutorial-playbin-usage.md
+ - sdk-basic-tutorial-hello-world.md
+ - sdk-gst-inspect.md
+ - gst-launch.md
+
+For-later pages:
+ - sdk-qt-tutorials.md [tpm: this should all be rewritten from scratch with qmlglsink; QtGStreamer is outdated and unmaintained, we should not promote it]
+   - sdk-basic-media-player.md
+   - sdk-qt-gstreamer-vs-c-gstreamer.md
+   - sdk-using-appsink-appsrc-in-qt.md
+
+
+Deleted pages:
+ - 2012.11+Brahmaputra.markdown
+ - 2012.5+Amazon.markdown
+ - 2012.7+Amazon+%28Bugfix+Release+1%29.markdown
+ - 2012.9+Amazon+%28Bugfix+Release+2%29.markdown
+ - 2013.6+Congo.markdown
+ - Contact.markdown
+ - Frequently+Asked+Questions.markdown
+ - Releases.markdown
+ - Upcoming+tutorials.markdown
+
+
+old sitemap:
+
+        Installing the SDK
+            Installing on Linux
+            Installing on Mac OS X
+            Installing on Windows
+            Installing for Android development
+            Installing for iOS development
+            Building from source using Cerbero
+        Tutorials
+            Basic tutorials
+            Playback tutorials
+            Android tutorials
+            iOS tutorials
+            Table of Concepts
+            Upcoming tutorials
+        Deploying your application
+            Mac OS X deployment
+            Windows deployment
+            Multiplatform deployment using Cerbero
+        Releases
+            2013.6 Congo
+            2012.11 Brahmaputra
+            2012.9 Amazon (Bugfix Release 2)
+            2012.7 Amazon (Bugfix Release 1)
+            2012.5 Amazon
+        GStreamer reference
+            gst-inspect
+            gst-launch
+        Legal information
+        Frequently Asked Questions
+        Contact 
diff --git a/gst-launch.markdown b/gst-launch.md
index 40a1cde..40a1cde 100644
--- a/gst-launch.markdown
+++ b/gst-launch.md
diff --git a/hotdoc.json b/hotdoc.json
index 4c77087..c4e2bee 100644
--- a/hotdoc.json
+++ b/hotdoc.json
@@ -1,7 +1,7 @@
 {
     "add_anchors": true, 
     "command": "conf", 
-    "index": "Home.markdown", 
+    "index": "index.md", 
     "output": "built_doc", 
     "project_name": "gstdotcom", 
     "sitemap": "sitemap.txt",
diff --git a/Home.markdown b/index.md
index eed8257..eed8257 100644
--- a/Home.markdown
+++ b/index.md
diff --git a/Android+tutorial+5+A+Complete+media+player.markdown b/sdk-android-tutorial-a-complete-media-player.md
index 2e76b9d..2e76b9d 100644
--- a/Android+tutorial+5+A+Complete+media+player.markdown
+++ b/sdk-android-tutorial-a-complete-media-player.md
diff --git a/Android+tutorial+2+A+running+pipeline.markdown b/sdk-android-tutorial-a-running-pipeline.md
index fe31f91..fe31f91 100644
--- a/Android+tutorial+2+A+running+pipeline.markdown
+++ b/sdk-android-tutorial-a-running-pipeline.md
diff --git a/Android+tutorial+1+Link+against+GStreamer.markdown b/sdk-android-tutorial-link-against-gstreamer.md
index 53adac5..53adac5 100644
--- a/Android+tutorial+1+Link+against+GStreamer.markdown
+++ b/sdk-android-tutorial-link-against-gstreamer.md
diff --git a/Android+tutorial+4+A+basic+media+player.markdown b/sdk-android-tutorial-media-player.md
index 45bf347..45bf347 100644
--- a/Android+tutorial+4+A+basic+media+player.markdown
+++ b/sdk-android-tutorial-media-player.md
diff --git a/Android+tutorial+3+Video.markdown b/sdk-android-tutorial-video.md
index 111c311..111c311 100644
--- a/Android+tutorial+3+Video.markdown
+++ b/sdk-android-tutorial-video.md
diff --git a/Android+tutorials.markdown b/sdk-android-tutorials.md
index 3982e71..3982e71 100644
--- a/Android+tutorials.markdown
+++ b/sdk-android-tutorials.md
diff --git a/GStreamer+reference.markdown b/sdk-api-reference.md
index 13b0157..13b0157 100644
--- a/GStreamer+reference.markdown
+++ b/sdk-api-reference.md
diff --git a/Basic+Media+Player.markdown b/sdk-basic-media-player.md
index 0951700..0951700 100644
--- a/Basic+Media+Player.markdown
+++ b/sdk-basic-media-player.md
diff --git a/Basic+tutorial+15+Clutter+integration.markdown b/sdk-basic-tutorial-clutter-integration.md
index 2bb616d..2bb616d 100644
--- a/Basic+tutorial+15+Clutter+integration.markdown
+++ b/sdk-basic-tutorial-clutter-integration.md
diff --git a/Basic+tutorial+2+GStreamer+concepts.markdown b/sdk-basic-tutorial-concepts.md
index 1d87be5..0d30f29 100644
--- a/Basic+tutorial+2+GStreamer+concepts.markdown
+++ b/sdk-basic-tutorial-concepts.md
@@ -104,11 +104,11 @@ int main(int argc, char *argv[]) {
 > ![Information](images/icons/emoticons/information.png)
 > Need help?
 >
-> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Build), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Build) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Build), or use this specific command on Linux:
+> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Build), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Build) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Build), or use this specific command on Linux:
 >
 > `` gcc basic-tutorial-2.c -o basic-tutorial-2 `pkg-config --cflags --libs gstreamer-1.0` ``
 >
->If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Run), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Run) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Run).
+>If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Run), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Run) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Run).
 >
 >This tutorial opens a window and displays a test pattern, without audio
 >
@@ -139,9 +139,9 @@ sink = gst_element_factory_make ("autovideosink", "sink");
 As seen in this code, new elements can be created
 with `gst_element_factory_make()`. The first parameter is the type of
 element to create ([Basic tutorial 14: Handy
-elements](Basic+tutorial+14+Handy+elements.markdown) shows a
+elements](sdk-basic-tutorial-handy-elements.md) shows a
 few common types, and [Basic tutorial 10: GStreamer
-tools](Basic+tutorial+10+GStreamer+tools.markdown) shows how to
+tools](sdk-basic-tutorial-gstreamer-tools.md) shows how to
 obtain the list of all available types). The second parameter is the
 name we want to give to this particular instance. Naming your elements
 is useful to retrieve them later if you didn't keep a pointer (and for
@@ -225,7 +225,7 @@ values!
 
 The names and possible values of all the properties an element exposes
 can be found using the gst-inspect-1.0 tool described in [Basic tutorial 10:
-GStreamer tools](Basic+tutorial+10+GStreamer+tools.markdown).
+GStreamer tools](sdk-basic-tutorial-gstreamer-tools.md).
 
 ### Error checking
 
@@ -246,7 +246,7 @@ if (ret == GST_STATE_CHANGE_FAILURE) {
 We call `gst_element_set_state()`, but this time we check its return
 value for errors. Changing states is a delicate process and a few more
 details are given in [Basic tutorial 3: Dynamic
-pipelines](Basic+tutorial+3+Dynamic+pipelines.markdown).
+pipelines](sdk-basic-tutorial-dynamic-pipelines.md).
 
 ```
 /* Wait until error or EOS */
@@ -311,7 +311,7 @@ playback-related issues.
 
 The rest of the code is the cleanup sequence, which is the same as
 in [Basic tutorial 1: Hello
-world!](Basic+tutorial+1+Hello+world.markdown).
+world!](sdk-basic-tutorial-hello-world.md).
 
 ## Exercise
 
@@ -324,11 +324,11 @@ Depending on your platform and available plugins, you might get a
 “negotiation” error, because the sink does not understand what the
 filter is producing (more about negotiation in [Basic tutorial 6: Media
 formats and Pad
-Capabilities](Basic+tutorial+6+Media+formats+and+Pad+Capabilities.markdown)).
+Capabilities](sdk-basic-tutorial-media-formats-and-pad-capabilities.md)).
 In this case, try to add an element called `videoconvert` after the
 filter (this is, build a pipeline of 4 elements. More on
 `videoconvert` in [Basic tutorial 14: Handy
-elements](Basic+tutorial+14+Handy+elements.markdown)).
+elements](sdk-basic-tutorial-handy-elements.md)).
 
 ## Conclusion
 
diff --git a/Basic+tutorial+11+Debugging+tools.markdown b/sdk-basic-tutorial-debugging-tools.md
index 4e5c160..4e5c160 100644
--- a/Basic+tutorial+11+Debugging+tools.markdown
+++ b/sdk-basic-tutorial-debugging-tools.md
diff --git a/Basic+tutorial+3+Dynamic+pipelines.markdown b/sdk-basic-tutorial-dynamic-pipelines.md
index d2a377f..819b42f 100644
--- a/Basic+tutorial+3+Dynamic+pipelines.markdown
+++ b/sdk-basic-tutorial-dynamic-pipelines.md
@@ -240,10 +240,10 @@ exit:
 > ![Information](images/icons/emoticons/information.png)
 > Need help?
 >
-> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Build), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Build) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Build), or use this specific command on Linux:
+> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Build), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Build) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Build), or use this specific command on Linux:
 > ``gcc basic-tutorial-3.c -o basic-tutorial-3 `pkg-config --cflags --libs gstreamer-1.0` ``
 >
->If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Run), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Run) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Run).
+>If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Run), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Run) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Run).
 >
 > This tutorial only plays audio. The media is fetched from the Internet, so it might take a few seconds to start, depending on your connection speed.
 >
@@ -338,7 +338,7 @@ for this purpose.
 The signals that a `GstElement` generates can be found in its
 documentation or using the `gst-inspect-1.0` tool as described in [Basic
 tutorial 10: GStreamer
-tools](Basic+tutorial+10+GStreamer+tools.markdown).
+tools](sdk-basic-tutorial-gstreamer-tools.md).
 
 We are now ready to go! Just set the pipeline to the PLAYING state and
 start listening to the bus for interesting messages (like ERROR or EOS),
@@ -493,10 +493,10 @@ front) and link it to the demuxer when the right pad appears. Hint: You
 are already printing on screen the type of the video pads.
 
 You should now see (and hear) the same movie as in [Basic tutorial 1:
-Hello world!](Basic+tutorial+1+Hello+world.markdown). In
+Hello world!](sdk-basic-tutorial-hello-world.md). In
 that tutorial you used `playbin`, which is a handy element that
 automatically takes care of all the demuxing and pad linking for you.
-Most of the [Playback tutorials](Playback+tutorials.markdown) are devoted
+Most of the [Playback tutorials](sdk-playback-tutorials.md) are devoted
 to `playbin`.
 
 ## Conclusion
@@ -513,8 +513,8 @@ media was available.
 
 You can now continue with the basic tutorials and learn about performing
 seeks and time-related queries in [Basic tutorial 4: Time
-management](Basic+tutorial+4+Time+management.markdown) or move
-to the [Playback tutorials](Playback+tutorials.markdown), and gain more
+management](sdk-basic-tutorial-time-management.md) or move
+to the [Playback tutorials](sdk-playback-tutorials.md), and gain more
 insight about the `playbin` element.
 
 Remember that attached to this page you should find the complete source
diff --git a/Basic+tutorial+10+GStreamer+tools.markdown b/sdk-basic-tutorial-gstreamer-tools.md
index df9ff09..df9ff09 100644
--- a/Basic+tutorial+10+GStreamer+tools.markdown
+++ b/sdk-basic-tutorial-gstreamer-tools.md
diff --git a/Basic+tutorial+14+Handy+elements.markdown b/sdk-basic-tutorial-handy-elements.md
index a2c346f..a2c346f 100644
--- a/Basic+tutorial+14+Handy+elements.markdown
+++ b/sdk-basic-tutorial-handy-elements.md
diff --git a/Basic+tutorial+1+Hello+world.markdown b/sdk-basic-tutorial-hello-world.md
index 9e5ebd3..923743d 100644
--- a/Basic+tutorial+1+Hello+world.markdown
+++ b/sdk-basic-tutorial-hello-world.md
@@ -220,17 +220,17 @@ and show you how to build a pipeline manually.
 
 It has been a pleasure having you here, and see you soon!
 
-  [Installing on Linux]: Installing+on+Linux.markdown
-  [Installing on Mac OS X]: Installing+on+Mac+OS+X.markdown
-  [Installing on Windows]: Installing+on+Windows.markdown
+  [Installing on Linux]: sdk-installing-on-linux.md
+  [Installing on Mac OS X]: sdk-installing-on-mac-osx.md
+  [Installing on Windows]: sdk-installing-on-windows.md
   [Information]: images/icons/emoticons/information.png
-  [Linux]: Installing+on+Linux.markdown#InstallingonLinux-Build
-  [Mac OS X]: Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Build
-  [Windows]: Installing+on+Windows.markdown#InstallingonWindows-Build
-  [1]: Installing+on+Linux.markdown#InstallingonLinux-Run
-  [2]: Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Run
-  [3]: Installing+on+Windows.markdown#InstallingonWindows-Run
-  [Basic tutorial 12: Streaming]: Basic+tutorial+12+Streaming.markdown
-  [Basic tutorial 10: GStreamer tools]: Basic+tutorial+10+GStreamer+tools.markdown
-  [Basic tutorial 2: GStreamer concepts]: Basic+tutorial+2+GStreamer+concepts.markdown
-  [Basic tutorial 3: Dynamic pipelines]: Basic+tutorial+3+Dynamic+pipelines.markdown
+  [Linux]: sdk-installing-on-linux.md#InstallingonLinux-Build
+  [Mac OS X]: sdk-installing-on-mac-osx.md#InstallingonMacOSX-Build
+  [Windows]: sdk-installing-on-windows.md#InstallingonWindows-Build
+  [1]: sdk-installing-on-linux.md#InstallingonLinux-Run
+  [2]: sdk-installing-on-mac-osx.md#InstallingonMacOSX-Run
+  [3]: sdk-installing-on-windows.md#InstallingonWindows-Run
+  [Basic tutorial 12: Streaming]: sdk-basic-tutorial-streaming.md
+  [Basic tutorial 10: GStreamer tools]: sdk-basic-tutorial-gstreamer-tools.md
+  [Basic tutorial 2: GStreamer concepts]: sdk-basic-tutorial-concepts.md
+  [Basic tutorial 3: Dynamic pipelines]: sdk-basic-tutorial-dynamic-pipelines.md
diff --git a/Basic+tutorial+6+Media+formats+and+Pad+Capabilities.markdown b/sdk-basic-tutorial-media-formats-and-pad-capabilities.md
index a6cba2e..44d5cd3 100644
--- a/Basic+tutorial+6+Media+formats+and+Pad+Capabilities.markdown
+++ b/sdk-basic-tutorial-media-formats-and-pad-capabilities.md
@@ -100,7 +100,7 @@ indicate different packing and subsampling of the image planes.
 ### Last remarks
 
 You can use the `gst-inspect-1.0` tool described in [Basic tutorial 10:
-GStreamer tools](Basic+tutorial+10+GStreamer+tools.markdown) to
+GStreamer tools](sdk-basic-tutorial-gstreamer-tools.md) to
 learn about the Caps of any GStreamer element.
 
 Bear in mind that some elements query the underlying hardware for
@@ -335,11 +335,11 @@ int main(int argc, char *argv[]) {
 > ![Information](images/icons/emoticons/information.png)
 > Need help?
 >
-> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Build), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Build) or [Windows](Installing+on+Windows.markdownb#InstallingonWindows-Build), or use this specific command on Linux:
+> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Build), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Build) or [Windows](sdk-installing-on-windows.mdb#InstallingonWindows-Build), or use this specific command on Linux:
 >
 > `` gcc basic-tutorial-6.c -o basic-tutorial-6 `pkg-config --cflags --libs gstreamer-1.0` ``
 >
->If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Run), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Run) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Run).
+>If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Run), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Run) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Run).
 >
 > This tutorial simply displays information regarding the Pad Capabilities in different time instants.
 >
@@ -466,7 +466,7 @@ This tutorial has shown:
 
   - That Pad Caps can be found using the `gst-inspect-1.0` tool described
     in [Basic tutorial 10: GStreamer
-    tools](Basic+tutorial+10+GStreamer+tools.markdown).
+    tools](sdk-basic-tutorial-gstreamer-tools.md).
 
 Next tutorial shows how data can be manually injected into and extracted
 from the GStreamer pipeline.
diff --git a/Basic+tutorial+9+Media+information+gathering.markdown b/sdk-basic-tutorial-media-information-gathering.md
index 04fa816..04fa816 100644
--- a/Basic+tutorial+9+Media+information+gathering.markdown
+++ b/sdk-basic-tutorial-media-information-gathering.md
diff --git a/Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown b/sdk-basic-tutorial-multithreading-and-pad-availability.md
index 3614664..e47d187 100644
--- a/Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown
+++ b/sdk-basic-tutorial-multithreading-and-pad-availability.md
@@ -56,7 +56,7 @@ there is only one thread, being blocked by the first sink.
 ### Request pads
 
 In [Basic tutorial 3: Dynamic
-pipelines](Basic+tutorial+3+Dynamic+pipelines.markdown) we saw
+pipelines](sdk-basic-tutorial-dynamic-pipelines.md) we saw
 an element (`uridecodebin`) which had no pads to begin with, and they
 appeared as data started to flow and the element learned about the
 media. These are called **Sometimes Pads**, and contrast with the
@@ -179,11 +179,11 @@ int main(int argc, char *argv[]) {
 > ![Information](images/icons/emoticons/information.png)
 > Need help?
 >
-> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Build), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Build) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Build), or use this specific command on Linux:
+> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Build), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Build) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Build), or use this specific command on Linux:
 >
 > ``gcc basic-tutorial-7.c -o basic-tutorial-7 `pkg-config --cflags --libs gstreamer-1.0` ``
 >
->If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Run), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Run) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Run).
+>If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Run), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Run) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Run).
  >
 > This tutorial plays an audible tone through the audio card and opens a window with a waveform representation of the tone. The waveform should be a sinusoid, but due to the refreshing of the window might not appear so.
 >
@@ -231,7 +231,7 @@ Small adjustments for better demonstration: The “freq” property of
 appear almost stationary in the window), and this style and shader for
 `wavescope` make the wave continuous. Use the `gst-inspect-1.0` tool
 described in [Basic tutorial 10: GStreamer
-tools](Basic+tutorial+10+GStreamer+tools.markdown) to learn all
+tools](sdk-basic-tutorial-gstreamer-tools.md) to learn all
 the properties of these
 elements.
 
diff --git a/Basic+tutorial+16+Platform-specific+elements.markdown b/sdk-basic-tutorial-platform-specific-elements.md
index 1eface4..1eface4 100644
--- a/Basic+tutorial+16+Platform-specific+elements.markdown
+++ b/sdk-basic-tutorial-platform-specific-elements.md
diff --git a/Basic+tutorial+13+Playback+speed.markdown b/sdk-basic-tutorial-playback-speed.md
index d868fec..d868fec 100644
--- a/Basic+tutorial+13+Playback+speed.markdown
+++ b/sdk-basic-tutorial-playback-speed.md
diff --git a/Basic+tutorial+8+Short-cutting+the+pipeline.markdown b/sdk-basic-tutorial-short-cutting-the-pipeline.md
index 6871533..735a112 100644
--- a/Basic+tutorial+8+Short-cutting+the+pipeline.markdown
+++ b/sdk-basic-tutorial-short-cutting-the-pipeline.md
@@ -13,7 +13,7 @@ any time, in a variety of ways. This tutorial shows:
   - How to access and manipulate this data.
 
 [Playback tutorial 3: Short-cutting the
-pipeline](Playback+tutorial+3+Short-cutting+the+pipeline.markdown) explains
+pipeline](sdk-playback-tutorial-short-cutting-the-pipeline.md) explains
 how to achieve the same goals in a playbin-based pipeline.
 
 ## Introduction
@@ -70,7 +70,7 @@ this simplified vision should suffice for now.
 As an example, a `filesrc` (a GStreamer element that reads files)
 produces buffers with the “ANY” caps and no time-stamping information.
 After demuxing (see [Basic tutorial 3: Dynamic
-pipelines](Basic+tutorial+3+Dynamic+pipelines.markdown))
+pipelines](sdk-basic-tutorial-dynamic-pipelines.md))
 buffers can have some specific caps, for example “video/x-h264”. After
 decoding, each buffer will contain a single video frame with raw caps
 (for example, “video/x-raw-yuv”) and very precise time stamps indicating
@@ -79,7 +79,7 @@ when should that frame be displayed.
 ### This tutorial
 
 This tutorial expands [Basic tutorial 7: Multithreading and Pad
-Availability](Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown) in
+Availability](sdk-basic-tutorial-multithreading-and-pad-availability.md) in
 two ways: firstly, the `audiotestsrc` is replaced by an `appsrc` that
 will generate the audio data. Secondly, a new branch is added to the
 `tee` so data going into the audio sink and the wave display is also
@@ -335,11 +335,11 @@ int main(int argc, char *argv[]) {
 > ![Information](images/icons/emoticons/information.png)
 > Need help?
 >
-> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Build), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Build) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Build), or use this specific command on Linux:
+> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Build), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Build) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Build), or use this specific command on Linux:
 >
 > `` gcc basic-tutorial-8.c -o basic-tutorial-8 `pkg-config --cflags --libs gstreamer-1.0 gst-audio-1.0` ``
 >
->If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Run), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Run) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Run).
+>If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Run), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Run) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Run).
 >
 > This tutorial plays an audible tone for varying frequency through the audio card and opens a window with a waveform representation of the tone. The waveform should be a sinusoid, but due to the refreshing of the window might not appear so.
 >
@@ -349,7 +349,7 @@ int main(int argc, char *argv[]) {
 
 The code to create the pipeline (Lines 131 to 205) is an enlarged
 version of [Basic tutorial 7: Multithreading and Pad
-Availability](Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown).
+Availability](sdk-basic-tutorial-multithreading-and-pad-availability.md).
 It involves instantiating all the elements, link the elements with
 Always Pads, and manually link the Request Pads of the `tee` element.
 
@@ -500,7 +500,7 @@ gst_buffer_unref (buffer);
 Once we have the buffer ready, we pass it to `appsrc` with the
 `push-buffer` action signal (see information box at the end of [Playback
 tutorial 1: Playbin
-usage](Playback+tutorial+1+Playbin+usage.markdown)), and then
+usage](sdk-playback-tutorial-playbin-usage.md)), and then
 `gst_buffer_unref()` it since we no longer need it.
 
 ``` lang=c
@@ -540,7 +540,7 @@ This tutorial has shown how applications can:
 
 In a playbin-based pipeline, the same goals are achieved in a slightly
 different way. [Playback tutorial 3: Short-cutting the
-pipeline](Playback+tutorial+3+Short-cutting+the+pipeline.markdown) shows
+pipeline](sdk-playback-tutorial-short-cutting-the-pipeline.md) shows
 how to do it.
 
 It has been a pleasure having you here, and see you soon\!
diff --git a/Basic+tutorial+12+Streaming.markdown b/sdk-basic-tutorial-streaming.md
index 04af13e..04af13e 100644
--- a/Basic+tutorial+12+Streaming.markdown
+++ b/sdk-basic-tutorial-streaming.md
diff --git a/Basic+tutorial+4+Time+management.markdown b/sdk-basic-tutorial-time-management.md
index f3c38fb..42532db 100644
--- a/Basic+tutorial+4+Time+management.markdown
+++ b/sdk-basic-tutorial-time-management.md
@@ -197,11 +197,11 @@ static void handle_message (CustomData *data, GstMessage *msg) {
 > ![Information](images/icons/emoticons/information.png)
 > Need help?
 >
-> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Build), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Build) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Build), or use this specific command on Linux:
+> If you need help to compile this code, refer to the **Building the tutorials**  section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Build), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Build) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Build), or use this specific command on Linux:
 >
 > ``gcc basic-tutorial-4.c -o basic-tutorial-4 `pkg-config --cflags --libs gstreamer-1.0` ``
 >
->If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](Installing+on+Linux.markdown#InstallingonLinux-Run), [Mac OS X](Installing+on+Mac+OS+X.markdown#InstallingonMacOSX-Run) or [Windows](Installing+on+Windows.markdown#InstallingonWindows-Run).
+>If you need help to run this code, refer to the **Running the tutorials** section for your platform: [Linux](sdk-installing-on-linux.md#InstallingonLinux-Run), [Mac OS X](sdk-installing-on-mac-osx.md#InstallingonMacOSX-Run) or [Windows](sdk-installing-on-windows.md#InstallingonWindows-Run).
 >
 > This tutorial opens a window and displays a movie, with accompanying audio. The media is fetched from the Internet, so the window might take a few seconds to appear, depending on your connection speed. 10 seconds into the movie it skips to a new position
 >
@@ -231,7 +231,7 @@ move the message handling code to its own function
 
 We would then build a pipeline composed of a single element, a
 `playbin`, which we already saw in [Basic tutorial 1: Hello
-world!](Basic+tutorial+1+Hello+world.markdown). However,
+world!](sdk-basic-tutorial-hello-world.md). However,
 `playbin` is in itself a pipeline, and in this case it is the only
 element in the pipeline, so we use directly the `playbin` element. We
 will skip the details: the URI of the clip is given to `playbin` via
diff --git a/Basic+tutorial+5+GUI+toolkit+integration.markdown b/sdk-basic-tutorial-toolkit-integration.md
index 2c92081..4fb02cd 100644
--- a/Basic+tutorial+5+GUI+toolkit+integration.markdown
+++ b/sdk-basic-tutorial-toolkit-integration.md
@@ -465,7 +465,7 @@ int main(int argc, char *argv[]) {
 > This tutorial opens a GTK+ window and displays a movie, with accompanying audio. The media is fetched from the Internet, so the window might take a few seconds to appear, depending on your connection speed. The Window has some GTK+ buttons to Pause, Stop and Play the movie, and a slider to show the current position of the stream, which can be dragged to change it. Also, information about the stream is shown on a column at the right edge of the window.
 >
 >
-> Bear in mind that there is no latency management (buffering), so on slow connections, the movie might stop after a few seconds. See how [Basic tutorial 12: Streaming](Basic+tutorial+12+Streaming.markdown) solves this issue.
+> Bear in mind that there is no latency management (buffering), so on slow connections, the movie might stop after a few seconds. See how [Basic tutorial 12: Streaming](sdk-basic-tutorial-streaming.md) solves this issue.
 >
 > Required libraries: `gstreamer-video-1.0 gtk+-3.0 gstreamer-1.0`
 
@@ -563,7 +563,7 @@ gst_object_unref (bus);
 ```
 
 In [Playback tutorial 1: Playbin
-usage](Playback+tutorial+1+Playbin+usage.markdown), `gst_bus_add_watch()` is
+usage](sdk-playback-tutorial-playbin-usage.md), `gst_bus_add_watch()` is
 used to register a function that receives every message posted to the
 GStreamer bus. We can achieve a finer granularity by using signals
 instead, which allow us to register only to the messages we are
diff --git a/Basic+tutorials.markdown b/sdk-basic-tutorials.md
index e188d15..e188d15 100644
--- a/Basic+tutorials.markdown
+++ b/sdk-basic-tutorials.md
diff --git a/Building+from+source+using+Cerbero.markdown b/sdk-building-from-source-using-cerbero.md
index a335156..9ae0857 100644
--- a/Building+from+source+using+Cerbero.markdown
+++ b/sdk-building-from-source-using-cerbero.md
@@ -238,4 +238,4 @@ To cross compile for iOS from OS X, use the configuration file
   [Windows Driver Kit 7.1.0]: http://msdn.microsoft.com/en-us/windows/hardware/hh852365
   [XCode]: https://developer.apple.com/devcenter/ios/index.action#downloads
   [here]: http://www.freedesktop.org/software/gstreamer-sdk/cerbero.cbc.template
-  [Installing the SDK]: Installing+the+SDK.markdown
+  [Installing the SDK]: sdk-installing.md
diff --git a/Deploying+your+application.markdown b/sdk-deploying-your-application.md
index 5100554..5100554 100644
--- a/Deploying+your+application.markdown
+++ b/sdk-deploying-your-application.md
diff --git a/gst-inspect.markdown b/sdk-gst-inspect.md
index 78574cd..78574cd 100644
--- a/gst-inspect.markdown
+++ b/sdk-gst-inspect.md
diff --git a/Installing+for+Android+development.markdown b/sdk-installing-for-android-development.md
index 5a35eca..7158bf1 100644
--- a/Installing+for+Android+development.markdown
+++ b/sdk-installing-for-android-development.md
@@ -266,7 +266,7 @@ and used as follows:
 | `GSTREAMER_PLUGINS_CODECS_GPL` | assrender                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 | `GSTREAMER_PLUGINS_SYS`        | glimagesink opensles amc                                                                                                                                                                                                                                                                                                                                                                                                                           |
 
-Build and run your application as explained in the [Building the tutorial](Installing+for+Android+development.markdown#building-the-tutorials) section.
+Build and run your application as explained in the [Building the tutorial](sdk-installing-for-android-development.md#building-the-tutorials) section.
 
   [information]: images/icons/emoticons/information.png
   [Android SDK]: http://developer.android.com/sdk/index.html
diff --git a/Installing+for+iOS+development.markdown b/sdk-installing-for-ios-development.md
index a555913..82102bd 100644
--- a/Installing+for+iOS+development.markdown
+++ b/sdk-installing-for-ios-development.md
@@ -87,4 +87,4 @@ keep development consistent across all the platforms the SDK supports.
 Once a project has been created using a GStreamer SDK Template, it is
 ready to build and run. All necessary infrastructure is already in
 place. To understand what files have been created and how they interact,
-take a look at the [iOS tutorials](iOS+tutorials.markdown).
+take a look at the [iOS tutorials](sdk-ios-tutorials.md).
diff --git a/Installing+on+Linux.markdown b/sdk-installing-on-linux.md
index 5c6bb76..5c6bb76 100644
--- a/Installing+on+Linux.markdown
+++ b/sdk-installing-on-linux.md
diff --git a/Installing+on+Mac+OS+X.markdown b/sdk-installing-on-mac-osx.md
index 8350455..8350455 100644
--- a/Installing+on+Mac+OS+X.markdown
+++ b/sdk-installing-on-mac-osx.md
diff --git a/Installing+on+Windows.markdown b/sdk-installing-on-windows.md
index 4a55bcf..4a55bcf 100644
--- a/Installing+on+Windows.markdown
+++ b/sdk-installing-on-windows.md
diff --git a/Installing+the+SDK.markdown b/sdk-installing.md
index a34d46b..7f7e93b 100644
--- a/Installing+the+SDK.markdown
+++ b/sdk-installing.md
@@ -6,10 +6,10 @@ short-description: Download and install GStreamer
 
 ## Choose your platform by clicking on the corresponding logo
 
-[![](attachments/1540163.png)](Installing+on+Mac+OS+X.markdown)
-[![](attachments/1540164.png)](Installing+on+Windows.markdown)
-[![](attachments/2654239.png)](Installing+for+Android+development.markdown)
-[![](attachments/3539150.jpeg)](Installing+for+iOS+development.markdown)
+[![](attachments/1540163.png)](sdk-installing-on-mac-osx.md)
+[![](attachments/1540164.png)](sdk-installing-on-windows.md)
+[![](attachments/2654239.png)](sdk-installing-for-android-development.md)
+[![](attachments/3539150.jpeg)](sdk-installing-for-ios-development.md)
 
 ## Linux
 
@@ -20,4 +20,4 @@ environments, you will just need to make sure you have the development
 packages installed (refer to your distribution documentation for more
 information). If you really want to run the Sdk on Linux, you can
 always follow the instructions to
-[build from source using cerbero](Building+from+source+using+Cerbero.markdown).
+[build from source using cerbero](sdk-building-from-source-using-cerbero.md).
diff --git a/iOS+tutorial+4+A+basic+media+player.markdown b/sdk-ios-tutorial-a-basic-media-player.md
index 55cac27..55cac27 100644
--- a/iOS+tutorial+4+A+basic+media+player.markdown
+++ b/sdk-ios-tutorial-a-basic-media-player.md
diff --git a/iOS+tutorial+5+A+Complete+media+player.markdown b/sdk-ios-tutorial-a-complete-media-player.md
index 5ad28a7..5ad28a7 100644
--- a/iOS+tutorial+5+A+Complete+media+player.markdown
+++ b/sdk-ios-tutorial-a-complete-media-player.md
diff --git a/iOS+tutorial+2+A+running+pipeline.markdown b/sdk-ios-tutorial-a-running-pipeline.md
index fe9aef3..fe9aef3 100644
--- a/iOS+tutorial+2+A+running+pipeline.markdown
+++ b/sdk-ios-tutorial-a-running-pipeline.md
diff --git a/iOS+tutorial+1+Link+against+GStreamer.markdown b/sdk-ios-tutorial-link-against-gstreamer.md
index fdcf19d..fdcf19d 100644
--- a/iOS+tutorial+1+Link+against+GStreamer.markdown
+++ b/sdk-ios-tutorial-link-against-gstreamer.md
diff --git a/iOS+tutorial+3+Video.markdown b/sdk-ios-tutorial-video.md
index c822f7a..c822f7a 100644
--- a/iOS+tutorial+3+Video.markdown
+++ b/sdk-ios-tutorial-video.md
diff --git a/iOS+tutorials.markdown b/sdk-ios-tutorials.md
index 1f48ede..1f48ede 100644
--- a/iOS+tutorials.markdown
+++ b/sdk-ios-tutorials.md
diff --git a/Legal+information.markdown b/sdk-legal-information.md
index 1275885..1275885 100644
--- a/Legal+information.markdown
+++ b/sdk-legal-information.md
diff --git a/Mac+OS+X+deployment.markdown b/sdk-mac-osx-deployment.md
index 09e1025..09e1025 100644
--- a/Mac+OS+X+deployment.markdown
+++ b/sdk-mac-osx-deployment.md
diff --git a/Multiplatform+deployment+using+Cerbero.markdown b/sdk-multiplatform-deployment-using-cerbero.md
index b552661..b552661 100644
--- a/Multiplatform+deployment+using+Cerbero.markdown
+++ b/sdk-multiplatform-deployment-using-cerbero.md
diff --git a/Playback+tutorial+6+Audio+visualization.markdown b/sdk-playback-tutorial-audio-visualization.md
index e3309f5..e3309f5 100644
--- a/Playback+tutorial+6+Audio+visualization.markdown
+++ b/sdk-playback-tutorial-audio-visualization.md
diff --git a/Playback+tutorial+5+Color+Balance.markdown b/sdk-playback-tutorial-color-balance.md
index af2d9be..af2d9be 100644
--- a/Playback+tutorial+5+Color+Balance.markdown
+++ b/sdk-playback-tutorial-color-balance.md
diff --git a/Playback+tutorial+7+Custom+playbin+sinks.markdown b/sdk-playback-tutorial-custom-playbin-sinks.md
index 2713bf1..2713bf1 100644
--- a/Playback+tutorial+7+Custom+playbin+sinks.markdown
+++ b/sdk-playback-tutorial-custom-playbin-sinks.md
diff --git a/Playback+tutorial+9+Digital+audio+pass-through.markdown b/sdk-playback-tutorial-digital-audio-pass-through.md
index 53adea9..53adea9 100644
--- a/Playback+tutorial+9+Digital+audio+pass-through.markdown
+++ b/sdk-playback-tutorial-digital-audio-pass-through.md
diff --git a/Playback+tutorial+8+Hardware-accelerated+video+decoding.markdown b/sdk-playback-tutorial-hardware-accelerated-video-decoding.md
index 43bcd92..43bcd92 100644
--- a/Playback+tutorial+8+Hardware-accelerated+video+decoding.markdown
+++ b/sdk-playback-tutorial-hardware-accelerated-video-decoding.md
diff --git a/Playback+tutorial+1+Playbin+usage.markdown b/sdk-playback-tutorial-playbin-usage.md
index b1a27d7..df504c5 100644
--- a/Playback+tutorial+1+Playbin+usage.markdown
+++ b/sdk-playback-tutorial-playbin-usage.md
@@ -585,12 +585,12 @@ It has been a pleasure having you here, and see you soon!
 
   [Playback tutorial 2: Subtitle management]: Playback%2Btutorial%2B2%253A%2BSubtitle%2Bmanagement.html
   [information]: images/icons/emoticons/information.png
-  [Mac]: Installing+on+Mac+OS+X.markdown
+  [Mac]: sdk-installing-on-mac-osx.md
   [Windows]: Installing+on+Windows
-  [Mac OS X]: Installing+on+Mac+OS+X.markdown#building-the-tutorials
-  [1]: Installing+on+Windows.markdown#running-the-tutorials
-  [iOS]: Installing+for+iOS+development.markdown#building-the-tutorials
-  [android]: Installing+for+Android+development.markdown#building-the-tutorials
+  [Mac OS X]: sdk-installing-on-mac-osx.md#building-the-tutorials
+  [1]: sdk-installing-on-windows.md#running-the-tutorials
+  [iOS]: sdk-installing-for-ios-development.md#building-the-tutorials
+  [android]: sdk-installing-for-android-development.md#building-the-tutorials
   [Tutorial 12: Live streaming]: http://docs.gstreamer.com/display/GstSDK/Tutorial+12%3A+Live+streaming
   [Tutorial 17: DVD playback]: http://docs.gstreamer.com/display/GstSDK/Tutorial+17%3A+DVD+playback
   [information]: images/icons/emoticons/information.png
diff --git a/Playback+tutorial+4+Progressive+streaming.markdown b/sdk-playback-tutorial-progressive-streaming.md
index bea4ff9..bea4ff9 100644
--- a/Playback+tutorial+4+Progressive+streaming.markdown
+++ b/sdk-playback-tutorial-progressive-streaming.md
diff --git a/Playback+tutorial+3+Short-cutting+the+pipeline.markdown b/sdk-playback-tutorial-short-cutting-the-pipeline.md
index 8392792..8392792 100644
--- a/Playback+tutorial+3+Short-cutting+the+pipeline.markdown
+++ b/sdk-playback-tutorial-short-cutting-the-pipeline.md
diff --git a/Playback+tutorial+2+Subtitle+management.markdown b/sdk-playback-tutorial-subtitle-management.md
index ae36550..ae36550 100644
--- a/Playback+tutorial+2+Subtitle+management.markdown
+++ b/sdk-playback-tutorial-subtitle-management.md
diff --git a/Playback+tutorials.markdown b/sdk-playback-tutorials.md
index d824f6f..d824f6f 100644
--- a/Playback+tutorials.markdown
+++ b/sdk-playback-tutorials.md
diff --git a/QtGStreamer+vs+C+GStreamer.markdown b/sdk-qt-gstreamer-vs-c-gstreamer.md
index 74ae6a6..74ae6a6 100644
--- a/QtGStreamer+vs+C+GStreamer.markdown
+++ b/sdk-qt-gstreamer-vs-c-gstreamer.md
diff --git a/Qt+tutorials.markdown b/sdk-qt-tutorials.md
index 9a925d8..9a925d8 100644
--- a/Qt+tutorials.markdown
+++ b/sdk-qt-tutorials.md
diff --git a/Table+of+Concepts.markdown b/sdk-table-of-concepts.md
index a7e1786..c6837bc 100644
--- a/Table+of+Concepts.markdown
+++ b/sdk-table-of-concepts.md
@@ -29,17 +29,17 @@ concepts is discussed.
 -   Tools: [Basic tutorial 10: GStreamer tools]
 -   Threads: [Basic tutorial 7: Multithreading and Pad Availability]
 
-  [Playback tutorial 1: Playbin usage]: Playback+tutorial+1+Playbin+usage.markdown
-  [Basic tutorial 8: Short-cutting the pipeline]: Basic+tutorial+8+Short-cutting+the+pipeline.markdown
-  [Basic tutorial 2: GStreamer concepts]: Basic+tutorial+2+GStreamer+concepts.markdown
-  [Basic tutorial 6: Media formats and Pad Capabilities]: Basic+tutorial+6+Media+formats+and+Pad+Capabilities.markdown
-  [Basic tutorial 11: Debugging tools]: Basic+tutorial+11+Debugging+tools.markdown
-  [Basic tutorial 9: Media information gathering]: Basic+tutorial+9+Media+information+gathering.markdown
-  [Basic tutorial 10: GStreamer tools]: Basic+tutorial+10+GStreamer+tools.markdown
-  [gst-inspect-1.0]: gst-inspect.markdown
-  [gst-launch-1.0]: gst-launch.markdown
-  [Basic tutorial 5: GUI toolkit integration]: Basic+tutorial+5+GUI+toolkit+integration.markdown
-  [Basic tutorial 3: Dynamic pipelines]: Basic+tutorial+3+Dynamic+pipelines.markdown
-  [Basic tutorial 7: Multithreading and Pad Availability]: Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown
-  [Basic tutorial 4: Time management]: Basic+tutorial+4+Time+management.markdown
-  [Playback tutorial 2: Subtitle management]: Playback+tutorial+2+Subtitle+management.markdown
+  [Playback tutorial 1: Playbin usage]: sdk-playback-tutorial-playbin-usage.md
+  [Basic tutorial 8: Short-cutting the pipeline]: sdk-basic-tutorial-short-cutting-the-pipeline.md
+  [Basic tutorial 2: GStreamer concepts]: sdk-basic-tutorial-concepts.md
+  [Basic tutorial 6: Media formats and Pad Capabilities]: sdk-basic-tutorial-media-formats-and-pad-capabilities.md
+  [Basic tutorial 11: Debugging tools]: sdk-basic-tutorial-debugging-tools.md
+  [Basic tutorial 9: Media information gathering]: sdk-basic-tutorial-media-information-gathering.md
+  [Basic tutorial 10: GStreamer tools]: sdk-basic-tutorial-gstreamer-tools.md
+  [gst-inspect-1.0]: sdk-gst-inspect.md
+  [gst-launch-1.0]: gst-launch.md
+  [Basic tutorial 5: GUI toolkit integration]: sdk-basic-tutorial-toolkit-integration.md
+  [Basic tutorial 3: Dynamic pipelines]: sdk-basic-tutorial-dynamic-pipelines.md
+  [Basic tutorial 7: Multithreading and Pad Availability]: sdk-basic-tutorial-multithreading-and-pad-availability.md
+  [Basic tutorial 4: Time management]: sdk-basic-tutorial-time-management.md
+  [Playback tutorial 2: Subtitle management]: sdk-playback-tutorial-subtitle-management.md
diff --git a/Tutorials.markdown b/sdk-tutorials.md
index 3148ddd..c144cf2 100644
--- a/Tutorials.markdown
+++ b/sdk-tutorials.md
@@ -76,11 +76,11 @@ purposes.
 
 -   [Sintel, the Durian Open Movie Project]
 
-  [installing the SDK]: Installing+the+SDK.markdown
+  [installing the SDK]: sdk-installing.md
   [GStreamer documentation]: http://gstreamer.freedesktop.org/documentation/
-  [Basic tutorials]: Basic+tutorials.markdown
-  [Playback tutorials]: Playback+tutorials.markdown
-  [Android tutorials]: Android+tutorials.markdown
-  [iOS tutorials]: iOS+tutorials.markdown
-  [Table of Concepts]: Table+of+Concepts.markdown
+  [Basic tutorials]: sdk-basic-tutorials.md
+  [Playback tutorials]: sdk-playback-tutorials.md
+  [Android tutorials]: sdk-android-tutorials.md
+  [iOS tutorials]: sdk-ios-tutorials.md
+  [Table of Concepts]: sdk-table-of-concepts.md
   [Sintel, the Durian Open Movie Project]: http://www.sintel.org/
diff --git a/Using+appsink%2Fappsrc+in+Qt.markdown b/sdk-using-appsink-appsrc-in-qt.md
index 6889b8e..6889b8e 100644
--- a/Using+appsink%2Fappsrc+in+Qt.markdown
+++ b/sdk-using-appsink-appsrc-in-qt.md
diff --git a/Windows+deployment.markdown b/sdk-windows-deployment.md
index 3f46412..3f46412 100644
--- a/Windows+deployment.markdown
+++ b/sdk-windows-deployment.md
diff --git a/sitemap.txt b/sitemap.txt
index b92b84c..1e70b90 100644
--- a/sitemap.txt
+++ b/sitemap.txt
@@ -1,58 +1,58 @@
-Home.markdown
-        Installing+the+SDK.markdown
-	        Installing+for+Android+development.markdown
-	        Installing+for+iOS+development.markdown
-	        Installing+on+Mac+OS+X.markdown
-	        Installing+on+Windows.markdown
-	        Building+from+source+using+Cerbero.markdown
-        Tutorials.markdown
-		Basic+tutorials.markdown
-			Basic+tutorial+1+Hello+world.markdown
-			Basic+tutorial+2+GStreamer+concepts.markdown
-			Basic+tutorial+3+Dynamic+pipelines.markdown
-			Basic+tutorial+4+Time+management.markdown
-			Basic+tutorial+5+GUI+toolkit+integration.markdown
-			Basic+tutorial+6+Media+formats+and+Pad+Capabilities.markdown
-			Basic+tutorial+7+Multithreading+and+Pad+Availability.markdown
-			Basic+tutorial+8+Short-cutting+the+pipeline.markdown
-			Basic+tutorial+9+Media+information+gathering.markdown
-			Basic+tutorial+10+GStreamer+tools.markdown
-			Basic+tutorial+11+Debugging+tools.markdown
-			Basic+tutorial+12+Streaming.markdown
-			Basic+tutorial+13+Playback+speed.markdown
-			Basic+tutorial+14+Handy+elements.markdown
-			Basic+tutorial+15+Clutter+integration.markdown
-			Basic+tutorial+16+Platform-specific+elements.markdown
-		Playback+tutorials.markdown
-			Playback+tutorial+1+Playbin+usage.markdown
-			Playback+tutorial+2+Subtitle+management.markdown
-			Playback+tutorial+3+Short-cutting+the+pipeline.markdown
-			Playback+tutorial+4+Progressive+streaming.markdown
-			Playback+tutorial+5+Color+Balance.markdown
-			Playback+tutorial+6+Audio+visualization.markdown
-			Playback+tutorial+7+Custom+playbin+sinks.markdown
-			Playback+tutorial+8+Hardware-accelerated+video+decoding.markdown
-			Playback+tutorial+9+Digital+audio+pass-through.markdown
-		Android+tutorials.markdown
-			Android+tutorial+1+Link+against+GStreamer.markdown
-			Android+tutorial+2+A+running+pipeline.markdown
-			Android+tutorial+3+Video.markdown
-			Android+tutorial+4+A+basic+media+player.markdown
-			Android+tutorial+5+A+Complete+media+player.markdown
-		iOS+tutorials.markdown
-			iOS+tutorial+1+Link+against+GStreamer.markdown
-			iOS+tutorial+2+A+running+pipeline.markdown
-			iOS+tutorial+3+Video.markdown
-			iOS+tutorial+4+A+basic+media+player.markdown
-			iOS+tutorial+5+A+Complete+media+player.markdown
-		Table+of+Concepts.markdown
-	Deploying+your+application.markdown
-		Mac+OS+X+deployment.markdown
-		Windows+deployment.markdown
-		Multiplatform+deployment+using+Cerbero.markdown
-	GStreamer+reference.markdown
-		gst-inspect.markdown
-		gst-launch.markdown
+index.md
+        sdk-installing.md
+	        sdk-installing-for-android-development.md
+	        sdk-installing-for-ios-development.md
+	        sdk-installing-on-mac-osx.md
+	        sdk-installing-on-windows.md
+	        sdk-building-from-source-using-cerbero.md
+        sdk-tutorials.md
+		sdk-basic-tutorials.md
+			sdk-basic-tutorial-hello-world.md
+			sdk-basic-tutorial-concepts.md
+			sdk-basic-tutorial-dynamic-pipelines.md
+			sdk-basic-tutorial-time-management.md
+			sdk-basic-tutorial-toolkit-integration.md
+			sdk-basic-tutorial-media-formats-and-pad-capabilities.md
+			sdk-basic-tutorial-multithreading-and-pad-availability.md
+			sdk-basic-tutorial-short-cutting-the-pipeline.md
+			sdk-basic-tutorial-media-information-gathering.md
+			sdk-basic-tutorial-gstreamer-tools.md
+			sdk-basic-tutorial-debugging-tools.md
+			sdk-basic-tutorial-streaming.md
+			sdk-basic-tutorial-playback-speed.md
+			sdk-basic-tutorial-handy-elements.md
+			sdk-basic-tutorial-clutter-integration.md
+			sdk-basic-tutorial-platform-specific-elements.md
+		sdk-playback-tutorials.md
+			sdk-playback-tutorial-playbin-usage.md
+			sdk-playback-tutorial-subtitle-management.md
+			sdk-playback-tutorial-short-cutting-the-pipeline.md
+			sdk-playback-tutorial-progressive-streaming.md
+			sdk-playback-tutorial-color-balance.md
+			sdk-playback-tutorial-audio-visualization.md
+			sdk-playback-tutorial-custom-playbin-sinks.md
+			sdk-playback-tutorial-hardware-accelerated-video-decoding.md
+			sdk-playback-tutorial-digital-audio-pass-through.md
+		sdk-android-tutorials.md
+			sdk-android-tutorial-link-against-gstreamer.md
+			sdk-android-tutorial-a-running-pipeline.md
+			sdk-android-tutorial-video.md
+			sdk-android-tutorial-media-player.md
+			sdk-android-tutorial-a-complete-media-player.md
+		sdk-ios-tutorials.md
+			sdk-ios-tutorial-link-against-gstreamer.md
+			sdk-ios-tutorial-a-running-pipeline.md
+			sdk-ios-tutorial-video.md
+			sdk-ios-tutorial-a-basic-media-player.md
+			sdk-ios-tutorial-a-complete-media-player.md
+		sdk-table-of-concepts.md
+	sdk-deploying-your-application.md
+		sdk-mac-osx-deployment.md
+		sdk-windows-deployment.md
+		sdk-multiplatform-deployment-using-cerbero.md
+	sdk-api-reference.md
+		sdk-gst-inspect.md
+		gst-launch.md
 	manual-index.md
 		manual-introduction.md
 			manual-gstreamer.md
@@ -123,4 +123,4 @@ Home.markdown
 			pwg-porting.md
 			pwg-porting-1_0.md
 			pwg-licensing-advisory.md
-	Legal+information.markdown
+	sdk-legal-information.md