瀏覽代碼

Merge r25232 to 1.12 release branch

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25233 44c647ce-9c0f-0410-b52a-842ac1e357ba
frosch 13 年之前
父節點
當前提交
e25e6a7b54
共有 1 個文件被更改,包括 11 次插入16 次删除
  1. 11 16
      documentation/manual/en/module_specs/Zend_Feed_Writer.xml

+ 11 - 16
documentation/manual/en/module_specs/Zend_Feed_Writer.xml

@@ -588,22 +588,6 @@ $out = $feed->export('atom');
                     </row>
 
                     <row>
-                        <entry><methodname>setFeedLinks()</methodname></entry>
-
-                        <entry>
-                            Add a link to an <acronym>XML</acronym> feed, whether the feed being
-                            generated or an alternate <acronym>URI</acronym> pointing to the same
-                            feed but in a different format. At a minimum, it is recommended to
-                            include a link to the feed being generated so it has an identifiable
-                            final <acronym>URI</acronym> allowing a client to track its location
-                            changes without necessitating constant redirects. The parameter is an
-                            array of arrays, where each sub-array contains the keys "type" and
-                            "uri". The type should be one of "atom", "rss", or "rdf". If a type is
-                            omitted, it defaults to the type used when rendering the feed.
-                        </entry>
-                    </row>
-
-                    <row>
                         <entry><methodname>addAuthors()</methodname></entry>
 
                         <entry>
@@ -683,6 +667,17 @@ $out = $feed->export('atom');
                     </row>
 
                     <row>
+                        <entry><methodname>setEnclosure()</methodname></entry>
+
+                        <entry>
+                            Adds an enclosure to the entry. The array parameter may contain the
+                            keys 'uri', 'type' and 'length'. Only 'uri' is required for Atom, though the
+                            others must also be provided or <acronym>RSS</acronym> rendering
+                            (where they are required) will throw an Exception.
+                        </entry>
+                    </row>
+
+                    <row>
                         <entry><methodname>setCommentLink()</methodname></entry>
 
                         <entry>