git subrepo pull (merge) LaTeX-proposal

subrepo:
  subdir:   "LaTeX-proposal"
  merged:   "72cd82ba"
upstream:
  origin:   "git@github.com:KWARC/LaTeX-proposal.git"
  branch:   "master"
  commit:   "c8765445"
git-subrepo:
  version:  "0.4.0"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "5d6aba9"

examples/dfg/README.md

@@ -6,5 +6,5 @@ proposal/dfgproposal class.
 `proposal`:	     	    a DFG proposal 'Einzelverfahren' in the new template (valid from Oct 2011. (provided by Jens Lehmann; thanks)
 `report`: 	            a corresponding report 
 `simple-proposal`: a simple DFG proposal (no work areas, no sites), re-uses files from above  
-`lib`: 		            shared files (affiliation database, bibTeX, logos)
+`lib`: 		            shared files (affiliation database, bibTeX databases, logos)
 `dfgdocs`: 		    DFG documents explaining the proposal/reporting process

examples/dfg/simple-proposal/proposal.tex

@@ -3,7 +3,13 @@
 % - submit.tex (no draft stuff, no ednotes, no revision information)
 % - public.tex (like submit.tex, but no financials either) 
 \providecommand{\classoptions}{,keys} % to be overwritten in variants
-\documentclass[gitinfo,noworkareas,RAM\classoptions]{dfgproposal}
+\documentclass[    % the options control the appearance, see the documentation
+    gitinfo,       % show GIT information 
+    noworkareas,   % do not generate work areas, this is a simple proposal
+    RAM,           % also manage research assistant (HiWi) months
+    general,       % make a title page, etc. 
+    \classoptions] % the other class options from above, they can be overwritten e.g. in submit/final,tex
+    {dfgproposal}
 \addbibresource{../lib/dummy.bib}
 \input{../lib/WApersons}
 

examples/eu/README.md

@@ -4,7 +4,7 @@ This directory contains examples for EU proposals and reports marked up with the
 proposal/euproposal class. 
 
 `strep`:        a STREP proposal
-`lib`: 		 shared files (affiliation database, bibTeX, logos)
+`lib`: 		 shared files (affiliation database, bibTeX databases, logos)
 
 It would be great to have mock proposals for other EU proposal categories here (please
 help). 

lib/Makefile.dfgproposal

@@ -42,7 +42,7 @@ cd: 	                                           # make cd will prepare CD for bu
 
 bbl: $(BBL)
 $(BBL): %.bbl: %.aux
-	bibtex -min-crossrefs=100 -terse $<
+	biber -min-crossrefs=100 -terse $<
 
 $(PDATA): %.pdata: %.tex
 	$(PDFLATEX) $<