1 files changed, 16 insertions, 25 deletions
diff --git a/documentation/content/en/articles/gjournal-desktop/_index.adoc b/documentation/content/en/articles/gjournal-desktop/_index.adoc
index c39fa2d3a1..71ce2b3084 100644
--- a/documentation/content/en/articles/gjournal-desktop/_index.adoc
+++ b/documentation/content/en/articles/gjournal-desktop/_index.adoc
@@ -17,35 +17,26 @@ tags: ["UFS", "Journaling" , "Desktop", "FreeBSD"]
 :sectnumlevels: 6
 :source-highlighter: rouge
 :experimental:
+:images-path: articles/gjournal-desktop/
 
-ifeval::["{backend}" == "html5"]
+ifdef::env-beastie[]
+ifdef::backend-html5[]
 include::shared/authors.adoc[]
-include::shared/en/mailing-lists.adoc[]
-include::shared/en/urls.adoc[]
+include::shared/mirrors.adoc[]
+include::shared/releases.adoc[]
+include::shared/attributes/attributes-{{% lang %}}.adoc[]
+include::shared/{{% lang %}}/teams.adoc[]
+include::shared/{{% lang %}}/mailing-lists.adoc[]
+include::shared/{{% lang %}}/urls.adoc[]
+:imagesdir: ../../../images/{images-path}
 endif::[]
-
-ifeval::["{backend}" == "pdf"]
-include::../../../../shared/authors.adoc[]
-include::../../../../shared/en/mailing-lists.adoc[]
-include::../../../../shared/en/urls.adoc[]
-endif::[]
-
-ifeval::["{backend}" == "epub3"]
-include::../../../../shared/authors.adoc[]
-include::../../../../shared/en/mailing-lists.adoc[]
-include::../../../../shared/en/urls.adoc[]
+ifdef::backend-pdf,backend-epub3[]
+include::../../../../shared/asciidoctor.adoc[]
 endif::[]
-
-ifeval::["{backend}" == "html5"]
-:imagesdir: ../../../images/articles/gjournal-desktop/
-endif::[]
-
-ifeval::["{backend}" == "pdf"]
-:imagesdir: ../../../../static/images/articles/gjournal-desktop/
 endif::[]
 
-ifeval::["{backend}" == "epub3"]
-:imagesdir: ../../../../static/images/articles/gjournal-desktop/
+ifndef::env-beastie[]
+include::../../../../../shared/asciidoctor.adoc[]
 endif::[]
 
 [.abstract-title]
@@ -380,7 +371,7 @@ options UFS_GJOURNAL # Note: This is already in GENERIC
 options GEOM_JOURNAL # You will have to add this one
 ....
 
-Rebuild and reinstall your kernel following the relevant link:{handbook}#kernelconfig[instructions in the FreeBSD Handbook.]
+Rebuild and reinstall your kernel following the relevant extref:{handbook}[instructions in the FreeBSD Handbook., kernelconfig]
 
 Do not forget to remove the relevant "load" entry from [.filename]#/boot/loader.conf# if you have previously used it.
 
@@ -513,7 +504,7 @@ Finally, edit [.filename]#/boot/loader.conf#, remove the entry that loads the `g
 Journaling is a fairly new feature of FreeBSD, and as such, it is not very well documented yet.
 You may however find the following additional references useful:
 
-* A link:{handbook}#geom-gjournal[new section on journaling] is now part of the FreeBSD Handbook.
+* A extref:{handbook}[new section on journaling, geom-gjournal] is now part of the FreeBSD Handbook.
 * https://lists.freebsd.org/pipermail/freebsd-current/2006-June/064043.html[This post] in {freebsd-current} by man:gjournal[8]'s developer, `{pjd}`.
 * https://lists.freebsd.org/pipermail/freebsd-questions/2008-April/173501.html[This post] in {freebsd-questions} by `{ivoras}`.
 * The manual pages of man:gjournal[8] and man:geom[8].