Reorganise main tutorial to be easier to maintain and see contents of…

… each chapter
vala-lang · May 3, 2024 · c4f3a47 · c4f3a47
1 parent 4f41379
commit c4f3a47
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 93 deletions.
diff --git a/...orials/main/01-00-first-program/index.rst → ...ce/tutorials/main/01-00-first-program.rst b/...orials/main/01-00-first-program/index.rst → ...ce/tutorials/main/01-00-first-program.rst
diff --git a/source/tutorials/main/02-00-basics.rst b/source/tutorials/main/02-00-basics.rst
@@ -0,0 +1,10 @@
+Basics
+======
+
+.. toctree::
+   :glob:
+   :maxdepth: 2
+
+   02-00-basics/*
+
+
diff --git a/source/tutorials/main/02-00-basics/index.rst b/source/tutorials/main/02-00-basics/index.rst
diff --git a/source/tutorials/main/03-00-object-oriented-programming.rst b/source/tutorials/main/03-00-object-oriented-programming.rst
@@ -0,0 +1,9 @@
+Object Oriented Programming
+===========================
+
+.. toctree::
+   :glob:
+   :maxdepth: 2
+
+   03-00-object-oriented-programming/*
+
diff --git a/source/tutorials/main/03-00-object-oriented-programming/index.rst b/source/tutorials/main/03-00-object-oriented-programming/index.rst
diff --git a/source/tutorials/main/04-00-advanced-features.rst b/source/tutorials/main/04-00-advanced-features.rst
@@ -0,0 +1,9 @@
+Advanced Features
+=================
+
+.. toctree::
+   :glob:
+   :maxdepth: 2
+
+   04-00-advanced-features/*
+
diff --git a/source/tutorials/main/04-00-advanced-features/index.rst b/source/tutorials/main/04-00-advanced-features/index.rst
diff --git a/...ain/05-00-experimental-features/index.rst → ...ials/main/05-00-experimental-features.rst b/...ain/05-00-experimental-features/index.rst → ...ials/main/05-00-experimental-features.rst
@@ -4,9 +4,8 @@ Experimental Features
 Some features of Vala are experimental. This means they are not fully tested and might be subject to changes in future versions.
 
 .. toctree::
-   :maxdepth: 1
+   :glob:
+   :maxdepth: 2
 
-   05-01-chained-relational-expressions
-   05-02-regular-expression-literals
-   05-03-strict-non-null-mode
+   05-00-experimental-features/*
 
diff --git a/.../tutorials/main/06-00-libraries/index.rst → source/tutorials/main/06-00-libraries.rst b/.../tutorials/main/06-00-libraries/index.rst → source/tutorials/main/06-00-libraries.rst
@@ -16,9 +16,9 @@ Both of which are installed in the standard locations. And the Vala specific fil
 These files are explained later in this section. It should be noted that the library names are the same in the Vala specific files as in the *pkg-config* files.
 
 .. toctree::
-   :maxdepth: 1
+   :glob:
+   :maxdepth: 2
+
+   06-00-libraries/*
 
-   06-01-using-libraries
-   06-02-creating-a-library
-   06-03-binding-libraries-with-vapi-files
 
diff --git a/source/tutorials/main/06-00-libraries/06-03-binding-libraries-with-vapi-files.rst b/source/tutorials/main/06-00-libraries/06-03-binding-libraries-with-vapi-files.rst
@@ -9,5 +9,5 @@ This process of creating this generally amounts to three steps,
 * Adding extra metadata to standardise the interface or make various other changes.
 * Generating a VAPI file from the above sources using *vapigen*.
 
-Specific instructions on how to generate bindings are in the :doc:`Vala Bindings Tutorial </tutorials/bindings>`.
+Specific instructions on how to generate bindings are in the :doc:`Vala Bindings Tutorial </developer-guides/bindings>`.
 
diff --git a/source/tutorials/main/07-00-tools/index.rst → source/tutorials/main/07-00-tools.rst b/source/tutorials/main/07-00-tools/index.rst → source/tutorials/main/07-00-tools.rst
@@ -4,10 +4,10 @@ Tools
 The Vala distribution includes several programs to help you build and work with Vala applications. For more details of each tool, see the man pages.
 
 .. toctree::
-   :maxdepth: 1
+   :glob:
+   :maxdepth: 2
 
-   07-01-valac
-   07-02-vapigen
-   07-03-vala-gen-introspect
+   07-00-tools/*
+
 
 
diff --git a/source/tutorials/main/07-00-tools/07-01-valac.rst b/source/tutorials/main/07-00-tools/07-01-valac.rst
@@ -8,7 +8,7 @@ Vala has better information than the C compiler, so it knows certain things are
 
 Unfortunately we can't just add casts everywhere since there are situations where we can't generate a valid cast (and, what's more, no way to know what those situations are).
 
-For example, compiling the :doc:`Hello World program </tutorials/main/01-00-first-program/index>` will give us some warnings because ``valac`` by default generates code which is compatible with older versions of the ``GLib``.Some methods may have been deprecated in your new version of GLib so that C language compiler will warn you.
+For example, compiling the :doc:`Hello World program </tutorials/main/01-00-first-program>` will give us some warnings because ``valac`` by default generates code which is compatible with older versions of the ``GLib``.Some methods may have been deprecated in your new version of GLib so that C language compiler will warn you.
 
 Imagine a machine with older glib version want to run your vala program!
 

diff --git a/source/tutorials/main/07-00-tools/07-02-vapigen.rst b/source/tutorials/main/07-00-tools/07-02-vapigen.rst
@@ -1,4 +1,4 @@
 vapigen
 =======
 
-``vapigen`` is a tool to make bindings. It creates a VAPI files from a library's metadata and any extra information required. See also :doc:`Vala Bindings Tutorial </tutorials/bindings>`.
+``vapigen`` is a tool to make bindings. It creates a VAPI files from a library's metadata and any extra information required. See also :doc:`Vala Bindings Tutorial </developer-guides/bindings/generating-a-vapi-with-gobject-introspection>`.
diff --git a/source/tutorials/main/07-00-tools/07-03-vala-gen-introspect.rst b/source/tutorials/main/07-00-tools/07-03-vala-gen-introspect.rst
@@ -1,4 +1,4 @@
 vala-gen-introspect
 ===================
 
-``vala-gen-introspect`` is a tool for extracting metainformation about GObject based libraries. Nowadays, the preferred method is to use GObjectIntrospection instead, as vapigen can use GIR files directly. See also :doc:`Vala Bindings Tutorial </tutorials/bindings>`.
+``vala-gen-introspect`` is a tool for extracting metainformation about GObject based libraries. Nowadays, the preferred method is to use GObjectIntrospection instead, as vapigen can use GIR files directly. See also :doc:`Vala Bindings Tutorial <developer-guides/bindings/generating-a-vapi-with-gobject-introspection>`.
diff --git a/source/tutorials/main/08-00-techniques.rst b/source/tutorials/main/08-00-techniques.rst
@@ -0,0 +1,8 @@
+Techniques
+==========
+
+.. toctree::
+   :glob:
+   :maxdepth: 2
+
+   08-00-techniques/*
diff --git a/source/tutorials/main/08-00-techniques/index.rst b/source/tutorials/main/08-00-techniques/index.rst
diff --git a/source/tutorials/main/index.rst b/source/tutorials/main/index.rst
@@ -43,13 +43,6 @@ At some point I will add in references to the Vala documentation, but that isn't
 .. toctree::
    :numbered:
    :maxdepth: 1
+   :glob:
 
-   01-00-first-program/index
-   02-00-basics/index
-   03-00-object-oriented-programming/index
-   04-00-advanced-features/index
-   05-00-experimental-features/index
-   06-00-libraries/index
-   07-00-tools/index
-   08-00-techniques/index
-
+   *