The software architecture is one of the most influential factors for the success or failure of a software system. The decisions made when managing the software architecture form the basis of a software system. When you forget these architectural decisions, and the reasons behind these decisions, it becomes difficult and expensive to change and maintain the system. In this research, we show how you can capture the decisions in connection with the source code or documentation of the system. For example, one of the developed research tools described in this thesis enables annotation and management of decisions when writing or reviewing architecture documentation. In this way, architectural decisions are connected with the documentation of the ...