diff --git a/documentation/current/guide/index.wiki b/documentation/current/guide/index.wiki index 63bf1e7a..65dff5ca 100644 --- a/documentation/current/guide/index.wiki +++ b/documentation/current/guide/index.wiki @@ -141,6 +141,7 @@ There is no better place to gain an in-depth understanding of the Eiffel softwar Eiffel has been standardized under ISO and ECMA. The comprehensive description of the standard Eiffel programming language is presented in [http://www.ecma-international.org/publications/standards/Ecma-367.htm Standard ECMA-367]. + ---- ===Contribute to Eiffel=== @@ -155,3 +156,26 @@ You can help Eiffel by contributing your time, expertise, and products. Here are :[http://eiffelstudio.origo.ethz.ch/ EiffelStudio on Origo] contains blogs and forums focusing on Eiffel and EiffelStudio topics. + + + + +---- + +==[[Glossary of Object Technology]]== + +---- + + +This is a relatively comprehensive glossary of terms used in Object-Oriented Analysis, Design, and programming, but are not specific to the Eiffel Language, since object-oriented principles can be applied to any programming language. It contains all the terms from the glossary in [[Object-Oriented Software Construction, 2nd Edition]], plus others used in this website, added for clarity and ease of reference. + +This glossary is useful all by itself, since a review of it can serve as a refresher (in case you have been away from Object Technology for a while). It is used in this website to assist the reader by providing easy links to technical terms that are used throughout the website. + +Additionally, it is possible to link to terms in this glossary from other websites by using links that look like this: + +:http://docs.eiffel.com/book/guide/glossary-object-technology#Attribute. + +Note that the anchor (the part after the "#") has to be spelled and capitalized exactly like the term on the page. (Use underscore characters to replace spaces.) + +---- + diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki b/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki index a856ee35..27a3bce9 100644 --- a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki +++ b/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki @@ -4,9 +4,9 @@ This section focuses on defining Eiffel for .NET. The key requirement for Eiffel for .NET is the exclusive use of the common language runtime with a minimum Eiffel-specific runtime. The second requirement is to generate IL code that is CLS compliant, meaning that other CLS compliant languages/compilers/tools will be able to reuse .NET components written in Eiffel for .NET. The last requirement is to generate verifiable IL code. Because not all Eiffel functionalities are present in .NET, the task of the Eiffel compiler is made more complicated since it has to emulate those mechanisms instead of reusing what .NET provides. For example the common language runtime of .NET does not support: -* multiple inheritance -* genericity -* covariance +* [[Glossary of Object Technology#Multiple inheritance|multiple inheritance]] +* [[Glossary of Object Technology#Genericity|genericity]] +* [[Glossary of Object Technology#Covariance|covariance]] * agents We will see: