diff options
| -rw-r--r-- | AUTHORS | 20 | ||||
| -rw-r--r-- | README | 18 | ||||
| -rw-r--r-- | doc/man/crystfel.7 | 11 |
3 files changed, 47 insertions, 2 deletions
@@ -1,3 +1,23 @@ +Funding acknowledgements +------------------------ + +Development of CrystFEL is primarily funded by the Helmholtz Association via +programme-oriented funds. + +Additional funding for CrystFEL is provided by "X-Probe", a project of the +European Union's 2020 Research and Innovation Program Under the Marie +Skłodowska-Curie grant agreement 637295 (2015-2018). + +Additional funding for CrystFEL is provided by the BMBF German-Russian +Cooperation "SyncFELMed", grant 05K14CHA (2014-2017). + +Past funding for CrystFEL has been received from BioStruct-X, a project funded +by the Seventh Framework Programme (FP7) of the European Commission. + + +Contributors +------------ + * Thomas White <taw@physics.org> Lead author, architecture, "vision" and so on. @@ -1,7 +1,7 @@ CrystFEL - Crystallography with a FEL ------------------------------------- -Copyright © 2012-2016 Deutsches Elektronen-Synchrotron DESY, +Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, a research centre of the Helmholtz Association. Authors: @@ -174,3 +174,19 @@ If you are installing from Git, the following extra things apply: - You will not be able to use the "--enable-gtk-doc" option to configure unless you have at least version 1.9 of gtk-doc installed. + +Funding acknowledgements +------------------------ + +Development of CrystFEL is primarily funded by the Helmholtz Association via +programme-oriented funds. + +Additional funding for CrystFEL is provided by "X-Probe", a project of the +European Union's 2020 Research and Innovation Program Under the Marie +Skłodowska-Curie grant agreement 637295 (2015-2018). + +Additional funding for CrystFEL is provided by the BMBF German-Russian +Cooperation "SyncFELMed", grant 05K14CHA (2014-2017). + +Past funding for CrystFEL has been received from BioStruct-X, a project funded +by the Seventh Framework Programme (FP7) of the European Commission. diff --git a/doc/man/crystfel.7 b/doc/man/crystfel.7 index bc545069..b7063b21 100644 --- a/doc/man/crystfel.7 +++ b/doc/man/crystfel.7 @@ -1,7 +1,7 @@ .\" .\" CrystFEL main man page .\" -.\" Copyright © 2012-2015 Deutsches Elektronen-Synchrotron DESY, +.\" Copyright © 2012-2017 Deutsches Elektronen-Synchrotron DESY, .\" a research centre of the Helmholtz Association. .\" .\" Part of CrystFEL - crystallography with a FEL @@ -125,6 +125,15 @@ to this list if you experience difficulty with "-y" at any time. .IP Cubic \fB23\fR, \fBm-3\fR, \fB432\fR, \fB-43m\fR, \fBm-3m\fR. +.SH FUNDING ACKNOWLEDGEMENTS +Development of CrystFEL is primarily funded by the Helmholtz Association via programme-oriented funds. + +Additional funding for CrystFEL is provided by "X-Probe", a project of the European Union's 2020 Research and Innovation Program Under the Marie Skłodowska-Curie grant agreement 637295 (2015-2018). + +Additional funding for CrystFEL is provided by the BMBF German-Russian Cooperation "SyncFELMed", grant 05K14CHA (2014-2017). + +Past funding for CrystFEL has been received from BioStruct-X, a project funded by the Seventh Framework Programme (FP7) of the European Commission. + .SH AUTHOR This page was written by Thomas White and Valerio Mariani. |