SATToSE
diff --git a/Community-resources.mediawiki b/Community-resources.mediawiki
@@ -10,7 +10,7 @@ This working group is concerned with (identifying and) modeling SoTeSoLa-related
 ** Use-case diagrams
 ** Class diagrams
 ** Sequence diagrams
-** ...
+** …
 * Samples of utilization
 ** Bridges that access the resources
 ** Mashups demonstrating integration
@@ -19,8 +19,8 @@ This working group is concerned with (identifying and) modeling SoTeSoLa-related
 === Resources ===
 
 * Community portals: [http://stackoverflow.com/ Stack Overflow]
-* Repository technology: [http://github.com/ GitHub], [http://sourceforge.net/ SourceForge], ...
-* Chrestomathies: [http://rosettacode.org/ Rosetta Code], [http://101companies.org/ 101companies], ...
+* Repository technology: [http://github.com/ GitHub], [http://sourceforge.net/ SourceForge], …
+* Chrestomathies: [http://rosettacode.org/ Rosetta Code], [http://101companies.org/ 101companies], …
 * …
 
 === Relationships ===

diff --git a/Data-driven.mediawiki b/Data-driven.mediawiki
@@ -1,4 +1,4 @@
-== SoTeSoLa Working Group on Data-driven Technological Spaces ==
+== SoTeSoLa working group on data-driven technological spaces ==
 
 === Summary ===
 
@@ -19,8 +19,8 @@ The '''data-driven technological spaces''' deal with spreadsheets, sequential an
 
 === Relationships ===
 
-* Jean Bezivin's invited talk may mention data journalism.
-* Jácome Cunha's invited talk will deal with spreadsheets.
+* Jean Bézivin’s invited talk may mention data journalism.
+* Jácome Cunha’s invited talk will deal with spreadsheets.
 * The hackathon on [[reverse engineering]] may leverage data-driven technological spaces.
 
 === Coordinator ===

diff --git a/Folksonomy.mediawiki b/Folksonomy.mediawiki
@@ -2,12 +2,12 @@
 
 === Summary ===
 
-This working group aims at the development of a SoTeSoLa-related folksonomy/ontology. Practically, this means that the working group will pick community resources, e.g., publications in relevant conference proceedings or journals or technical documentation of technologies in the SoTeSoLa context, and tag them systematically. The resulting tagging will be also aggregated into tag clouds and possibly enriched by classification and other relationships. The methods, techniques, and tools for this effort will be researched. All resulting data is made publicly available and a strategy is proposed for continuous development of a SoTeSoLa-related folksonomy/ontology. Established, related efforts, e.g., "Semantic Web Dog Food" are consulted for inspiration. 
+This working group aims at the development of a SoTeSoLa-related folksonomy/ontology. Practically, this means that the working group will pick community resources, e.g., publications in relevant conference proceedings or journals or technical documentation of technologies in the SoTeSoLa context, and tag them systematically. The resulting tagging will be also aggregated into tag clouds and possibly enriched by classification and other relationships. The methods, techniques, and tools for this effort will be researched. All resulting data is made publicly available and a strategy is proposed for continuous development of a SoTeSoLa-related folksonomy/ontology. Established, related efforts, e.g., “Semantic Web Dog Food” are consulted for inspiration. 
 
 === Deliverables ===
 
 * Tagged SoTeSoLa-related resources:
-** Homepages
+** Home pages
 ** Publications
 ** Research theses
 ** Call for papers
@@ -19,7 +19,7 @@ This working group aims at the development of a SoTeSoLa-related folksonomy/onto
 ** Classification of concepts, e.g.:
 *** Language
 *** Language definition
-*** Technology space
+*** Technological space
 *** …
 ** Relationships between concepts, e.g.:
 *** Paper X contributes to concept Y.

diff --git a/Home.mediawiki b/Home.mediawiki
@@ -1,12 +1,12 @@
 == Headline ==
 
-This is the wiki of '''[http://planet-sl.org/sotesola2012/ SoTeSoLa]''' --- the summer school on Software Technologies and Software Languages, which takes place in Koblenz, 19–23 August 2012. See the [http://planet-sl.org/sotesola2012/ website] of SoTeSoLa for additional information. This wiki and the underlying github repository are used to collect content and artifacts for the summer school.
+This is the wiki of '''[http://planet-sl.org/sotesola2012/ SoTeSoLa]''' — the summer school on Software Technologies and Software Languages, which takes place in Koblenz, 19–23 August 2012. See the [http://planet-sl.org/sotesola2012/ website] of SoTeSoLa for additional information. This wiki and the underlying GitHub repository are used to collect content and artifacts for the summer school.
 
 == Hackathons ==
 
 These hackathons are under development.
 
-Non-wiki material for the hackathons will be stored eventually in the github repository.
+Non-wiki material for the hackathons will be stored eventually in the GitHub repository.
 
 * [[Reverse engineering]]
 * [[Re-engineering]]
@@ -17,7 +17,7 @@ These working groups are under development. Please get involved.
 
 Some process of selection, merging, and addition will happen at the school.
 
-Non-wiki material for the groups will be stored eventually in the github repository.
+Non-wiki material for the groups will be stored eventually in the GitHub repository.
 
 * [[Research|Research 2.0 meets SoTeSoLa]]
 * [[LinkedData|Linked Data meets SoTeSoLa]]
@@ -28,7 +28,7 @@ Non-wiki material for the groups will be stored eventually in the github reposit
 
 == Invited talks ==
 
-Non-wiki material for the talks, if any, will be stored eventually in the github repository.
+Non-wiki material for the talks, if any, will be stored eventually in the GitHub repository.
 
 * Jean Bezivin, Industry Consultant on Software Modeling: Model-driven engineering beyond software development
 * Darius Blasband, RainCode: A short history of everything "this company" 

diff --git a/Megamodeling.mediawiki b/Megamodeling.mediawiki
@@ -2,17 +2,22 @@
 
 === Summary ===
 
-There are many software languages around, which need to be defined somehow: with language standards, programmer manuals, formal grammars, metamodels, schemata, constraints, common knowledge, etc. This working group is concerned with modelling these different approaches to language definitions and dealing with metametamodel-level inconsistencies and fundamental mismatches.
+Composing a model of linguistic architecture is a way to specify all software languages and technologies involved in a particular project, together with the relationships they have among themselves. The variety of existing languages and the ever-growing number of technologies that rely on combinations of them, makes this a very challenging problem. This working group aims at collecting some evidence from its participants about the projects in which they have been involved, and the systems they have participated in building, dissecting this knowledge into relatively understood and formalized elements. The results will be presented as a megamodel or a series of megamodels of various use cases of software languages and technologies. Discussions on language standards and definitions, metamodels and schemata, encapsulating common knowledge, and fundamental mismatches in the ways software technologies are used, are very much anticipated.
 
 === Deliverables ===
+* Detailed megamodels of the use cases of software languages
+* Software technology-specific usage patterns
+* Descriptions of various interesting scenarios involving combination of software languages and technologies
 * …
 
 === Resources ===
+* Software [http://101companies.org/index.php/Category:Language languages] and [http://101companies.org/index.php/Category:Technology technologies] of the 101companies project
 * …
 
 === Relationships ===
 
-* ...
+* The working group on SoTeSoLa-related [[community resources]] concerns current places that accumulate related information implicitly.
+* The working group on SoTeSoLa-related [[folksonomy]] addresses the ontological aspect.
 
 === Coordinator ===
 

diff --git a/Re-engineering.mediawiki b/Re-engineering.mediawiki
@@ -2,7 +2,7 @@
 
 === Summary ===
 
-The hackathon aims at exercising the methods and tools for software re-engineering as they are of interest to the participants. Re-engineering is meant here in a broad sense to include, for example, program refactoring,  wrapping, dead-code elimination, language migration, database re-engineering, and other forms of software evolution. The participants apply the methods and tools to the software chrestomathy of the 101companies project. Diverse experiments are enabled by the many contributions of the chrestomathy with its coverage of many software languages and technologies. The chrestomathy is available as a repository of source code and through "data dumps" for extracted facts. The participants select those parts of the chrestomathy that are the most suited for efficiently demonstrating their re-engineering methods and tools. The expectation is that the hackathon produces a corpus of re-engineering samples, which may be useful, for example, in teaching re-engineering, or as a benchmark or point of reference in re-engineering research.
+The hackathon aims at exercising the methods and tools for software re-engineering as they are of interest to the participants. Re-engineering is meant here in a broad sense to include, for example, program refactoring,  wrapping, dead-code elimination, language migration, database re-engineering, and other forms of software evolution. The participants apply the methods and tools to the software chrestomathy of the 101companies project. Diverse experiments are enabled by the many contributions of the chrestomathy with its coverage of many software languages and technologies. The chrestomathy is available as a repository of source code and through “data dumps” for extracted facts. The participants select those parts of the chrestomathy that are the most suited for efficiently demonstrating their re-engineering methods and tools. The expectation is that the hackathon produces a corpus of re-engineering samples, which may be useful, for example, in teaching re-engineering, or as a benchmark or point of reference in re-engineering research.
 
 === Prerequisite ===
 
@@ -19,7 +19,7 @@ Participants should have some basic understanding of re-engineering and some lev
 ** Language or API migration
 ** Database re-engineering
 ** Architectural modifications
-** Modularization or componentization
+** Modularization or component identification
 ** Coupled software transformations
 
 === Resources ===

diff --git a/Research.mediawiki b/Research.mediawiki
@@ -16,8 +16,8 @@ There are many problems commonly identified in the current model of scientific r
 * [http://en.wikipedia.org/wiki/Science_2.0 Science 2.0] @ Wikipedia
 * [http://en.wikipedia.org/wiki/Open_data Open data] @ Wikipedia
 * [http://en.wikipedia.org/wiki/Open_science_data Open science data] @ Wikipedia
-* [http://www.mendeley.com/ http://www.mendeley.com/]
-* ...
+* [http://www.mendeley.com/ Mendeley]
+* …
 
 === Relationships ===
 

diff --git a/Reverse-Engineering.mediawiki b/Reverse-Engineering.mediawiki
@@ -2,7 +2,7 @@
 
 === Summary ===
 
-The hackathon aims at exercising the methods and tools for software reverse engineering as they are of interest to the participants. Reverse engineering is meant here in a broad sense to include, for example, fact extraction, software visualization, vocabulary mining, analysis of language usage, and architecture recovery. The participants apply the methods and tools to the software chrestomathy of the 101companies project. Diverse experiments are enabled by the many contributions of the chrestomathy with its coverage of many software languages and technologies. The chrestomathy is available as a repository of source code and through "data dumps" for extracted facts. The participants select those parts of the chrestomathy that are the most suited for efficiently demonstrating their reverse engineering methods and tools. The expectation is that the hackathon produces a corpus of reverse engineering samples, which may be useful, for example, in teaching reverse engineering, or as a benchmark or point of reference in reverse engineering research.
+The hackathon aims at exercising the methods and tools for software reverse engineering as they are of interest to the participants. Reverse engineering is meant here in a broad sense to include, for example, fact extraction, software visualization, vocabulary mining, analysis of language usage, and architecture recovery. The participants apply the methods and tools to the software chrestomathy of the 101companies project. Diverse experiments are enabled by the many contributions of the chrestomathy with its coverage of many software languages and technologies. The chrestomathy is available as a repository of source code and through “data dumps” for extracted facts. The participants select those parts of the chrestomathy that are the most suited for efficiently demonstrating their reverse engineering methods and tools. The expectation is that the hackathon produces a corpus of reverse engineering samples, which may be useful, for example, in teaching reverse engineering, or as a benchmark or point of reference in reverse engineering research.
 
 === Prerequisite ===
 
@@ -19,7 +19,7 @@ Participants should have some basic understanding of reverse engineering and som
 ** Analysis of API usage
 ** Architecture recovery
 ** Design pattern recovery
-** ...
+** …
 
 === Resources ===