Commit 431e33b9 authored by Andre Klapper's avatar Andre Klapper 💬
Browse files

User docs: Use XInclude for common Account Identity section to avoid string duplication

parent c9eef234
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -21,17 +21,15 @@
<section id="account-editor">
<title>Account Editor</title>
<p>Mail accounts can be added by choosing <guiseq><gui>File</gui><gui>New</gui><gui>Mail Account</gui></guiseq> or via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
<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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -21,17 +21,15 @@
<section id="account-editor">
<title>Account Editor</title>
<p>Mail accounts can be added by choosing <guiseq><gui>File</gui><gui>New</gui><gui>Mail Account</gui></guiseq> or via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
<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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
......@@ -25,12 +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>
<section id="identity">
<title>Identity</title>
<!-- TODO:XINCLUDE: Quite ugly to copy this text into all account type's, but it's not really worth a separate topic page for it, plus it would make the intro-first-run.page even more complex. Maybe later replace this text by a single instance by doing some content sharing with xinclude and xpointer in the other mail-account-manage-*.page files and in intro-first-run.page. <include href="foo.xml" xmlns="http://www.w3.org/2001/XInclude"/> See gnome-user-docs module for example usage. Also see https://bugzilla.gnome.org/show_bug.cgi?id=638866 -->
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
<!-- 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="http://www.w3.org/2001/XInclude"/>
<section id="receiving-email">
<title>Receiving Email and Receiving options</title>
......
<info xmlns="http://projectmallard.org/1.0/">
<section id="identity">
<title>Identity</title>
<p>Here you define your name and your email address.</p>
<p>Optionally you can make this account your default account (e.g. when writing emails), set a Reply-To email address (if you want replies to messages sent to a different address), and set an organization (the company where you work, or the organization you represent when you send email from this account).</p>
</section>
</info>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment