Home.md

-Welcome to the stif-boiv wiki!
+## Domain-specific concepts
 
-Effectivement Luc...
+A number of domain-specific concepts are used to describe a transport offer (including lines, routes, journey patterns, etc.). These are explained in the [Data Models](Data-Models) document.
\ No newline at end of file
+
+## Architecture
+
+TODO: Add high level architecture diagram
+
+Detailed diagrams of the different parts of the application are available on the [Class Diagram](Class-Diagram) page.
+
+## GitHub
+
+The main development work happens in these repositories:
+
+* [Rails application](https://github.com/af83/).
+* [Java application](https://github.com/af83/).
+
+Merge commits should be avoided. Use the following Git commands to get the latest from `master`.
+
+To update a local feature branch:
+
+```sh
+git pull origin master --rebase
+```
+
+To update a remote feature branch:
+
+```sh
+# Cleaner method. Try this first.
+git rebase master
+git push --force-with-lease origin my_branch
+
+# Simpler method when dealing with a complex merge.
+git merge master
+git push origin my_branch
+```
+
+## Application configuration
+
+* [Optional Feature flags](Optional-Features)
+* Policy management (TODO)
+
+## Rails code rules
+
+* [Writing a migration](Rails-migrations)
+* [Writing a model](Rails-models)
+* [Writing a controller](Rails-Controller)
+* [Writing a view](Rails-views)
+* [Writing a spec (TODO)](Rails-spec)
+* [Writing a policy (TODO)](/code_rules/policy.md)
+* [Writing a feature (TODO)](/code_rules/feature.md)
+* [I18n](Rails-I18n)