[gimp-help/wip/wormnest/website: 3/4] Update main docs website and use entities.xml for some variables.




commit 2cadfff9cc9b6b79c3099281bc0bbee1e60f487e
Author: Jacob Boerema <jgboerema gmail com>
Date:   Mon Sep 13 16:08:19 2021 -0400

    Update main docs website and use entities.xml for some variables.

 web/layout.xml  |   7 +-
 web/website.xml | 421 +++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 252 insertions(+), 176 deletions(-)
---
diff --git a/web/layout.xml b/web/layout.xml
index e6a876b7e..62a5ccbd0 100644
--- a/web/layout.xml
+++ b/web/layout.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE layout PUBLIC "-//Norman Walsh//DTD Website Layout V2.5.0//EN"
-          "layout.dtd">
+          "layout.dtd"[
+  <!ENTITY % entities SYSTEM "./entities.xml">
+  %entities;
+]>
 
 <layout>
   <copyright>
-    <year>2001—2018</year>
+    <year>2001—&gimphelp.release.year;</year>
     <holder role="gimp-help">The GIMP Help Team (Graphics by Jakub Steiner)</holder>
   </copyright>
   <style src="style.css" type="text/css" />
diff --git a/web/website.xml b/web/website.xml
index 61a282946..636922e82 100644
--- a/web/website.xml
+++ b/web/website.xml
@@ -1,194 +1,257 @@
 <?xml version='1.0' encoding="UTF-8" ?>
-<!DOCTYPE webpage PUBLIC "-//Norman Walsh//DTD Website V2.5.0//EN" 
+<!DOCTYPE webpage PUBLIC "-//Norman Walsh//DTD Website V2.5.0//EN"
           "website.dtd"[
-<!ENTITY help SYSTEM "help.xml" NDATA XML>
+  <!ENTITY help SYSTEM "help.xml" NDATA XML>
+  <!ENTITY % entities SYSTEM "./entities.xml">
+  %entities;
 ]>
 <webpage id="index">
-  
+
   <head>
     <title>GIMP Documentation</title>
     <keywords>GIMP, Manual</keywords>
   </head>
 
   <section>
-    <title>Work in Progress - GIMP 2.10</title>
+    <title>GIMP &gimp.release.base; Manuals</title>
+
+    <para class="Flattr">
+      <?dbhtml-include href="includes/flattr.html" ?>
+    </para>
+    <para>
+      This page hosts the online user manuals and quick reference guides for
+      GIMP&nbsp;&gimp.release.base;. Manuals for older versions can be found
+      at our <ulink url="download.html">Releases</ulink> page.
+    </para>
+    <para>
+      Information about GIMP itself and downloads are available on the
+      <ulink url="https://www.gimp.org/";>main website</ulink>.
+    </para>
 
     <note>
+      <title>Work in Progress</title>
       <para>
-        Please note that some of these files are work in progress.
-        They're subject to change and may not be of any use because of
-        errors. We apologize for any inconvenience this may cause.
+        The US English manual, that is used as the base for translations, is
+        known to contain errors and omissions. Please note that both this
+        manual and the translations are works in progress and can be
+        incomplete. We apologize for any inconvenience this may cause.
+      </para>
+      <para>
+        To improve the manual and translations we are looking for more
+        volunteers to help us out. If you are interested in writing for the
+        English language manual, or in translating the manual, then please
+        get in contact with us.
       </para>
     </note>
 
-    <para class="Flattr">
-      <?dbhtml-include href="includes/flattr.html" ?>
-    </para>
-
     <variablelist>
       <varlistentry>
