Index: doc/bibliography/cfa.bib
===================================================================
--- doc/bibliography/cfa.bib	(revision 22634b26cbd6509a73698339709810102f49ce46)
+++ doc/bibliography/cfa.bib	(revision 7e17503b8d54e1bbc54d23afb27cb8b6f5859434)
@@ -862,12 +862,12 @@
 }
 
-@techreport{C11,
-    type	= {International Standard},
+@manual{C11,
     keywords	= {ISO/IEC C 11},
     contributer	= {pabuhr@plg},
-    key		= {{ISO/IEC} 9889-2011},
-    title	= {American National Standard Information technology -- Programming Languages -- {C}},
-    institution = {International Standard Organization},
-    address	= {http://www.iso.org},
+    author	= {C11},
+    title	= {Programming Languages -- {C} {ISO/IEC} 9889:2011},
+    edition	= {3rd},
+    publisher	= {International Standard Organization},
+    address	= {\href{https://www.iso.org/standard/57853.html}{https://\-www.iso.org/\-standard/\-57853.html}},
     year	= 2012,
 }
@@ -877,9 +877,8 @@
     keywords	= {ISO/IEC TS 19217:2015},
     contributer	= {a3moss@uwaterloo.ca},
-    key		= {{ISO/IEC} {TS} 19217},
     author	= {Concepts},
-    title	= {Information technology -- Programming languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Extensions for concepts},
-    institution	= {International Standard Organization},
-    address	= {http://www.iso.org},
+    title	= {Information technology -- Programming languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} Extensions for concepts {ISO/IEC} {TS} 19217:2015},
+    publisher	= {International Standard Organization},
+    address	= {\href{https://www.iso.org/standard/64031.html}{https://\-www.iso.org/\-standard/\-64031.html}},
     year	= 2015
 }
@@ -1096,10 +1095,9 @@
     keywords	= {ISO/IEC Cobol 14},
     contributer	= {pabuhr@plg},
-    key		= {Cobol14},
-    title	= {Programming Languages -- {Cobol}},
+    author	= {Cobol14},
+    title	= {Programming Languages -- {Cobol} ISO/IEC 1989:2014},
     edition	= {2nd},
-    organization= {International Standard ISO/IEC 1989:2014},
-    publisher   = {International Standard Organization},
-    address	= {http://www.iso.org},
+    institution = {International Standard Organization},
+    address	= {\href{https://www.iso.org/standard/51416.html}{https://\-www.iso.org/\-standard/\-51416.html}},
     year	= 2014,
 }
@@ -2836,9 +2834,9 @@
     keywords	= {ISO/IEC Fortran 08},
     contributer	= {pabuhr@plg},
-    key		= {Fortran08},
-    title	= {Programming Languages -- {Fortran} Part 1},
-    organization= {International Standard ISO/IEC 1989:2014},
+    author	= {Fortran08},
+    title	= {Programming Languages -- {Fortran} Part 1:Base Language ISO/IEC 1539-1:2010},
+    edition	= {3rd},
     publisher   = {International Standard Organization},
-    address	= {http://www.iso.org},
+    address	= {\href{https://www.iso.org/standard/50459.html}{https://\-www.iso.org/\-standard/\-50459.html}},
     year	= 2010,
 }
@@ -5359,13 +5357,12 @@
 }
 
-@manual{ANSI14:C++,
+@manual{C++14,
     keywords	= {ISO/IEC C++ 14},
     contributer	= {pabuhr@plg},
-    key		= {C++14},
-    title	= {Programming Languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}}},
+    author	= {C++14},
+    title	= {Programming Languages -- {C}{\kern-.1em\hbox{\large\texttt{+\kern-.25em+}}} ISO/IEC 14882:2014},
     edition	= {4th},
-    organization= {International Standard ISO/IEC 14882:2014 (E)},
     publisher   = {International Standard Organization},
-    address	= {http://www.iso.org},
+    address	= {\href{https://www.iso.org/standard/64029.html}{https://\-www.iso.org/\-standard/\-64029.html}},
     year	= 2014,
 }
@@ -5706,11 +5703,11 @@
 
 @manual{Ada12,
-    keywords	= {Ada},
-    contributer	= {pabuhr@plg},
-    title	= {Programming languages -- {Ada}},
+    keywords	= {ISO/IEC Ada},
+    contributer	= {pabuhr@plg},
+    author	= {Ada12},
+    title	= {Programming languages -- {Ada} ISO/IEC 8652:2012},
     edition	= {3rd},
-    organization= {International Standard ISO/IEC 1989:2014},
     publisher   = {International Standard Organization},
-    address	= {http://www.iso.org},
+    address	= {\href{https://www.iso.org/standard/61507.html}{https://\-www.iso.org/\-standard/\-61507.html}},
     year	= 2012,
 }