From 1e4c2c9a084b3e0543c45fa905ba6f5995a5f9be Mon Sep 17 00:00:00 2001
From: Tanja Roth <taroth@suse.com>
Date: Fri, 11 Oct 2019 11:31:10 +0200
Subject: [PATCH] book intro fixes

- add missing guide to list of available docs
- resort entries
- remove redundant pointer to doc Web page
---
 xml/common_intro_available_doc_i.xml | 70 +++++++++++++++-------------
 xml/common_intro_feedback_i.xml      | 11 ++++-
 xml/ha_intro.xml                     |  6 +--
 3 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/xml/common_intro_available_doc_i.xml b/xml/common_intro_available_doc_i.xml
index 2423381a6..59a6002b5 100644
--- a/xml/common_intro_available_doc_i.xml
+++ b/xml/common_intro_available_doc_i.xml
@@ -5,42 +5,50 @@
     %entities;
 ]>
 <!-- Converted by suse-upgrade version 1.1 -->
-<sect1 version="5.0"
-  xmlns="http://docbook.org/ns/docbook"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
+<sect1 version="5.0" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Available Documentation</title>
 
  <info>
   <dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
    <dm:bugtracker>
-<!--<dm:assignee></dm:assignee>-->
+    <!--<dm:assignee></dm:assignee>-->
    </dm:bugtracker>
    <dm:translation>yes</dm:translation>
   </dm:docmanager>
- </info><indexterm>
+ </info>
+ <indexterm>
 
- <primary>help</primary>
+  <primary>help</primary>
 
- <secondary>&suse; manuals</secondary></indexterm><indexterm>
+  <secondary>&suse; manuals</secondary>
+ </indexterm>
+ <indexterm>
 
- <primary>&suse; manuals</primary></indexterm>
+  <primary>&suse; manuals</primary>
+ </indexterm>
 
  <note>
   <title>Online Documentation and Latest Updates</title>
-  <para>
-   Documentation for our products is available at
-   <link xlink:href="&dsc;"/>, where you can also
-   find the latest updates, and browse or download the documentation in various formats.
-   The latest documentation updates can usually be found in the English language version.
+  <para> Documentation for our products is available at <link
+    xlink:href="&dsc;"/>, where you can also find the latest updates, and
+   browse or download the documentation in various formats. The latest
+   documentation updates can usually be found in the English language version.
   </para>
  </note>
- <para>The following documentation is available for this product:
- </para>
-  <variablelist>
+ <para>The following documentation is available for this product: </para>
+ <variablelist>
   <varlistentry>
-   <term>&admin;
-   </term>
+   <term>&instquick;</term>
+   <listitem>
+    <para>
+     &abstract-instquick;
+    </para>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>&admin;</term>
    <listitem>
     <para>
      &abstract-admin;
@@ -48,38 +56,34 @@
    </listitem>
   </varlistentry>
   <varlistentry>
-   <term>&instquick;
-   </term>
+   <term>&geoquick;</term>
    <listitem>
     <para>
-     &abstract-instquick;
+     &abstract-geoquick;
     </para>
    </listitem>
   </varlistentry>
   <varlistentry>
-   <term>&nfsquick;
-   </term>
+   <term>&geoguide;</term>
    <listitem>
     <para>
-     &abstract-nfsquick;
+     &abstract-geoguide;
     </para>
    </listitem>
   </varlistentry>
-  <!--<varlistentry>
-   <term>&pcmkremquick;
-   </term>
+  <varlistentry>
+   <term>&nfsquick;</term>
    <listitem>
     <para>
-     &abstract-pcmkremquick;
+     &abstract-nfsquick;
     </para>
    </listitem>
-  </varlistentry>-->
+  </varlistentry>
   <varlistentry>
-   <term>&geoquick;
-   </term>
+   <term>&pcmkremquick;</term>
    <listitem>
     <para>
-     &abstract-geoquick;
+     &abstract-pcmkremquick;
     </para>
    </listitem>
   </varlistentry>
diff --git a/xml/common_intro_feedback_i.xml b/xml/common_intro_feedback_i.xml
index 72633f71c..b44b7add1 100644
--- a/xml/common_intro_feedback_i.xml
+++ b/xml/common_intro_feedback_i.xml
@@ -20,7 +20,7 @@
 
  <variablelist>
   <varlistentry>
-   <term>Bugs and Enhancement Requests</term>
+   <term>Service and Support</term>
    <listitem>
     <para>
      For services and support options available for your product, refer to
@@ -33,6 +33,15 @@
      click <guimenu>Create New</guimenu>.
     </para>
    </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>Bug Reports</term>
+   <listitem>
+    <para>
+     If you have a &suse; Bugzilla account, click the <guimenu>Report Bug</guimenu>
+     links next to a headline in the HTML version of this  document. It takes you
+     to Bugzilla where you can open a bug report.</para>
+   </listitem>
   </varlistentry>
    <varlistentry>
    <term>Mail</term>
diff --git a/xml/ha_intro.xml b/xml/ha_intro.xml
index 3755598ae..df79915e9 100644
--- a/xml/ha_intro.xml
+++ b/xml/ha_intro.xml
@@ -86,11 +86,7 @@
   Many chapters in this manual contain links to additional documentation
   resources, either on the system or available on the Internet.
  </para>
- <para>
-  For an overview of the documentation available for your product and the
-  latest documentation updates, refer to
-  <link xlink:href="&dsc;"/>.
- </para>
+
   <xi:include href="common_intro_available_doc_i.xml"/>
   <xi:include href="common_intro_feedback_i.xml"/>
   <xi:include href="common_intro_typografie_i.xml"/>