-        <term>Online Manual – HTML</term>
-        <listitem>
-          <para>
-            <itemizedlist>
-              <listitem>
-                <para class="es"><ulink url="2.10/ca">Catalá</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="da"><ulink url="2.10/da">Dansk</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="de"><ulink url="2.10/de">Deutsch</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="en"><ulink url="2.10/en">English</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="es"><ulink url="2.10/es">Español</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="el"><ulink url="2.10/el">Ελληνικά</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="fr"><ulink url="2.10/fr">Français</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="it"><ulink url="2.10/it">Italiano</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="ja"><ulink url="2.10/ja">日本語(Japanese)</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="ko"><ulink url="2.10/ko">한국어(Korean)</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="nl"><ulink url="2.10/nl">Nederlands</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="no"><ulink url="2.10/nn">Norwegian</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="pt_BR"><ulink url="2.10/pt_BR">Português</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="ru"><ulink url="2.10/ru">Pусский</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="sl"><ulink url="2.10/sl">Slovenščina</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="sv"><ulink url="2.10/sv">Svenska</ulink></para>
-              </listitem>
-              <listitem>
-                <para class="zh_CN"><ulink url="2.10/zh_CN">中文</ulink></para>
-              </listitem>
-            </itemizedlist>
-          </para>
+        <term>Online User Manuals (HTML)</term>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/ca">Catalá (Catalan)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/da">Dansk (Danish)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/de">Deutsch (German)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/el">Ελληνικά (Greek)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/en">English (US)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/en_GB">English (British)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/es">Español (Spanish)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/fi">Suomi (Finnish)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/fr">Français (French)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/hr">Hrvatski (Croatian)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/it">Italiano (Italian)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/ja">日本語 (Japanese)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/ko">한국어 (Korean)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/lt">Lietuvis (Lithuanian)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/nl">Nederlands (Dutch)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/nn">Nynorsk (Norwegian)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/pt_BR">Português brasileiro (Brazilian 
Portuguese)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/ro">Română (Romanian)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/ru">Pусский (Russian)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/sl">Slovenščina (Slovenian)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/sv">Svenska (Swedish)</ulink></para>
+        </listitem>
+        <listitem>
+          <para><ulink url="&gimp.release.base;/zh_CN">中文 (Simplified Chinese)</ulink></para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Keys and Mouse Quickreference (PDF)</term>
-        <listitem>
-          <para>
-            <itemizedlist>
-              <listitem>
-                <para class="de">
-                  <ulink url="2.8/quickreference/gimp-keys-de.pdf" 
-                         title="Deutsch">Deutsch</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="en">
-                  <ulink url="2.8/quickreference/gimp-keys-en.pdf"
-                         title='English'>English</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="es">
-                  <ulink url="2.8/quickreference/gimp-keys-es.pdf" 
-                         title="Español">Español</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="fr">
-                  <ulink url="2.8/quickreference/gimp-keys-fr.pdf" 
-                         title="Français">Français</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="it">
-                  <ulink url="2.8/quickreference/gimp-keys-it.pdf" 
-                         title="Italiano">Italiano</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="ru">
-                  <ulink url="2.8/quickreference/gimp-keys-ru.pdf" 
-                         title="Pусский">Pусский</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="sv">
-                  <ulink url="2.8/quickreference/gimp-keys-sv.pdf" 
-                         title="Svenska">Svenska</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="ja">
-                  <ulink url="2.8/quickreference/gimp-keys-ja.pdf" 
-                         title="Japanese">日本語(Japanese)</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="ko">
-                  <ulink url="2.8/quickreference/gimp-keys-ko.pdf" 
-                         title="Korean">한국어(Korean)</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="fi">
-                  <ulink url="2.8/quickreference/gimp-keys-fi.pdf" 
-                    title="Finnish">Suomen kieli</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="es">
-                  <ulink url="2.8/quickreference/gimp-keys-ca.pdf" 
-                    title="Catalan">Català</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="el">
-                  <ulink url="2.8/quickreference/gimp-keys-el.pdf" 
-                    title="Greek">Ελληνικά</ulink>
-                </para>
-              </listitem>
-              <listitem>
-                <para class="zh_CN">
-                  <ulink url="2.8/quickreference/gimp-keys-zh_CN.pdf" 
-                    title="Chinese">中文(Chinese)</ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
+        <term>Quickreference (PDF)</term>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-ca.pdf"
+              title="Catalan">Català (Catalan)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-da.pdf"
+                    title="Dansk">Dansk (Danish)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-de.pdf"
+                    title="Deutsch">Deutsch (German)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-el.pdf"
+              title="Greek">Ελληνικά (Greek)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-en.pdf"
+              title='English (US)'>English (US)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-en_GB.pdf"
+              title='British English'>English (British)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-es.pdf"
+              title="Español">Español (Spanish)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-fi.pdf"
+                    title='Finnish'>Suomi (Finnish)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-fr.pdf"
+                    title="Français">Français (French)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-hr.pdf"
+                    title="Hrvatski">Hrvatski (Croatian)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-it.pdf"
+                    title="Italiano">Italiano (Italian)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-ja.pdf"
+                    title="Japanese">日本語 (Japanese)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-ko.pdf"
+                    title="Korean">한국어 (Korean)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-nl.pdf"
+                    title="Nederlands">Nederlands (Dutch)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-nn.pdf"
+                    title="Norwegian">Nynorsk (Norwegian)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-pt_BR.pdf"
+                    title="Português brasileiro">Português brasileiro (Brazilian Portuguese)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-ro.pdf"
+                    title="Română">Română (Romanian)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-ru.pdf"
+                    title="Pусский">Pусский (Russian)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-sl.pdf"
+                    title="Slovenščina">Slovenščina (Slovenian)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-sv.pdf"
+                    title="Svenska">Svenska (Swedish)</ulink>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <ulink url="&gimp.release.base;/quickreference/gimp-keys-zh_CN.pdf"
+              title="Simplified Chinese">中文 (Simplified Chinese)</ulink>
           </para>
         </listitem>
       </varlistentry>
 
-
       <varlistentry>
         <term>Official Releases for Microsoft Windows</term>
         <listitem>
           <para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <ulink
-                    url="https://download.gimp.org/mirror/pub/gimp/help/windows/2.10/";>Microsoft
-                    Windows
-                  </ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
+            <ulink
+              url="https://download.gimp.org/mirror/pub/gimp/help/windows/2.10/";>GIMP
+              2.10 manual installers for Microsoft Windows
+            </ulink>
           </para>
         </listitem>
       </varlistentry>
@@ -208,19 +271,29 @@
       <varlistentry>
         <term>Source Code</term>
         <listitem>
-       <para>
-         Use <ulink url="https://git-scm.com/"; title="Download
-           Git">git</ulink> to grab the source code from:
-
-         <programlisting>
-           <![CDATA[
-           $ git clone git gitlab gnome org:GNOME/gimp-help.git
-           ]]>
-         </programlisting>
-       </para>
-       The <olink targetdocent="help">Help us</olink> page provides
-       more information if you would like to help us.
+          <para>
+            The repository for the GIMP Help Manual can be found at
+            <ulink url="https://gitlab.gnome.org/GNOME/gimp-help";
+              title="GIMP Help Manual repository">https://gitlab.gnome.org/GNOME/gimp-help</ulink>.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Use <ulink url="https://git-scm.com/"; title="Download
+              Git">git</ulink> to grab the source code from:
 
+            <programlisting>
+              <![CDATA[
+              $ git clone git gitlab gnome org:GNOME/gimp-help.git
+              ]]>
+            </programlisting>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            The <olink targetdocent="help">Help us</olink> page provides
+            more information if you would like to help us.
+          </para>
         </listitem>
       </varlistentry>
     </variablelist>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]