[kde-doc-english] [kdepim] doc/kmail: doc: fix build

[Scarlett Clark]

On Wednesday, June 19, 2013 12:52:12 PM Pino Toscano wrote:
> Git commit bfd642b2f88ee472921204ca85af11cb42ebd20f by Pino 
Toscano.
> Committed on 19/06/2013 at 12:48.
> Pushed by pino into branch 'master'.
> 
> doc: fix build
> 
> - use the right entity for sendmail
> - remove <acronym> inside <guilabel>, which is wrong
> - comment out list section with broken markup
> 
> CCMAIL: carlett at scarlettgatelyclark.com
> CCMAIL: yurchor at ukr.net
> 
> M  +9    -7    doc/kmail/configure.docbook
> 
> 
http://commits.kde.org/kdepim/bfd642b2f88ee472921204ca85af11cb42eb
d20f
> 
> diff --git a/doc/kmail/configure.docbook b/doc/kmail/configure.docbook
> index 8a88e40..f953b93 100644
> --- a/doc/kmail/configure.docbook
> +++ b/doc/kmail/configure.docbook
> @@ -630,7 +630,7 @@ Account</guilabel> or <guilabel>Configure
> account</guilabel> dialogs will open respectively. For sending via
> &Sendmail;
>  or similar programs
>  you can specify a name and the location of the
> -&sendmail; program.  For &SMTP; you
> +&Sendmail; program.  For &SMTP; you
>  can specify <guilabel>Name</guilabel>, <guilabel>Outgoing mail
> server</guilabel>, and <guilabel>Port</guilabel> of the server. 
> <guilabel>Server requires authentication</guilabel> will enable the
> <guilabel>Login</guilabel> @@ -1261,6 +1261,7 @@ of key words can 
be
> modified.</para>
>       drop down box choose the language you would like to use.You can 
import
> settings from <application>LibreOffice</application> or another &kmail;
> installation by selecting the appropriate choice from the
> <guilabel>Import</guilabel> drop down box. If you need to save your
> settings for another installation or application, select the
> <guibutton>Export</guibutton> button. </para>
> +<!-- broken markup inside list
>         <para>
>  	<varlistentry><title>Autocorrect Options</title>
>  	  <listitem>
> @@ -1283,6 +1284,7 @@ of key words can be modified.</para>
>  	  </listitem>
>  	</varlistentry>
>        </para>
> +-->
>        <para>
>  	Once you have made all of your autocorrect selections click 
the
> <guibutton>Apply</guibutton> button. </para>
> @@ -1852,7 +1854,7 @@ of key words can be modified.</para>
> 
>  	<varlistentry id="configure-smime-online-certificate-
responder-url">
>  	  <term>
> -	    <guilabel><acronym>OCSP</acronym> responder 
&URL;</guilabel>
> +	    <guilabel>OCSP responder &URL;</guilabel>
>            </term>
>           <listitem>
>  	      <para>
> @@ -1987,11 +1989,11 @@ of key words can be modified.</para>
> 
>  	<varlistentry id="configure-smime-certificate-ldap-requests">
>  	  <term>
> -	    <guilabel>Do not perform any <acronym>LDAP</acronym>
> requests</guilabel> +	    <guilabel>Do not perform any LDAP
> requests</guilabel>
>  	  </term>
>  	  <listitem>
>  	    <para>
> -	     Entirely disables the use of <acronym>LDAP</acronym> 
for
> +	     Entirely disables the use of LDAP for
>  	     &smime;.
>  	    </para>
>  	  </listitem>
> @@ -1999,7 +2001,7 @@ of key words can be modified.</para>
> 
>  	<varlistentry id="configure-smime-certificate-ldap-distribution-point">
>  	  <term>
> -	    <guilabel>Ignore <acronym>LDAP</acronym> CRL 
Distribution Point of
> certificates</guilabel> +	    <guilabel>Ignore LDAP CRL 
Distribution Point
> of certificates</guilabel> </term>
>  	  <listitem>
>  	    <para>
> @@ -2018,7 +2020,7 @@ of key words can be modified.</para>
> 
>  	<varlistentry id="configure-smime-certificate-ldap-proxy-host">
>  	  <term>
> -	    <guilabel>Primary host for <acronym>LDAP</acronym> 
requests</guilabel>
> +	    <guilabel>Primary host for LDAP requests</guilabel>
>  	  </term>
>  	  <listitem>
>  	    <para>
> @@ -2465,4 +2467,4 @@ To enable this feature, add a line reading 
(under
> [Reader] section): </variablelist>
>  </sect1>
> 
> -</chapter>
> \ No newline at end of file
> +</chapter>
> _______________________________________________
> kde-doc-english mailing list
> kde-doc-english at kde.org
> https://mail.kde.org/mailman/listinfo/kde-doc-english



I have just wasted hours working on this file that is now changed. I said I 
would fix the sendmail error.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-doc-english/attachments/20130619/ec5d5317/attachment.html>