Merge branch 'release' into devel

Jürgen Knödlseder
2 parents f6cf0b6f 0be7afdd
Showing 9 changed files with 27 additions and 6 deletions
doc/source/_static/logo-cyfronet.png
doc/source/_static/logo-desy.png
doc/source/_static/logo-ecap.jpg
doc/source/_static/logo-irap.png
doc/source/_static/logo-lapp.png
doc/source/_static/logo-lupm.png
doc/source/_static/logo-mpik.png
doc/source/_templates/index.html
doc/source/about.rst
@@ -16,14 +16,35 @@ is supported as well. {%endtrans%}&lt;/p&gt;
 <p>{%trans%} ctools are based on <a href="http://cta.irap.omp.eu/gammalib">GammaLib</a>,
 a versatile toolbox for the scientific analysis of astronomical gamma-ray data.
 Besides CTA, GammaLib supports the analysis of H.E.S.S., MAGIC, VERITAS,
-Fermi/LAT, COMPTEL and INTEGRAL/SPI data. GammaLib supports in particular the
+Fermi/LAT, CGRO/COMPTEL and INTEGRAL/SPI data. GammaLib supports in particular the
 combination of data from different instruments in a true joint multi-wavelength
 analysis that consistently handles the response of each instrument. An interface
-to virtual observatory ressources does also exist.
+to virtual observatory resources does also exist.
 {%endtrans%}</p>
  
-<p>{%trans%} ctools are developed by a team of enthousiastic gamma-ray
-astronomers with support from engineers. We regularily organise
+<p>{%trans%} ctools are developed by a community of enthousiastic gamma-ray
+astronomers with support from engineers. The lead institute is</p>
+
+<table cellpadding="0" cellspacing="0" border="0">
+   <tr>
+     <td><img src="_static/logo-irap.png" alt="IRAP" height="50"></td>
+   </tr>
+</table>
+
+<p>As of today there have been contributions by the following institutions:</p>
+
+<table cellpadding="0" cellspacing="0" border="0">
+   <tr>
+     <td><img src="_static/logo-desy.png" alt="DESY" height="50"></td>
+     <td><img src="_static/logo-ecap.jpg" alt="ECAP" height="50"></td>
+     <td><img src="_static/logo-mpik.png" alt="MPIK" height="50"></td>
+     <td><img src="_static/logo-cyfronet.png" alt="Cyfronet" height="50"></td>
+     <td><img src="_static/logo-lapp.png" alt="LAPP" height="50"></td>
+     <td><img src="_static/logo-lupm.png" alt="LUPM" height="50"></td>
+   </tr>
+</table>
+
+<p>We regularily organise
 <a href=https://cta-redmine.irap.omp.eu/projects/ctools/wiki/Coding_sprints>coding sprints</a>
 where key developers but also newcomers meet to discuss the developments 
 and next steps, and advance with the coding of the software.
@@ -16,11 +16,11 @@ Creation of shell or Python scripts and pipelines is supported as well.
 ctools are based on GammaLib, a versatile toolbox for the scientific
 analysis of astronomical gamma-ray data. 
 Besides CTA, GammaLib supports the analysis of H.E.S.S., MAGIC, VERITAS,
-Fermi/LAT, COMPTEL and INTEGRAL/SPI data.
+Fermi/LAT, CGRO/COMPTEL and INTEGRAL/SPI data.
 GammaLib supports in particular the combination of data from different instruments
 in a true joint multi-wavelength analysis that consistently handles the response
 of each instrument.
-An interface to virtual observatory ressources does also exist.
+An interface to virtual observatory resources does also exist.
  
 ctools are developed by a team of enthousiastic gamma-ray astronomers with
 support from engineers. We regularily organise