Commit cb3679da authored by Sebastian Rasmussen's avatar Sebastian Rasmussen Committed by Milan Crha
Browse files

Bug 766111 - Use <app> and <gui> tags consistently in manual

parent ab411539
......@@ -135,8 +135,8 @@
</item>
<item>
<p>You can also mark the network folder for offline usage. To mark the
folder, right-click the folder, click Properties and select Copy Folder
Content Locally for Offline Operation.</p>
folder, right-click the folder, click <gui>Properties</gui> and select
<gui>Copy folder content locally for offline operation</gui>.</p>
</item>
<item>
<p>To prevent excess network traffic, <app>Evolution</app> does not
......
......@@ -2,7 +2,7 @@
type="topic" id="data-storage">
<info>
<desc>Where does Evolution store my data on the harddisk?</desc>
<desc>Where does <app>Evolution</app> store my data on the harddisk?</desc>
<link type="guide" xref="index#common-other-problems" />
......@@ -23,7 +23,7 @@
<p>This is only interesting for advanced users who want to debug problems.</p>
</note>
<p>Evolution 3.6 and later stores its data according to the <link href="http://www.freedesktop.org/wiki/Specifications/basedir-spec">XDG Base Directory Specification</link>. By default this means:</p>
<p><app>Evolution</app> 3.6 and later stores its data according to the <link href="http://www.freedesktop.org/wiki/Specifications/basedir-spec">XDG Base Directory Specification</link>. By default this means:</p>
<terms>
<item>
......
......@@ -28,7 +28,7 @@
<if:choose>
<if:when test="!platform:gnome-shell !platform:gnome-classic !platform:unity">
<p>In case you use Evolution under a different environment from GNOME,</p>
<p>In case you use <app>Evolution</app> under a different environment from GNOME,</p>
<steps>
<item>
<p>Open a terminal application.</p>
......@@ -49,7 +49,7 @@
</cmd></p>
</item>
<item>
<p>Evolution may need to be restarted for the settings to take effect.</p>
<p><app>Evolution</app> may need to be restarted for the settings to take effect.</p>
</item>
</steps>
<note style="tip">
......
......@@ -27,7 +27,7 @@
<section id="emails">
<title>Mail</title>
<p>Evolution deletes emails on IMAP servers by <em>marking</em> the messages for deletion; space is not freed until you <em>expunge</em> the marked emails. </p>
<p><app>Evolution</app> deletes emails on IMAP servers by <em>marking</em> the messages for deletion; space is not freed until you <em>expunge</em> the marked emails. </p>
<p>To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To Expunge all folders, go to <guiseq><gui>File</gui><gui>Empty Trash</gui></guiseq>. This applies to other types of accounts as well.</p>
</section>
......
......@@ -2,7 +2,7 @@
type="guide" id="deleting-to-free-disk-space">
<info>
<desc>Deleting emails and calendar entries to reduce the size of the files used by Evolution.</desc>
<desc>Deleting emails and calendar entries to reduce the size of the files used by <app>Evolution</app>.</desc>
<link type="guide" xref="index#common-other-problems" />
......
......@@ -19,5 +19,5 @@
<title>Connecting to Exchange Servers</title>
<p>For topics not covered here please refer to the <link href="https://help.gnome.org/users/evolution/2.32/usage-exchange.html">old Evolution manual</link>.</p>
<p>For topics not covered here please refer to the <link href="https://help.gnome.org/users/evolution/2.32/usage-exchange.html">old <app>Evolution</app> manual</link>.</p>
</page>
......@@ -17,6 +17,6 @@
</info>
<title>Exporting data from <em>Evolution</em></title>
<title>Exporting data from <app>Evolution</app></title>
</page>
......@@ -2,7 +2,7 @@
type="topic" id="import-apps-mozilla">
<info>
<desc>Importing data from Mozilla Thunderbird.</desc>
<desc>Importing data from Mozilla <app>Thunderbird</app>.</desc>
<link type="guide" xref="import-data#import-from-apps" />
......@@ -24,14 +24,14 @@
<steps>
<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
<item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
<item><p>Go to the folder in which Thunderbird stores its data. On a Linux system, Thunderbird's files are located in the hidden folder <file>$HOME/.thunderbird/12345678</file>. <file>12345678</file> will be a random string. If you cannot see the <file>.thunderbird</file> folder, make sure to <link xref="help:gnome-help/files-hidden#show-hidden" href="https://help.gnome.org/users/gnome-help/stable/files-hidden#show-hidden">show hidden files</link> in the file selector dialog.</p></item>
<item><p>Go to the folder in which <app>Thunderbird</app> stores its data. On a Linux system, <app>Thunderbird</app>'s files are located in the hidden folder <file>$HOME/.thunderbird/12345678</file>. <file>12345678</file> will be a random string. If you cannot see the <file>.thunderbird</file> folder, make sure to <link xref="help:gnome-help/files-hidden#show-hidden" href="https://help.gnome.org/users/gnome-help/stable/files-hidden#show-hidden">show hidden files</link> in the file selector dialog.</p></item>
<item>
<list>
<item><p>If you would like to import Thunderbird mail, go to <file>Mail/Local Folders</file> (for local mail accounts) or <file>ImapMail/servername</file> (for remote mail accounts). <file>servername</file> will be the address of your remote mail server. Files without a file ending include your messages (not the <file>.msf</file> files).</p></item>
<item><p>If you would like to import Thunderbird/Lightning calendar data, you may be able to export your Thunderbird events as an <file>.ical</file>/<file>.ics</file> file first, and import these files into Evolution. This is required as Thunderbird stores its calendar data in a non-standard database format.</p></item>
<item><p>If you would like to import <app>Thunderbird</app> mail, go to <file>Mail/Local Folders</file> (for local mail accounts) or <file>ImapMail/servername</file> (for remote mail accounts). <file>servername</file> will be the address of your remote mail server. Files without a file ending include your messages (not the <file>.msf</file> files).</p></item>
<item><p>If you would like to import <app>Thunderbird/Lightning</app> calendar data, you may be able to export your <app>Thunderbird</app> events as an <file>.ical</file>/<file>.ics</file> file first, and import these files into <app>Evolution</app>. This is required as <app>Thunderbird</app> stores its calendar data in a non-standard database format.</p></item>
</list>
<p>The file type will be automatically determined.</p></item>
<item><p>Choose the destination (e.g. the folder or calendar in Evolution) for the imported data.</p></item>
<item><p>Choose the destination (e.g. the folder or calendar in <app>Evolution</app>) for the imported data.</p></item>
<item><p>Repeat the import steps until you have imported all your data.</p></item>
</steps>
</page>
......@@ -23,7 +23,7 @@
<title>Outlook</title>
<!-- "Import data and settings from older programs" cannot recognize Outlook, as there obviously is no default storage location for Outlook *under Linux* -->
<p>These steps refer to locally stored data such as POP accounts. For remote data (like IMAP) this is not necessary, since the data is still on the server and does not need to be manually transferred. You can set up the corresponding account in Evolution and the data will be downloaded.</p>
<p>These steps refer to locally stored data such as POP accounts. For remote data (like IMAP) this is not necessary, since the data is still on the server and does not need to be manually transferred. You can set up the corresponding account in <app>Evolution</app> and the data will be downloaded.</p>
<section id="prerequisites">
<title>Prerequisites under Windows</title>
......@@ -44,17 +44,17 @@
<p>(Replace "username" by your username.)</p>
</item>
<!-- File locations taken from http://support.microsoft.com/kb/2291280 and http://answers.microsoft.com/en-us/windows/forum/windows_7-files/where-is-location-of-outlookpst-file-in-windows-7/3a4c03c3-e8ad-4912-9e37-f1c62057d1f9 -->
<item><p>Copy the Outlook files to the system or partition that Evolution is installed on.</p>
<item><p>Copy the Outlook files to the system or partition that <app>Evolution</app> is installed on.</p>
<p>As your Windows hard drive is probably in the NTFS format, some Linux systems cannot read it without additional software. You might find it simpler to copy the mail folders to a USB drive or to burn a CD.</p></item>
</steps>
</section>
<section id="importing">
<title>Importing into Evolution</title>
<title>Importing into <app>Evolution</app></title>
<steps>
<item><p>Depending on your last step, either plug in the disk or USB drive with the data and wait until the file manager window opens, or mount your Windows drive.</p></item>
<item><p>Copy all the mail files into your home directory or another convenient place.</p></item>
<item><p>Start Evolution.</p></item>
<item><p>Start <app>Evolution</app>.</p></item>
<item><p>Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</gui></guiseq> to create the <link xref="mail-folders">folders</link> you want.</p></item>
<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
......@@ -62,7 +62,7 @@
<item><p>Choose the Outlook personal folders (.pst) file that you would like to import.</p><p>The file type will be automatically determined.</p>
<note style="tip"><p>If the option to import Outlook personal folders (.pst files) is not available under <guiseq><gui>File</gui><gui>Import</gui><gui>Import single file</gui><gui>File type</gui></guiseq>, your distribution might have not enabled this functionality.</p></note>
</item>
<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
<item><p>Choose the destination (e.g. the folder in <app>Evolution</app>) for the imported data.</p></item>
<item><p>Repeat the import steps until you have imported all your data.</p></item>
</steps>
......
......@@ -24,7 +24,7 @@
<item><p>Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>.</p></item>
<item><p>In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>.</p></item>
<item><p>Choose the file.</p><p>The file type will be automatically determined.</p></item>
<item><p>Choose the destination (e.g. the folder in Evolution) for the imported data.</p></item>
<item><p>Choose the destination (e.g. the folder in <app>Evolution</app>) for the imported data.</p></item>
</steps>
<note style="tip"><p>You can also import contacts that you have received as a vCard attachment of an email from its attachment menu.</p></note>
......
......@@ -22,22 +22,22 @@
<title>Supported file formats</title>
<p>Evolution can import the following types of files:</p>
<p><app>Evolution</app> can import the following types of files:</p>
<section id="mail">
<title>Mail</title>
<list>
<item><p>
Berkeley Mailbox (.mbox or no extension):</p>
<p>The email format used by Mozilla, Netscape, Evolution (for local folders until version 2.32), Eudora, and many other email clients.
<p>The email format used by <app>Mozilla</app>, <app>Netscape</app>, <app>Evolution</app> (for local folders until version 2.32), <app>Eudora</app>, and many other email clients.
</p></item>
<item><p>
Maildir (no extension):</p>
<p>The format used by Evolution (for local folders since version 3.0). There is no need to import Maildir files as you can <link xref="mail-account-manage-maildir-format-directories">configure a Maildir account</link> in Evolution and point to the folder where the Maildir files are stored.
<p>The format used by <app>Evolution</app> (for local folders since version 3.0). There is no need to import Maildir files as you can <link xref="mail-account-manage-maildir-format-directories">configure a Maildir account</link> in <app>Evolution</app> and point to the folder where the Maildir files are stored.
</p></item>
<item><p>
Outlook Express 5/6 Personal Folders (.dbx):</p>
<p>The email file format used by Microsoft Outlook Express 5/6. For newer versions PST import is recommended.
<p>The email file format used by <app>Microsoft Outlook Express 5/6</app>. For newer versions PST import is recommended.
</p></item>
</list>
</section>
......@@ -47,11 +47,11 @@ Outlook Express 5/6 Personal Folders (.dbx):</p>
<list>
<item><p>
vCalendar (.vcs):</p>
<p>A format for storing calendar files, which is generally used by Evolution, Microsoft Outlook, Sunbird, and Korganizer.
<p>A format for storing calendar files, which is generally used by <app>Evolution</app>, <app>Microsoft Outlook</app>, <app>Sunbird</app>, and <app>Korganizer</app>.
</p></item>
<item><p>
iCalendar or iCal (.ics):</p>
<p>A format for storing calendar files. iCalendar is used by Evolution, Microsoft Outlook, Palm OS handhelds, and others.
<p>A format for storing calendar files. iCalendar is used by <app>Evolution</app>, <app>Microsoft Outlook</app>, Palm OS handhelds, and others.
</p></item>
</list>
</section>
......@@ -74,12 +74,12 @@ vCard (.vcf, .gcrd):</p>
<title>Miscellaneous</title>
<list>
<item><p>
Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
<p>CSV (Comma-separated values) or Tabulator files saved by using Evolution, Microsoft Outlook and Mozilla.
<app>Evolution</app>/Mozilla/Outlook CSV/Tab (.csv, .tab):</p>
<p>CSV (Comma-separated values) or Tabulator files saved by using <app>Evolution</app>, <app>Microsoft Outlook</app> and <app>Mozilla</app>.
</p></item>
<item><p>
Outlook Personal Folders (.pst):</p>
<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as Microsoft Exchange Client, Windows Messaging, and Microsoft Outlook. It is also called "Personal Storage Table".
<p>A file format used to store local copies of messages, calendar events, and other items within Microsoft software such as <app>Microsoft Exchange Client</app>, <app>Windows Messaging</app>, and <app>Microsoft Outlook</app>. It is also called "Personal Storage Table".
</p></item>
</list>
</section>
......
......@@ -4,7 +4,7 @@
<info>
<desc>Manage your email, contacts and schedule</desc>
<title type='link' role="trail"><media type="image" its:translate="no" src="figures/evolutionlogo.png"/></title>
<title type='text'>Evolution Mail and Calendar</title>
<title type='text'><app>Evolution</app> Mail and Calendar</title>
<revision pkgversion="3.8.2" version="0.7" date="2013-06-22" status="final"/>
<credit type="author">
<name its:translate="no">Phil Bull</name>
......@@ -24,7 +24,7 @@
<media type="image" its:translate="no" src="figures/evolutionlogo.png">
<span its:translate="yes">Evolution logo</span>
</media>
Evolution Mail and Calendar
<app>Evolution</app> Mail and Calendar
</title>
<section id="getting-started" style="2column">
......
......@@ -2,7 +2,7 @@
type="topic" id="intro-application">
<info>
<desc>An introduction to Evolution.</desc>
<desc>An introduction to <app>Evolution<app>.</desc>
<link type="guide" xref="index#getting-started"/>
......@@ -22,10 +22,10 @@
</info>
<title>Getting Started</title>
<p>Evolution allows you to access your personal information like your calendars, mail, address books and tasks in one place.</p>
<p><app>Evolution</app> allows you to access your personal information like your calendars, mail, address books and tasks in one place.</p>
<p>By default Evolution opens the mail view. This is were you can view all your mail. You can change to other views of the application by going to the bottom of the left pane in the window (the so-called "switcher") and selecting the desired view. <link xref="intro-main-window">Learn more about the elements of the main window.</link></p>
<p>By default <app>Evolution</app> opens the mail view. This is were you can view all your mail. You can change to other views of the application by going to the bottom of the left pane in the window (the so-called "switcher") and selecting the desired view. <link xref="intro-main-window">Learn more about the elements of the main window</link>.</p>
<note style="advanced"><p>When Evolution starts, it remembers the last view that you used. However you can also explicitly start Evolution in a specific view. For the calendar view, use the command <cmd>evolution --component=calendar</cmd> in the <app>Terminal</app> application. Other available options are "mail", "contacts", "tasks", and "memos".</p></note>
<note style="advanced"><p>When <app>Evolution</app> starts, it remembers the last view that you used. However you can also explicitly start <app>Evolution</app> in a specific view. For the calendar view, use the command <cmd>evolution --component=calendar</cmd> in the <app>Terminal</app> application. Other available options are "mail", "contacts", "tasks", and "memos".</p></note>
</page>
......@@ -5,7 +5,7 @@
type="topic" id="intro-first-run">
<info>
<desc>Running Evolution for the very first time.</desc>
<desc>Running <app>Evolution</app> for the very first time.</desc>
<link type="guide" xref="index#getting-started"/>
......@@ -22,7 +22,7 @@
<title>Starting <app>Evolution</app> for the first time</title>
<p>The first time you run Evolution, it opens the First-Run Assistant to help you set up email accounts and <link xref="import-data">import data from other applications.</link></p>
<p>The first time you run <app>Evolution</app>, it opens the First-Run Assistant to help you set up email accounts and <link xref="import-data">import data from other applications.</link></p>
<include href="xinclude-mail-account-identity.xml"
xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
......@@ -228,7 +228,7 @@
<section id="server-type-none">
<title>None</title>
<p>If you do not plan to use Evolution for receiving email.</p>
<p>If you do not plan to use <app>Evolution</app> for receiving email.</p>
</section>
</section>
......
......@@ -2,7 +2,7 @@
type="topic" id="intro-main-window">
<info>
<desc>An explanation of the areas shown in the Evolution window.</desc>
<desc>An explanation of the areas shown in the <app>Evolution</app> window.</desc>
<link type="guide" xref="index#getting-started"/>
<link type="seealso" xref="calendar-layout"/>
......@@ -29,13 +29,13 @@
<title>The <app>Evolution</app> main window</title>
<!-- This section fixes https://bugzilla.gnome.org/show_bug.cgi?id=657028 -->
<p>Evolution provides functionality for Email, Calendar, Contacts, Tasks, and Memos. You can switch to another functionality by using the "Switcher" buttons in the lower left corner. Depending on the displayed functionality also the displayed elements in the window differ.</p>
<p><app>Evolution</app> provides functionality for Email, Calendar, Contacts, Tasks, and Memos. You can switch to another functionality by using the "Switcher" buttons in the lower left corner. Depending on the displayed functionality also the displayed elements in the window differ.</p>
<section id="e-mail">
<title>Mail</title>
<media type="image" src="./figures/window-overview-layers.png" width="600">
<p>The Evolution mail main window</p>
<p>The <app>Evolution</app> mail main window</p>
</media>
<p>Corresponding elements in the mail main window:</p>
......@@ -74,7 +74,7 @@
</item>
<item>
<title>Switcher</title>
<p>The switcher at the bottom of the side bar lets you switch between the Evolution tools: Mail, Contacts, Calendars, Memos and Tasks.</p><p>For more information see <link xref="change-switcher-appearance">Changing the Switcher appearance</link>.</p>
<p>The switcher at the bottom of the side bar lets you switch between the <app>Evolution</app> tools: Mail, Contacts, Calendars, Memos and Tasks.</p><p>For more information see <link xref="change-switcher-appearance">Changing the Switcher appearance</link>.</p>
<note style="tip"><p>You can disable the folder list and the switcher side bar by toggling <guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq> or pressing <key>F9</key>.</p></note>
</item>
<item>
......
......@@ -21,7 +21,7 @@
<!-- Page only exists for the <note>, apart from that nothing special. -->
<title>Access a Gmail IMAP Account via Evolution</title>
<title>Access a Gmail IMAP Account via <app>Evolution</app></title>
<p>Please refer to the <link xref="mail-account-manage-imap-plus">IMAP+ mail account settings</link>.</p>
......
......@@ -25,9 +25,9 @@
<title>Access a Gmail POP Account via Evolution</title>
<title>Access a Gmail POP Account via <app>Evolution</app></title>
<p>Follow these steps to set up your Gmail POP Account in Evolution:</p>
<p>Follow these steps to set up your Gmail POP Account in <app>Evolution</app>:</p>
<steps>
<item><p>Log in to your Gmail account.</p></item>
......@@ -40,7 +40,7 @@
</item>
<item><p>Specify the other required settings for this Gmail feature.</p></item>
<item><p>To know the Gmail Account settings, click on <gui>Configuration instructions</gui>. Choose <gui>I want to enable POP</gui> and select <gui>Other</gui> from the list of clients.</p></item>
<item><p>On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Click <gui style="button">Add</gui>. </p></item>
<item><p>On your <app>Evolution</app> client, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui></guiseq>. Click <gui style="button">Add</gui>. </p></item>
<item><p>Provide the required information. For the account settings, refer to Step 5.</p></item>
</steps>
</page>
......
......@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-imap-plus">
<info>
<desc>Add and edit an IMAP+ mail account in Evolution.</desc>
<desc>Add and edit an IMAP+ mail account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-common-account-types"/>
......
......@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-local-delivery">
<info>
<desc>Add and edit a Local Delivery account in Evolution.</desc>
<desc>Add and edit a Local Delivery account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-local-account-types"/>
......
......@@ -2,7 +2,7 @@
type="guide" id="mail-account-manage-maildir-format-directories">
<info>
<desc>Add and edit a Maildir Format Mail Directories account in Evolution.</desc>
<desc>Add and edit a Maildir Format Mail Directories account in <app>Evolution</app>.</desc>
<link type="guide" xref="mail-account-management#mail-local-account-types"/>
......@@ -21,7 +21,7 @@
<section id="account-editor">
<title>Account Editor</title>
<p>Evolution supports the Maildir++ specification.</p>
<p><app>Evolution</app> supports the Maildir++ specification.</p>
<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>.</p>
<p>The following settings are available when editing an existing account:</p>
......
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