Squashed commit of the following:

commit 550ef69
Author: Robert de Leeuw <[email protected]>
Date:   Mon Sep 30 15:04:13 2019 +0200

.gitignore

@@ -5,4 +5,5 @@
 all.md
 releases/OCPI*.pdf
 /OCPI.iml
-/releases/all.md.bak
+**/.bookmarks.txt
+**/.references.txt

README.md

@@ -8,30 +8,28 @@ Development of the next version of OCPI, new functionality, is done in the  [`de
 
 ## Contents
 
- * [__Version History__](version_history.md)
- * [__Introduction__](introduction.md)
-   - [Terminology and Definitions](terminology.md)
+ * [__Version History__](version_history.asciidoc)
+ * [__Introduction__](introduction.asciidoc)
+   - [Terminology and Definitions](terminology.asciidoc)
+   - [Supported Topologies](topology.asciidoc)
  * __Protocol Meta Information__, describes the connections between the parties
-   - [Transport and Format](transport_and_format.md)
-   - [Status codes](status_codes.md)
-   - [Version information endpoint](version_information_endpoint.md)
-   - [Credentials & registration](credentials.md)
+   - [Transport and Format](transport_and_format.asciidoc)
+   - [Status codes](status_codes.asciidoc)
+   - [Version information endpoint](version_information_endpoint.asciidoc)
+   - [Credentials & registration](credentials.asciidoc)
  * __Overview of Modules__, each section describes one module.
-   - [Locations](mod_locations.md)
-   - [Sessions](mod_sessions.md)
-   - [CDRs](mod_cdrs.md)
-   - [Tariffs](mod_tariffs.md)
-   - [Tokens](mod_tokens.md)
-   - [Commands](mod_commands.md)
- * __Generic Types__, describing all data types that are used by multiple objects
-   - [Types](types.md)
- * [__Changelog__](changelog.md)
-
-<!--
-Will be added lated:
-* [9. Smart charging.md](smart_charging.md)
--->
+   - [Locations](mod_locations.asciidoc)
+   - [Sessions](mod_sessions.asciidoc)
+   - [CDRs](mod_cdrs.asciidoc)
+   - [Tariffs](mod_tariffs.asciidoc)
+   - [Tokens](mod_tokens.asciidoc)
+   - [Commands](mod_commands.asciidoc)
+   - [Charging Profiles](mod_charging_profiles.asciidoc)
+   - [Hub Client Info](mod_hub_client_info.asciidoc)
 
+ * __Generic Types__, describing all data types that are used by multiple objects
+   - [Types](types.asciidoc)
+ * [__Changelog__](changelog.asciidoc)
 
 __Current versions:__
 
@@ -50,14 +48,54 @@ Release 2.0:
 - Session Info exchange (cdr & ndr)
 - Registration (How to connect) & Security
 
+Release 2.2:
+
+- Charging Profiles
+- Preferences based Smart Charging
+- Support for Hubs
+- VAT
+- Credit CDRs
+- Improved Reservation support (Cancel & Tariff)
+- Lots of minor improvements
+
 
 __Planned releases:__
 
-Release 2.2:
+Release 3.0:
+
+- ISO 15118 Plug&Charge
+- Eichrecht support
+- Performance improvements
+
+
+__Building Process__:
+
+The OCPI Build Process has been improved. OCPI 2.0/2.1.1 was in markdown format, and diagrams where Plantuml.
+
+For OCPI 2.2, the text of OCPI has been converted to asciidoc. 
+Asciidoc is easier to format the output, and chapter numbering and internal links are much easier to work with.
+
+A lot of implementers asked for Swagger files, they will become available for OCPI 2.2 and onwards. 
+We wanted to generate the specification and Swagger files from one source, 
+so the different end-products: PDF and Swagger cannot be "out-of-sync". 
+
+As a source, Java class files were created. 
+The Java files are annotated so the Swagger tools can generate Swagger documentation from them. 
+The Swagger documentation is then converted to asciidoc. 
+This is only the Object/Class/Type/Enum definitions, not all the rest of the text.
+
+![build process diagram](images/specification_build_process.png "build process")
 
-- Smart Charging
-- Tariffing (advanced/dynamic)
+The Plantuml is no longer converted to PNG images, but the SVG, making them much better readable, and even searchable in the PDF.
 
+In OCPI 2.0 and 2.1.1, the JSON examples contained a lot of mistakes, where outdated compared to the text, or not even valid JSON. 
+To prevent issues with the examples in the specification, the examples are not placed in separate JSON files. 
+These files are check in a unit test, together with the Java source files. This way we know for sure that the JSON examples are valid OCPI.
+In the PDF generation step, all the asciidoc files are merged into one file, 
+this file is checked for broken internal links before the PDF is generated.
+The final result that will be published: the PDF, the Swagger files and the Java source files. 
+We hope the Swagger and Java files will decrease the development time and issues created by having to manually code all the OCPI classes and types. 
+When needed, Swagger Codegen can be used by implementers to generate similar code for other programming languages.
 
 ----
 1 Dec 2014 [Draft v4](releases/old/OCPI-Draftv4.pdf) is published