html5/2dcontext Overview.html,1.176,1.177

Update of /sources/public/html5/2dcontext
In directory hutz:/tmp/cvs-serv14885

Modified Files:
	Overview.html 
Log Message:
commit 9b732463a836d12e740d23490ae8252494cd4b97
Author: Silvia Pfeiffer <silviapfeiffer1@gmail.com>
Date:   Fri Sep 28 15:54:55 2012 +1000

    Update merge status.


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/2dcontext/Overview.html,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- Overview.html	28 Sep 2012 05:14:03 -0000	1.176
+++ Overview.html	28 Sep 2012 16:35:27 -0000	1.177
@@ -543,13 +543,11 @@
 
 -->
   // transformations (default transform is the identity matrix)
-           attribute <span>SVGMatrix</span> <a href=#dom-context-2d-currenttransform title=dom-context-2d-currentTransform>currentTransform</a>;
   void <a href=#dom-context-2d-scale title=dom-context-2d-scale>scale</a>(unrestricted double x, unrestricted double y);
   void <a href=#dom-context-2d-rotate title=dom-context-2d-rotate>rotate</a>(unrestricted double angle);
   void <a href=#dom-context-2d-translate title=dom-context-2d-translate>translate</a>(unrestricted double x, unrestricted double y);
   void <a href=#dom-context-2d-transform title=dom-context-2d-transform>transform</a>(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
   void <a href=#dom-context-2d-settransform title=dom-context-2d-setTransform>setTransform</a>(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
-  void <a href=#dom-context-2d-resettransform title=dom-context-2d-resetTransform>resetTransform</a>();
 <!--
[...1304 lines suppressed...]
    1984.</dd>
 
    <dt id=refsPPUTF8>[PPUTF8]</dt>
-   <dd>(Non-normative) <cite><a href=http://www.sw.it.aoyama.ac.jp/2012/pub/IUC11-UTF-8.pdf>The Properties and Promises <!-- Promizes (sic) --> of UTF-8</a></cite>, M. Dürst. University of Zürich. In <cite>Proceedings of the 11th International Unicode Conference</cite>.</dd>
+   <dd>(Non-normative) <cite><a href=http://www.ifi.uzh.ch/mml/mduerst/papers/PDF/IUC11-UTF-8.pdf>The
+   Properties and Promises <!-- Promizes (sic) --> of
+   UTF-8</a></cite>, M. Dürst. University of Zürich. In <cite>Proceedings of the 11th International
+   Unicode Conference</cite>.</dd>
 
    <dt id=refsPROGRESS>[PROGRESS]</dt>
    <dd><cite><a href=http://dev.w3.org/2006/webapi/progress/>Progress
@@ -6164,7 +5965,7 @@
    <dd><cite><a href=http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP949.TXT>Windows Codepage 949</a></cite>. Microsoft.</dd>
 
    <dt id=refsWSP>[WSP]</dt>
-   <dd><cite><a href=http://tools.ietf.org/html/rfc6455>The WebSocket protocol</a></cite>, I. Fette, A. Melnikov. IETF.</dd>
+   <dd><cite><a href=http://tools.ietf.org/html/rfc6455>The WebSocket protocol</a></cite>, I. Fette. IETF.</dd>
 
    <dt id=refsX121>[X121]</dt>
    <dd><cite>Recommendation X.121 — International Numbering Plan for

Received on Friday, 28 September 2012 16:35:32 UTC