From 67135c3fb618962c15a5e3252b797686a30e3a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 11 Aug 2012 09:54:15 -0400 Subject: Bug 681641 - Port to new documentation infrastructure https://live.gnome.org/GnomeGoals/NewDocumentationInfrastructure --- help/C/default-browser.page | 4 ++-- help/C/mail-encryption-gpg-create-key.page | 2 +- help/C/mail-save-as-pdf.page | 2 +- help/C/offline.page | 2 +- help/C/problems-getting-help.page | 2 +- help/Makefile.am | 12 ++++++------ 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'help') diff --git a/help/C/default-browser.page b/help/C/default-browser.page index 404fe01f1d..e4fe3ffa94 100644 --- a/help/C/default-browser.page +++ b/help/C/default-browser.page @@ -26,7 +26,7 @@
Change which web browser websites are opened in -

Please see the GNOME Desktop Help.

+

Please see the GNOME Desktop Help.

If the preferred browser is set as default application but still does not work correctly please contact your distribution via their forum or bug tracker.

@@ -43,7 +43,7 @@
Change which mail application is used to write emails -

Please see the GNOME Desktop Help.

+

Please see the GNOME Desktop Help.

diff --git a/help/C/mail-encryption-gpg-create-key.page b/help/C/mail-encryption-gpg-create-key.page index 2d124ab4fd..488792a78b 100644 --- a/help/C/mail-encryption-gpg-create-key.page +++ b/help/C/mail-encryption-gpg-create-key.page @@ -22,7 +22,7 @@ Creating a GPG key -

These steps are very technical. For average users we recommend using the Seahorse application for managing GPG/OpenPGP keys.

+

These steps are very technical. For average users we recommend using the Seahorse application for managing GPG/OpenPGP keys.

Before you can get or send GPG encrypted mail, you need to generate your public and private keys with GPG.

diff --git a/help/C/mail-save-as-pdf.page b/help/C/mail-save-as-pdf.page index 8266ffd9e2..591b7ebb41 100644 --- a/help/C/mail-save-as-pdf.page +++ b/help/C/mail-save-as-pdf.page @@ -19,7 +19,7 @@ Save messages as PDF -

In order to save emails in the PDF file format, select FilePrint and then choose Print to File. See the desktop help for general information on printing.

+

In order to save emails in the PDF file format, select FilePrint and then choose Print to File. See the desktop help for general information on printing.

You can also export messages as PDF by dragging and dropping them to the file manager, instead of dropping them in mbox (text) format by default.

diff --git a/help/C/offline.page b/help/C/offline.page index 26ba047428..9eed232856 100644 --- a/help/C/offline.page +++ b/help/C/offline.page @@ -25,5 +25,5 @@

If this is not the case and Evolution normally works but has suddenly stopped connecting, you may have unintentionally clicked on the connection icon in the lower left corner. When connected, the icon resembles a pair of sockets joined together. If the sockets are open, there is no connection (and the Send/Receive button is grayed out). Click on the icon to change its state.

-

If the problem persists and you are sure you have not clicked the icon, but you can still reach the network from other apps on your system (browsers, FTP, SSH, ping etc.) it may be that NetworkManager (NM) is not properly configured. Many Linux distributions now use NM to manage their connections, and if it is installed Evolution will use it to detect if the network is up. However NM can be installed but not properly configured, leaving the network working but not detectable by Evolution. (Note that other GNOME-based applications may also fail for the same reason.) The solution is to configure NM to manage your network interface. This is usually easy to do but is outside the scope of this document. For more information please take a look at the Desktop help or seek help from your distribution support forums, mailing lists etc.

+

If the problem persists and you are sure you have not clicked the icon, but you can still reach the network from other apps on your system (browsers, FTP, SSH, ping etc.) it may be that NetworkManager (NM) is not properly configured. Many Linux distributions now use NM to manage their connections, and if it is installed Evolution will use it to detect if the network is up. However NM can be installed but not properly configured, leaving the network working but not detectable by Evolution. (Note that other GNOME-based applications may also fail for the same reason.) The solution is to configure NM to manage your network interface. This is usually easy to do but is outside the scope of this document. For more information please take a look at the Desktop help or seek help from your distribution support forums, mailing lists etc.

diff --git a/help/C/problems-getting-help.page b/help/C/problems-getting-help.page index 64d4edd94d..a5d2d355a4 100644 --- a/help/C/problems-getting-help.page +++ b/help/C/problems-getting-help.page @@ -21,5 +21,5 @@ How to get help -

To receive help on problems you can send an email to the Evolution mailing list or talk to developers and other users in the IRC chat channel #evolution on the server irc.gimp.net. To connect to an IRC server you can for example use the internet messenger application Empathy.

+

To receive help on problems you can send an email to the Evolution mailing list or talk to developers and other users in the IRC chat channel #evolution on the server irc.gimp.net. To connect to an IRC server you can for example use the internet messenger application Empathy.

diff --git a/help/Makefile.am b/help/Makefile.am index e166d80e9d..1b01ed88bb 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,9 +1,10 @@ +@YELP_HELP_RULES@ + SUBDIRS = quickref -include $(top_srcdir)/gnome-doc-utils.make +HELP_ID = evolution -DOC_ID = evolution -DOC_FIGURES = \ +HELP_MEDIA = \ figures/color-204a87.png \ figures/color-2e3436.png \ figures/color-4e9a06.png \ @@ -20,7 +21,7 @@ DOC_FIGURES = \ figures/search-icon.png \ figures/window-overview-layers.png -DOC_PAGES = \ +HELP_FILES = \ backup-restore.page \ calendar-alarms-and-reminders.page \ calendar-caldav.page \ @@ -237,7 +238,6 @@ DOC_PAGES = \ tasks-webdav.page \ using-categories.page -DOC_LINGUAS = cs de el en_GB es eu fr gl hu mk oc ru sl sv te zh_CN -dist-hook: doc-dist-hook +HELP_LINGUAS = cs de el en_GB es eu fr gl hu mk oc ru sl sv te zh_CN -include $(top_srcdir)/git.mk -- cgit v1.2.3