Appended license to docs/ site. Added PIL @requires in utils.py and g…

…enerally refactored the documentation pages.

LICENSE

@@ -1,10 +1,10 @@
-European Union Public Licence
+European Union Public Licence
 
 V. 1.1
 
-EUPL � the European Community 2007
+EUPL © the European Community 2007
 
-This European Union Public Licence (the �EUPL�) applies to the Work or Software
+This European Union Public Licence (the “EUPL”) applies to the Work or Software
 (as defined below) which is provided under the terms of this Licence. Any use of the
 Work, other than as authorised under this Licence is prohibited (to the extent such use
 is covered by a right of the copyright holder of the Work).
@@ -47,7 +47,7 @@ Work under the Licence.
 - Contributor(s): any natural or legal person who modifies the Work under the
 Licence, or otherwise contributes to the creation of a Derivative Work.
 
-- The Licensee or �You�: any natural or legal person who makes any usage of the
+- The Licensee or “You”: any natural or legal person who makes any usage of the
 Software under the terms of the Licence.
 
 - Distribution and/or Communication: any act of selling, giving, lending, renting,
@@ -122,8 +122,8 @@ Compatibility clause: If the Licensee Distributes and/or Communicates Derivative
 Works or copies thereof based upon both the Original Work and another work
 licensed under a Compatible Licence, this Distribution and/or Communication can be
 done under the terms of this Compatible Licence. For the sake of this clause,
-�Compatible Licence� refers to the licences listed in the appendix attached to this
-Licence. Should the Licensee�s obligations under the Compatible Licence conflict
+“Compatible Licence” refers to the licences listed in the appendix attached to this
+Licence. Should the Licensee’s obligations under the Compatible Licence conflict
 with his/her obligations under this Licence, the obligations of the Compatible Licence
 shall prevail.
 
@@ -154,10 +154,10 @@ Licence.
 7. Disclaimer of Warranty
 
 The Work is a work in progress, which is continuously improved by numerous
-contributors. It is not a finished work and may therefore contain defects or �bugs�
+contributors. It is not a finished work and may therefore contain defects or “bugs”
 inherent to this type of software development.
 
-For the above reason, the Work is provided under the Licence on an �as is� basis and
+For the above reason, the Work is provided under the Licence on an “as is” basis and
 without warranties of any kind concerning the Work, including without limitation
 merchantability, fitness for a particular purpose, absence of defects or errors,
 accuracy, non-infringement of intellectual property rights other than copyright as
@@ -189,7 +189,7 @@ Contributor by the fact You have accepted any such warranty or additional liabil
 
 10. Acceptance of the Licence
 
-The provisions of this Licence can be accepted by clicking on an icon �I agree�
+The provisions of this Licence can be accepted by clicking on an icon “I agree”
 placed under the bottom of a window displaying the text of this Licence or by
 affirming consent in any other similar way, in accordance with the rules of applicable
 law. Clicking on that icon indicates your clear and irrevocable acceptance of this
@@ -261,7 +261,7 @@ registered office inside a European Union country.
 
 Appendix
 
-�Compatible Licences� according to article 5 EUPL are:
+“Compatible Licences” according to article 5 EUPL are:
 - GNU General Public License (GNU GPL) v. 2
 - Open Software License (OSL) v. 2.1, v. 3.0
 - Common Public License v. 1.0

doc/_build/html/_sources/index.txt

@@ -24,6 +24,7 @@ Contents:
    api
    bugs
    features
+   license
    ui
 
 

doc/_build/html/_sources/license.txt

@@ -0,0 +1,5 @@
+License
+=================================
+
+.. include:: license.txt
+

doc/_build/html/api.html

@@ -54,7 +54,7 @@ <h3>Navigation</h3>
 
   <div class="section" id="automated-code-documentation">
 <h1>Automated Code Documentation<a class="headerlink" href="#automated-code-documentation" title="Permalink to this headline">¶</a></h1>
