# HG changeset patch
# User Chris Cannam
# Date 1317031430 -3600
# Node ID 48d645a44b8ea54009ca937f659928d9336d5c3e
# Parent  f77c007f21f71436022e99dcf1a43ee2155d850a# Parent  a3e8a310338cf0f93284efdf40696c0455e7a602
Merge

diff -r f77c007f21f7 -r 48d645a44b8e cannam.tex
--- a/cannam.tex	Mon Sep 26 11:03:00 2011 +0100
+++ b/cannam.tex	Mon Sep 26 11:03:50 2011 +0100
@@ -7,7 +7,7 @@
 
 \name{Chris Cannam, Luis Figueira and Mark Plumbley}
 \address{Centre for Digital Music,\\
-  Queen Mary University of London}
+  Queen Mary University of London\\\{first.lastname@eecs.qmul.ac.uk\}}
 %
 % For example:
 % ------------
@@ -239,7 +239,7 @@
 \label{sec:lackofeducation}
 
 In section \ref{sec:researchsoft} we noted that research software
-developers are largely self-trained, and Merali \cite{merali2010}
+developers are largely self-trained, and Merali~\cite{merali2010}
 provides a number of examples of unfortunate outcomes caused by lack
 of education and experience in software development.
 
diff -r f77c007f21f7 -r 48d645a44b8e refs.bib
--- a/refs.bib	Mon Sep 26 11:03:00 2011 +0100
+++ b/refs.bib	Mon Sep 26 11:03:50 2011 +0100
@@ -106,19 +106,29 @@
 }
 
 @inproceedings{gwilson2009,
- author = {Hannay, Jo Erskine and MacLeod, Carolyn and Singer, Janice and Langtangen, Hans Petter and Pfahl, Dietmar and Wilson, Greg},
+ author = {Hannay, J. E. and MacLeod, C. and Singer, J. and Langtangen, H. P. and Pfahl, D. and Wilson, G.},
  title = {How do scientists develop and use scientific software?},
  booktitle = {Proceedings of the 2009 ICSE Workshop on Software Engineering for Computational Science and Engineering},
- series = {SECSE '09},
  year = {2009},
  isbn = {978-1-4244-3737-5},
- pages = {1--8},
- numpages = {8},
- url = {http://dx.doi.org/10.1109/SECSE.2009.5069155},
- doi = {http://dx.doi.org/10.1109/SECSE.2009.5069155},
- acmid = {1556928},
- publisher = {IEEE Computer Society},
- address = {Washington, DC, USA},
+ pages = {1--8}
 } 
 
+@article{merali2010,
+    author = {Merali, Zeeya},
+    doi = {10.1038/467775a},
+    issn = {1476-4687},
+    journal = {Nature},
+    keywords = {computer-science, scientific-programming},
+    month = oct,
+    number = {7317},
+    pages = {775--777},
+    publisher = {Nature Publishing Group},
+    title = {Computational science: ...Error ...why scientific programming does not compute.},
+    volume = {467},
+    year = {2010}
+}
 
+
+
+