[evolution] help: Remove XInclude for Account settings' \"Identity\" section

[Andre Klapper <aklapper src gnome org>]

commit 4a51042771e672dbac51ec1433f63a1ed83b686f
Author: Andre Klapper <aklapper wikimedia org>
Date:   Tue Sep 3 13:48:38 2019 +0200

    help: Remove XInclude for Account settings' \"Identity\" section
    
    Did not work. No time to find out why, but make it work.

 help/C/intro-first-run.page                                 |  9 ++++++---
 help/C/mail-account-manage-imap-plus.page                   | 10 +++++-----
 help/C/mail-account-manage-local-delivery.page              | 10 +++++-----
 help/C/mail-account-manage-maildir-format-directories.page  | 10 +++++-----
 help/C/mail-account-manage-mh-format-directories.page       | 10 +++++-----
 help/C/mail-account-manage-microsoft-exchange-evo-ews.page  | 10 +++++-----
 help/C/mail-account-manage-microsoft-exchange-evo-mapi.page | 10 +++++-----
 help/C/mail-account-manage-pop.page                         | 10 +++++-----
 help/C/mail-account-manage-unix-mbox-spool-directory.page   | 10 +++++-----
 help/C/mail-account-manage-unix-mbox-spool-file.page        | 10 +++++-----
 help/C/mail-account-manage-usenet-news.page                 | 10 +++++-----
 help/C/xinclude-mail-account-identity.xml                   |  9 ---------
 help/CMakeLists.txt                                         |  1 -
 13 files changed, 56 insertions(+), 63 deletions(-)
---
diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index 66934073cb..f3f14abb44 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.page
@@ -25,9 +25,12 @@
 <p>The first time you run <app>Evolution</app>, it opens the First-Run Assistant. It helps you set up email 
accounts and <link xref="import-data">import data from other applications.</link></p>
 
 <p>This assistant is not shown if there is an already configured e-mail account in <link 
xref="help:gnome-help/accounts"><app>Online accounts</app></link> as that account is automatically picked by 
<app>Evolution</app>. Not all options of such accounts can be edited in <app>Evolution</app> and such 
accounts can only be removed in <app>Online accounts</app> itself.</p>
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="restore">
 <title>Restore from backup</title>
diff --git a/help/C/mail-account-manage-imap-plus.page b/help/C/mail-account-manage-imap-plus.page
index 40912128ce..7925acc9c5 100644
--- a/help/C/mail-account-manage-imap-plus.page
+++ b/help/C/mail-account-manage-imap-plus.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq> or by right-clicking on the respective top-level node in the folder list 
and choosing <gui>Properties</gui>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-local-delivery.page b/help/C/mail-account-manage-local-delivery.page
index 717bcbf1e1..d41f71d9c5 100644
--- a/help/C/mail-account-manage-local-delivery.page
+++ b/help/C/mail-account-manage-local-delivery.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-maildir-format-directories.page 
b/help/C/mail-account-manage-maildir-format-directories.page
index 8b50fc310a..8bb20a8c5c 100644
--- a/help/C/mail-account-manage-maildir-format-directories.page
+++ b/help/C/mail-account-manage-maildir-format-directories.page
@@ -26,11 +26,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-mh-format-directories.page 
b/help/C/mail-account-manage-mh-format-directories.page
index 61c8bc9003..7f1f9342ce 100644
--- a/help/C/mail-account-manage-mh-format-directories.page
+++ b/help/C/mail-account-manage-mh-format-directories.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page 
b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
index fde30569ee..7414c42dff 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq> or by right-clicking on the respective top-level node in the folder list 
and choosing <gui>Properties</gui>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page 
b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
index 4572759cf2..f054095084 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-mapi.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq> or by right-clicking on the respective top-level node in the folder list 
and choosing <gui>Properties</gui>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-pop.page b/help/C/mail-account-manage-pop.page
index 98c6ee45d2..7c69d05468 100644
--- a/help/C/mail-account-manage-pop.page
+++ b/help/C/mail-account-manage-pop.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-directory.page 
b/help/C/mail-account-manage-unix-mbox-spool-directory.page
index 666af18c18..7ffec092d9 100644
--- a/help/C/mail-account-manage-unix-mbox-spool-directory.page
+++ b/help/C/mail-account-manage-unix-mbox-spool-directory.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-unix-mbox-spool-file.page 
b/help/C/mail-account-manage-unix-mbox-spool-file.page
index 5aee599e6c..990f9e05f4 100644
--- a/help/C/mail-account-manage-unix-mbox-spool-file.page
+++ b/help/C/mail-account-manage-unix-mbox-spool-file.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/C/mail-account-manage-usenet-news.page b/help/C/mail-account-manage-usenet-news.page
index 3249278e5e..a5cb46701b 100644
--- a/help/C/mail-account-manage-usenet-news.page
+++ b/help/C/mail-account-manage-usenet-news.page
@@ -25,11 +25,11 @@
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui 
style="button">Edit</gui></guiseq> or by right-clicking on the respective top-level node in the folder list 
and choosing <gui>Properties</gui>.</p>
 <p>The following settings are available when editing an existing account:</p>
 
-<!-- As the "Identity" section is identical in all account pages, it is centrally in one file included 
-via XInclude. See +http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
-<include href="xinclude-mail-account-identity.xml"
- xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
- xmlns="https://www.w3.org/2001/XInclude"/>
+<section id="identity">
+<title>Identity</title>
+<p>Here you define your name and your email address.</p>
+<p>Optionally you can set a Reply-To email address (if you want replies to messages sent to a different 
address), set an organization (a company or organization you represent when you send email from this 
account), your default <link xref="mail-composer-mail-signatures">signature</link> for this account, and 
<link href="https://en.wikipedia.org/wiki/Email_alias";>email aliases</link>.</p>
+</section>
 
 <section id="receiving-email">
 <info>
diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index 5c32df2b7a..3fff5ede31 100644
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -231,7 +231,6 @@ set(HELP_FILES
        tasks-webdav.page
        using-categories.page
        xinclude-filter-vfolder-conditions.xml
-       xinclude-mail-account-identity.xml
        xinclude-searching.xml
 )