Revision: e3d1f0d2c2 Author: tmetsch Date: Tue Jun 1 03:24:17 2010 Log: fixed issue 41 http://code.google.com/p/occi/source/detail?r=e3d1f0d2c2 Modified: /docs/occi-infrastructure.xml /docs/occi-infrastructure_book.xml /docs/ogf_template.xsl ======================================= --- /docs/occi-infrastructure.xml Tue Jan 12 01:29:18 2010 +++ /docs/occi-infrastructure.xml Tue Jun 1 03:24:17 2010 @@ -179,7 +179,7 @@ <entry>Float (10^9 bytes)</entry> - <entry>RAM in megabytes (e.g. 16, 0.512)</entry> + <entry>RAM in gigabytes (e.g. 1, 0.512)</entry> </row> <row> @@ -416,7 +416,14 @@ <title>Storage</title> <para>A storage resource is capable of mass storage of data (e.g. a - virtual hard drive).</para> + virtual hard drive). </para> + + <note> + <para>The actions defined here should trigger operations on e.g. + virtual images. The implementation of these operations is left to + Cloud Storage APIs and the corresponding Storage backend + solutions.</para> + </note> <section> <title>Attributes</title> ======================================= --- /docs/occi-infrastructure_book.xml Tue Jan 12 04:29:36 2010 +++ /docs/occi-infrastructure_book.xml Tue Jun 1 03:24:17 2010 @@ -46,11 +46,14 @@ </listitem> <listitem> - <para>OCCI XHTML5 rendering</para> + <para>OCCI HTTP Header rendering</para> </listitem> <listitem> - <para>OCCI HTTP Header rendering</para> + <para>(OCCI XHTML5 rendering)<footnote> + <para>The OCCI XHTML5 rendering will be released in near + future.</para> + </footnote></para> </listitem> </itemizedlist> @@ -74,10 +77,10 @@ <section> <title>Contributors</title> - <para>The following people have contributed to this document.</para> + <para>The following people edited this document.</para> <table> - <title>List of contributors</title> + <title>List of editors</title> <tgroup cols="3"> <thead> @@ -102,7 +105,7 @@ <row> <entry>Sam Johnston</entry> - <entry>Australian Online Solutions</entry> + <entry>Google</entry> <entry>samj@samj.net</entry> </row> @@ -110,11 +113,32 @@ <row> <entry>Thijs Metsch</entry> - <entry>Sun Microsystems - RESERVOIR project</entry> - - <entry>thijs.metsch@sun.com</entry> + <entry>Sun Microsystems - RESERVOIR project, Platform + Computing</entry> + + <entry>tmetsch@platform.com</entry> </row> - + </tbody> + </tgroup> + </table> + + <para>The editors would like to thank the following contributors:</para> + + <table> + <title>List of contributors</title> + + <tgroup cols="3"> + <thead> + <row> + <entry align="center">Name</entry> + + <entry align="center">Affiliation</entry> + + <entry align="center">Contact</entry> + </row> + </thead> + + <tbody> <row> <entry>Gary Mazzaferro</entry> @@ -122,6 +146,22 @@ <entry>garymazzaferro@gmail.com</entry> </row> + + <row> + <entry>Shlomo Swidler</entry> + + <entry>Orchestratus</entry> + + <entry>shlomo.swidler@orchestratus.com</entry> + </row> + + <row> + <entry>Michael Behrens</entry> + + <entry>R2AD</entry> + + <entry>michael.behrens@r2ad.com</entry> + </row> </tbody> </tgroup> </table> @@ -161,7 +201,8 @@ <section> <title>Full Copyright Notice</title> - <para>Copyright (C) Open Grid Forum (2009,2010). All Rights Reserved.</para> + <para>Copyright (C) Open Grid Forum (2009,2010). All Rights + Reserved.</para> <para>This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or ======================================= --- /docs/ogf_template.xsl Thu Jan 14 05:30:01 2010 +++ /docs/ogf_template.xsl Tue Jun 1 03:24:17 2010 @@ -20,28 +20,34 @@ <xsl:param name="chapter.autolabel"> 1 </xsl:param> <xsl:param name="section.autolabel.max.depth"> 4 </xsl:param> - - <xsl:param name="shade.verbatim" select="1"></xsl:param> + + <xsl:param name="shade.verbatim" select="1" /> <xsl:attribute-set name="xref.properties"> <xsl:attribute name="font-family">serif</xsl:attribute> + <xsl:attribute name="font-size">8pt</xsl:attribute> + <xsl:attribute name="font-style">italic</xsl:attribute> </xsl:attribute-set> - + <!-- line breaking in verbatim --> + <xsl:attribute-set name="monospace.verbatim.properties"> <xsl:attribute name="wrap-option">wrap</xsl:attribute> + <xsl:attribute name="hyphenation-character">\</xsl:attribute> </xsl:attribute-set> <!-- borders for tips and warnings--> + <xsl:attribute-set name="admonition.properties"> <xsl:attribute name="border">0.5pt solid black</xsl:attribute> + <xsl:attribute name="padding">0.1in</xsl:attribute> </xsl:attribute-set> - <!-- general use sans-serif font--> + <!-- general use sans-serif font--> <xsl:attribute-set name="root.properties"> <xsl:attribute name="font-family">sans-serif</xsl:attribute> @@ -103,7 +109,8 @@ </xsl:attribute-set> <!-- temporary in there for para numbering --> -<!-- + + <!-- <xsl:template match="para[parent::section or parent::chapter]"> <fo:block xsl:use-attribute-sets="normal.para.spacing"> <xsl:call-template name="anchor" /> @@ -147,7 +154,7 @@ </fo:block> <fo:block> - <xsl:text>Jan. 12, 2010</xsl:text> + <xsl:text>Jun. 1, 2010</xsl:text> </fo:block> </xsl:when> </xsl:choose>