Changes

Summary

merge
run sitegen to resolv merge-conflict when merging from AFP-2016-1
updated abstract of Jordan-Normal-Form in metadata to the one in document/root.tex
adapted metadata for recent changes in Algebraic numbers

Changeset 7825:a1cd42188da3 by rene thiemann _rene.thiemann@uibk.ac.at_: merge
Changeset 7824:1d1b45fa50e8 by rene thiemann _rene.thiemann@uibk.ac.at_: run sitegen to resolv merge-conflict when merging from AFP-2016-1
The file was modified	`web/entries/Algebraic_Numbers.shtml` (diff)
The file was modified	`web/entries/Berlekamp_Zassenhaus.shtml` (diff)
The file was modified	`web/entries/Containers.shtml` (diff)
The file was modified	`web/entries/Jordan_Normal_Form.shtml` (diff)
The file was modified	`web/entries/List-Index.shtml` (diff)
The file was modified	`web/entries/Matrix.shtml` (diff)
The file was modified	`web/entries/Nested_Multisets_Ordinals.shtml` (diff)
The file was modified	`web/entries/Perron_Frobenius.shtml` (diff)
The file was modified	`web/entries/Polynomial_Factorization.shtml` (diff)
The file was modified	`web/entries/Polynomial_Interpolation.shtml` (diff)
The file was modified	`web/entries/Subresultants.shtml` (diff)
The file was modified	`web/index.shtml` (diff)
The file was modified	`web/statistics.shtml` (diff)
Changeset 7823:28529384648c by rene thiemann _rene.thiemann@uibk.ac.at_: updated abstract of Jordan-Normal-Form in metadata to the one in document/root.tex
The file was modified	`metadata/metadata` (diff)
Changeset 7822:a272a08bec86 by rene thiemann _rene.thiemann@uibk.ac.at_: adapted metadata for recent changes in Algebraic numbers
The file was modified	`metadata/metadata` (diff)
The file was modified	`thys/Algebraic_Numbers/document/root.tex` (diff)