-<p>Documentation generated on 2013-05-16 at 12:08.</p>
+<p>Documentation generated on 2013-05-16 at 13:15.</p>
 <div class="section" id="module-add_file">
 <span id="add-file-module"></span><h2>Add file module<a class="headerlink" href="#module-add_file" title="Permalink to this headline">¶</a></h2>
 <p>Created on 5.6.2012</p>
@@ -1202,6 +1202,7 @@ <h1>Automated Code Documentation<a class="headerlink" href="#automated-code-docu
 <span id="utils-module"></span><h2>Utils module<a class="headerlink" href="#module-utils" title="Permalink to this headline">¶</a></h2>
 <p>Created on 9.5.2012</p>
 <p>&#64;author: neriksso</p>
+<p>&#64;requires: <a class="reference external" href="http://www.pythonware.com/products/pil/">PIL</a></p>
 <p>&#64;requires: WMI</p>
 <p>&#64;requires: wxPython</p>
 <dl class="function">

doc/_build/html/features.html

@@ -24,7 +24,7 @@
     <script type="text/javascript" src="_static/underscore.js"></script>
     <script type="text/javascript" src="_static/doctools.js"></script>
     <link rel="top" title="DiWaCS 0.9.2.1 documentation" href="index.html" />
-    <link rel="next" title="User Interface" href="ui.html" />
+    <link rel="next" title="License" href="license.html" />
     <link rel="prev" title="Bugs" href="bugs.html" /> 
   </head>
   <body>
@@ -38,7 +38,7 @@ <h3>Navigation</h3>
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
         <li class="right" >
-          <a href="ui.html" title="User Interface"
+          <a href="license.html" title="License"
              accesskey="N">next</a> |</li>
         <li class="right" >
           <a href="bugs.html" title="Bugs"
@@ -91,8 +91,8 @@ <h4>Previous topic</h4>
   <p class="topless"><a href="bugs.html"
                         title="previous chapter">Bugs</a></p>
   <h4>Next topic</h4>
-  <p class="topless"><a href="ui.html"
-                        title="next chapter">User Interface</a></p>
+  <p class="topless"><a href="license.html"
+                        title="next chapter">License</a></p>
 <div id="searchbox" style="display: none">
   <h3>Quick search</h3>
     <form class="search" action="search.html" method="get">
@@ -120,7 +120,7 @@ <h3>Navigation</h3>
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
         <li class="right" >
-          <a href="ui.html" title="User Interface"
+          <a href="license.html" title="License"
              >next</a> |</li>
         <li class="right" >
           <a href="bugs.html" title="Bugs"

doc/_build/html/index.html

@@ -79,6 +79,25 @@ <h1>Welcome to DiWaCS documentation!<a class="headerlink" href="#welcome-to-diwa
 </li>
 <li class="toctree-l1"><a class="reference internal" href="bugs.html">Bugs</a></li>
 <li class="toctree-l1"><a class="reference internal" href="features.html">Features</a></li>
+<li class="toctree-l1"><a class="reference internal" href="license.html">License</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="license.html#definitions">1. Definitions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#scope-of-the-rights-granted-by-the-licence">2. Scope of the rights granted by the Licence</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#communication-of-the-source-code">3. Communication of the Source Code</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#limitations-on-copyright">4. Limitations on copyright</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#obligations-of-the-licensee">5. Obligations of the Licensee</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#chain-of-authorship">6. Chain of Authorship</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#disclaimer-of-warranty">7. Disclaimer of Warranty</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#disclaimer-of-liability">8. Disclaimer of Liability</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#additional-agreements">9. Additional agreements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#acceptance-of-the-licence">10. Acceptance of the Licence</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#information-to-the-public">11. Information to the public</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#termination-of-the-licence">12. Termination of the Licence</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#miscellaneous">13. Miscellaneous</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#jurisdiction">14. Jurisdiction</a></li>
+<li class="toctree-l2"><a class="reference internal" href="license.html#applicable-law">15. Applicable Law</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="license.html#appendix">Appendix</a></li>
 <li class="toctree-l1"><a class="reference internal" href="ui.html">User Interface</a></li>
 </ul>
 </div>