Merge lp:~zorba-coders/zorba/email_doc into lp:zorba/email-module

Proposed by William Candillon
Status: Merged
Merged at revision: 54
Proposed branch: lp:~zorba-coders/zorba/email_doc
Merge into: lp:zorba/email-module
Diff against target: 70 lines (+18/-16)
2 files modified
src/com/zorba-xquery/www/modules/email/imap.xq (+9/-8)
src/com/zorba-xquery/www/modules/email/smtp.xq (+9/-8)
To merge this branch: bzr merge lp:~zorba-coders/zorba/email_doc
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve
William Candillon Approve
Review via email: mp+126942@code.launchpad.net

This proposal supersedes a proposal from 2012-09-27.

Description of the change

Minor documentation improvements.

To post a comment you must log in.
Revision history for this message
William Candillon (wcandillon) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote : Posted in a previous version of this proposal

William please set the Library tag back.
It is used in the module dependency graph to see external module dependencies.

review: Needs Fixing
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
William Candillon (wcandillon) wrote :

Nice catch. It's back.

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

Please note that these changes require the new XQDoc generator to be merged into the trunk first.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/email/imap.xq'
2--- src/com/zorba-xquery/www/modules/email/imap.xq 2012-04-11 09:50:26 +0000
3+++ src/com/zorba-xquery/www/modules/email/imap.xq 2012-09-28 12:14:25 +0000
4@@ -25,21 +25,22 @@
5 : in the email schema: <code>http://www.zorba-xquery.com/modules/email</code>.
6 :
7 : For example:
8- : <pre>
9- : &lt;email:hostInfo&gt;
10- : &lt;email:hostName&gt;imap.example.com&lt;/email:hostName&gt;
11- : &lt;email:userName&gt;myuser&lt;/email:userName&gt;
12- : &lt;email:password&gt;mypassword&lt;/email:password&gt;
13- : &lt;/email:hostInfo&gt;
14- : </pre>
15+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[
16+ : <email:hostInfo>
17+ : <email:hostName>imap.example.com</email:hostName>
18+ : <email:userName>myuser</email:userName>
19+ : <email:password>mypassword</email:password>
20+ : </email:hostInfo>
21+ : ]]></pre>
22 :
23 : The <code>hostInfoType</code> only needs to be in the email schema namespace
24 : (<code>http://www.zorba-xquery.com/modules/email</code>). It does not need
25 : to be validated since it's validated by the module.
26 :
27 : @author Daniel Thomas, Gabriel Petrovay
28+ : @see <a href="http://www.washington.edu/imap/">c-client library part of UW IMAP toolkit</a>
29 : @library <a href="http://www.washington.edu/imap/">c-client library part of UW IMAP toolkit</a>
30- : @project communication
31+ : @project Zorba/IO/IMAP
32 :)
33 module namespace imap = 'http://www.zorba-xquery.com/modules/email/imap';
34
35
36=== modified file 'src/com/zorba-xquery/www/modules/email/smtp.xq'
37--- src/com/zorba-xquery/www/modules/email/smtp.xq 2012-04-11 09:50:26 +0000
38+++ src/com/zorba-xquery/www/modules/email/smtp.xq 2012-09-28 12:14:25 +0000
39@@ -27,8 +27,9 @@
40 : documentation associated with this function.
41 :
42 : @author Sorin Nasoi, Daniel Thomas
43+ : @see <a href="http://www.washington.edu/imap/">c-client Library part of UW IMAP toolkit</a>
44 : @library <a href="http://www.washington.edu/imap/">c-client Library part of UW IMAP toolkit</a>
45- : @project communication
46+ : @project Zorba/IO/SMTP
47 :)
48 module namespace smtp = "http://www.zorba-xquery.com/modules/email/smtp";
49
50@@ -55,13 +56,13 @@
51 : </ul>
52 :
53 : The <code>$host-info</code> parameter could then look like this:
54- : <pre>
55- : &lt;hostInfo&gt;
56- : &lt;hostName&gt;smtp.gmail.com:587/tls/novalidate-cert&lt;hostName&gt;
57- : &lt;userName&gt;username&lt;userName&gt;
58- : &lt;password&gt;password&lt;password&gt;
59- : &lt;/hostInfo&gt;
60- : </pre>
61+ : <pre class="ace-static" ace-mode="xquery"><![CDATA[
62+ : <hostInfo>
63+ : <hostName>smtp.gmail.com:587/tls/novalidate-cert</hostName>
64+ : <userName>username</userName>
65+ : <password>password</password>
66+ : </hostInfo>
67+ : ]]></pre>
68 :
69 : For a complete of the structure of an email message, see the imported email
70 : schema: <code>http://www.zorba-xquery.com/modules/email</code>

Subscribers

People subscribed via source and target branches

to all changes: