Mercurial > hg > nginx-site

changeset 52:666e85596e3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added support for <link url="..."> which should eventually replace <a href="..."> and renamed <http-error> to <http-status>.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 03 Oct 2011 11:56:50 +0000
parents d1e8781b9c5f
children 60796d056dde
files xml/en/docs/http/ngx_http_mp4_module.xml xsls/content.xsls xsls/link.xsls
diffstat 3 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_mp4_module.xml	Mon Oct 03 10:59:42 2011 +0000
+++ b/xml/en/docs/http/ngx_http_mp4_module.xml	Mon Oct 03 11:56:50 2011 +0000
@@ -51,8 +51,9 @@
 metadata comes before media data.
 This involves some CPU, memory, and disk I/O overhead,
 so it is a good idea to
-<a href="http://flowplayer.org/plugins/streaming/pseudostreaming.html#prepare">
-prepare an original file for pseudo-streaming</a>,
+<link
+url="http://flowplayer.org/plugins/streaming/pseudostreaming.html#prepare">
+prepare an original file for pseudo-streaming</link>,
 rather than having nginx do this on every such request.
 </para>
 
@@ -84,7 +85,7 @@
 <!--
 <para>
 A similar pseudo-streaming support for FLV files is provided by the module
-<a href="/en/docs/http/ngx_http_flv_module.xml">ngx_http_flv_module</a>.
+<link doc="ngx_http_flv_module.xml">ngx_http_flv_module</link>.
 </para>
 -->
 
@@ -144,8 +145,8 @@
 <para>
 During metadata processing, a larger buffer may become necessary.
 Its size cannot exceed the specified <argument>size</argument>,
-or else nginx will return
-<http-error code="500" text="Internal Server Error"/>,
+or else nginx will return the server error
+<http-status code="500" text="Internal Server Error"/>,
 and log the following:
 <example>
 "/some/movie/file.mp4" mp4 moov atom is too large:
--- a/xsls/content.xsls	Mon Oct 03 10:59:42 2011 +0000
+++ b/xsls/content.xsls	Mon Oct 03 11:56:50 2011 +0000
@@ -91,8 +91,8 @@
 	X:text {&#8220;} !!; X:text {&#8221;}
     }
 
-    X:template = "http-error" {
-        X:text { error code } !{@code} X:text { (} !{@text} X:text{)}
+    X:template = "http-status" {
+        !{@code} X:text { (} !{@text} X:text{)}
     }
 
     X:template = "dirname[/*[@lang='he']]" {
--- a/xsls/link.xsls	Mon Oct 03 10:59:42 2011 +0000
+++ b/xsls/link.xsls	Mon Oct 03 11:56:50 2011 +0000
@@ -64,4 +64,6 @@
 
 X:template = "img" { <img src="{@href}"> !!; </img> }
 
+X:template = "link[@url]" { <a href="{@url}"> !!; </a> }
+
 }