summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-12-09 13:20:39 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2018-12-09 13:20:39 +0100
commitf6f32926106587b7969d53d86cf6412b26a0625e (patch)
treecec6efb62217bc22103d12f5033f33184de95e30 /docs
parent0259d24fbd0ea6e671db7f4472cf6dbb52884019 (diff)
downloadgobject-introspection-f6f32926106587b7969d53d86cf6412b26a0625e.tar.gz
NEWS: convert to reST and include it in the docs
So it's visible on the main website and has nice links to the issues and merge requests.
Diffstat (limited to 'docs')
-rw-r--r--docs/website/Makefile2
-rw-r--r--docs/website/changelog.rst11
-rw-r--r--docs/website/conf.py5
-rw-r--r--docs/website/index.rst1
-rw-r--r--docs/website/writingbindings/libgirepository.rst1
5 files changed, 18 insertions, 2 deletions
diff --git a/docs/website/Makefile b/docs/website/Makefile
index 928ef6a3..46311bde 100644
--- a/docs/website/Makefile
+++ b/docs/website/Makefile
@@ -1,6 +1,6 @@
all: _build
-_build: Makefile *.rst images/*.svg */*.rst conf.py
+_build: Makefile *.rst images/*.svg */*.rst conf.py ../../NEWS
python3 -m sphinx -b html . _build
linkcheck:
diff --git a/docs/website/changelog.rst b/docs/website/changelog.rst
new file mode 100644
index 00000000..1eff2582
--- /dev/null
+++ b/docs/website/changelog.rst
@@ -0,0 +1,11 @@
+Changelog
+=========
+
+Versions with an odd minor version are unstable releases (e.g. 1.57.x) while
+versions with even minor version are stable releases (e.g. 3.58.x). This list
+is sorted by release date.
+
+For more details see the GIT log:
+https://gitlab.gnome.org/GNOME/gobject-introspection
+
+.. include:: ../../NEWS
diff --git a/docs/website/conf.py b/docs/website/conf.py
index 98a51412..95c37c8e 100644
--- a/docs/website/conf.py
+++ b/docs/website/conf.py
@@ -11,7 +11,6 @@ html_theme = 'sphinx_rtd_theme'
html_show_copyright = False
project = "GObject Introspection"
html_title = project
-highlight_language = 'c'
html_theme_options = {
"display_version": False,
@@ -30,4 +29,8 @@ html_context = {
extlinks = {
'bzbug': ('https://bugzilla.gnome.org/show_bug.cgi?id=%s', 'bz#'),
'commit': ('https://gitlab.gnome.org/GNOME/gobject-introspection/commit/%s', ''),
+ 'issue': ('https://gitlab.gnome.org/GNOME/gobject-introspection/issues/%s', '#'),
+ 'mr': (
+ 'https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/%s', '!'),
+ 'user': ('https://gitlab.gnome.org/%s', ''),
}
diff --git a/docs/website/index.rst b/docs/website/index.rst
index 9b46fe5d..fcbf9451 100644
--- a/docs/website/index.rst
+++ b/docs/website/index.rst
@@ -9,6 +9,7 @@ GObject Introspection
:titlesonly:
:maxdepth: 1
+ changelog
goals
architecture
users
diff --git a/docs/website/writingbindings/libgirepository.rst b/docs/website/writingbindings/libgirepository.rst
index 9c00e61c..780a12ce 100644
--- a/docs/website/writingbindings/libgirepository.rst
+++ b/docs/website/writingbindings/libgirepository.rst
@@ -13,3 +13,4 @@ The following example shows how to call the ``g_assertion_message()`` function
from libglib-2.0:
.. literalinclude:: ../../../examples/glib-print.c
+ :language: c