[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst                 |    1 -
 source/text/shared/guide/spadmin.xhp |   29 ++---------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

New commits:
commit 8b9f7abb275c3b3f9f3e7ed4715d63111b23a690
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 20 13:17:03 2014 +0000

    drop unused helpid
    
    Change-Id: Ib4d028d4b613d75e5e09694b39426d22a283fea3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c22036f..2e733bb 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5872,7 +5872,6 @@ svtools_Edit_DLG_LOGIN_ED_LOGIN_ACCOUNT,1336428575,
 svtools_Edit_DLG_LOGIN_ED_LOGIN_PASSWORD,1336428573,
 svtools_Edit_DLG_LOGIN_ED_LOGIN_PATH,1336428566,
 svtools_Edit_DLG_LOGIN_ED_LOGIN_USERNAME,1336428570,
-svtools_Edit_DLG_SVT_PRNDLG_PRINTDLG_EDT_FAXNO,1338787856,
 svtools_Edit_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES,1338787873,
 svtools_Edit_TT_INLINE_TRANSLATION_TT_E_COMMENT,2886666245,
 svtools_Edit_TT_INLINE_TRANSLATION_TT_E_NEW,2886666242,
commit aa0892d173783de253a87e11e605c5bf6df138a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 20 12:58:59 2014 +0000

    rewrite FAX under Unix to recommend fax4CUPS
    
    Change-Id: Id8300f9d1546b6948e96845a9e84b780f8f158f2

diff --git a/source/text/shared/guide/spadmin.xhp b/source/text/shared/guide/spadmin.xhp
index 0ffeec8..215ef01 100644
--- a/source/text/shared/guide/spadmin.xhp
+++ b/source/text/shared/guide/spadmin.xhp
@@ -161,33 +161,8 @@
 </list>
 <paragraph role="paragraph" id="par_id3150644" xml-lang="en-US" l10n="E" oldref="343" localize="false"/>
 <paragraph role="heading" id="hd_id3154204" xml-lang="en-US" level="2" l10n="U" oldref="141">Using Fax Functionality</paragraph>
-<paragraph role="paragraph" id="par_id3148463" xml-lang="en-US" l10n="U" oldref="52">If you have installed a fax package such as Efax or HylaFax on your computer, you can send faxes with the $[officename] software.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3154575" xml-lang="en-US" l10n="U" oldref="355">Change to the {install_path}/program directory.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="356">Enter: ./spadmin</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146808" xml-lang="en-US" l10n="U" oldref="298">Click <emph>New Printer</emph>. This opens the <emph>Add Printer</emph> dialog.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3151070" xml-lang="en-US" l10n="U" oldref="299">Select <emph>Connect a fax device</emph>. Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="300">Choose whether to use the default driver or another printer driver. If you are not using the default driver, select the appropriate driver. Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3155111" xml-lang="en-US" l10n="U" oldref="301">Enter a command line with which to communicate with the fax in the following dialog. In the command line of each fax sent "(TMP)" is replaced by a temporary file and "(PHONE)" by the telephone number of the recipient fax machine. If "(TMP)" occurs in the command line, the PostScript code is transmitted in a file, otherwise as standard input through a pipe. Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="302">Assign a name to your new fax printer and determine whether the telephone numbers (see below) marked in the text should be removed from the printout, or not. Click <emph>Finish</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="303">You can now send faxes by printing to the printer that has just been created.</paragraph>
-<paragraph role="paragraph" id="par_id3148419" xml-lang="en-US" l10n="U" oldref="83">Enter the fax number as text in the document. You can also enter a field that takes the fax number from your active database. In any case, the fax number must start with the characters @@# and end with @@. A valid entry would have the form @@#1234567@@.</paragraph>
-<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="304">If these characters including the telephone number are not printed, activate the <emph>Fax number is removed from the printout</emph> option under <emph>Properties</emph> on the <emph>Command</emph> tab page. If no telephone number is entered in the document, a dialog prompting you for it will appear after the printout.</paragraph>
+<paragraph role="paragraph" id="par_id3148463" xml-lang="en-US" l10n="U" oldref="52">If you have installed fax4CUPS on your computer you can send faxes with the $[officename] software.</paragraph>
+<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="304">A dialog prompting you for the phone numbers to send the fax to will appear after the printout when printing to a fax4CUPS printer. Multiple numbers can be entered separated by ;</paragraph>
 <paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3150517" xml-lang="en-US" l10n="CHG" oldref="84">Remember to create one separate print job for each fax, otherwise, the first recipient will receive all the faxes. In the <emph>Tools - Mail Merge</emph> dialog select the <emph>Printer</emph> option and then select the <emph>Single print jobs</emph> check box.</paragraph>
 <paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="E" oldref="344" localize="false"/>