Improve README and INSTALL

INSTALL.md

@@ -60,43 +60,39 @@ If you want to build last development code you have to checkout the develop bran
 
 - **Build specific branch of Kit and SDK and modify Element project only**
 
-If you want to build a specific branch for the MatrixKit and the MatrixSDK you have to indicate them using a dictionary like this: `$matrixKitVersion = {'kit branch name' => 'sdk branch name'}`.
+If you want to build a specific branch for the MatrixKit and the MatrixSDK you have to indicate them using a dictionary like this: `$matrixKitVersion = {'kit_branch_name' => 'sdk_branch_name'}`.
 
 - **Build any branch and be able to modify MatrixKit and MatrixSDK locally**
 
 If you want to modify MatrixKit and/or MatrixSDK locally and see the result in Element project you have to uncommment `$matrixKitVersion = :local` in the `Podfile`.
 But before you have to checkout [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) repository in `../matrix-ios-kit` and [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk) in `../matrix-ios-sdk` locally relatively to your Element iOS project folder.
-Be sure to use compatible branches for Element iOS, MatrixKit and MatrixSDK. For example if you want to modify Element iOS from develop branch use MatrixKit and MatrixSDK develop branches and then make your modifications.
+Be sure to use compatible branches for Element iOS, MatrixKit and MatrixSDK. For example, if you want to modify Element iOS from develop branch, use MatrixKit and MatrixSDK develop branches and then make your modifications.
 
 **Important**: By working with local pods (development pods) you will need to use legacy build system in Xcode, to have your local changes taken into account. To enable it go to Xcode menu and select `File > Workspace Settings… > Build System` and then choose `Legacy Build System`.
 
-### Modify `$matrixKitVersion` after installation of dependencies
+### `$matrixKitVersion` Modification
 
-Assuming you have already completed the **Install dependencies** instructions from **Build** section below.
+Every time you change the `$matrixKitVersion` variable in the `Podfile`, you have to run the `pod install` command again.
 
-Each time you edit `$matrixKitVersion` variable in the `Podfile` you will have to run the `pod install` command.
-
-## Generate Xcode workspace
-
-In order to get rid of git conflicts, the `Riot.xcodeproj` is not pushed into the git repository anymore but generated using `XcodeGen`. To generate the `xcodeproj` file simply run the following command line in the `Riot` folder:
-
-```
-$ cd Riot
-$ xcodegen
-```
-
-**Note**: After the project file generation, the script `createWorkspace.sh` is called to generate the associated workspace (see **Install dependencies**).
 
 ## Build
 
+## Generate Xcode project
+
+In order to get rid of git conflicts, the `Riot.xcodeproj` is not pushed into the git repository anymore but generated using `XcodeGen`. To generate the `xcodeproj` file simply run the following command line from the root folder :
+
+```
+$ xcodegen
+```
+
+
 ### Install dependencies
 
-Before opening the Element Xcode workspace, you need to install dependencies via CocoaPods.
+Then, before opening the Element Xcode workspace, you need to install dependencies via CocoaPods.
 
 To be sure to use the right CocoaPods version you can use `bundler`:
 
 ```
-$ cd Riot
 $ bundle install
 $ bundle exec pod install
 ```
@@ -104,19 +100,12 @@ $ bundle exec pod install
 Or if you prefer to use directly CocoaPods:
 
 ```
-$ cd Riot
 $ pod install
 ```
 
 This will load all dependencies for the Element source code, including [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) 
 and [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk).
 
-[1]**Note**: you can run the script `createWorkspace.sh`. This script runs `bundler` if it's installed, CocoaPods otherwise:
-
-```
-$ cd Riot
-$ sh createWorkspace.sh
-```
 
 ### Open workspace
 
@@ -134,6 +123,7 @@ You may need to change the bundle identifier and app group identifier to be uniq
 
 Each target has its own YAML file in the folder Targets folder.
 
+
 ## Generate IPA
 
 To build the IPA we are currently using [fastlane](https://fastlane.tools/).
@@ -171,4 +161,3 @@ Or you can use the wrapper script located at `/Tools/Release/buildRelease.sh`. F
 And then indicate a branch or a tag like this:
 
 `$ ./buildRelease.sh <tag or branch>`
-

README.md

@@ -26,11 +26,19 @@ You can try last beta build by accessing our [TestFlight Public Link](https://te
 
 ## Build instructions
 
-To build the application please refer to the [installation guide](./INSTALL.md).
+If you have already everything installed, opening the project workspace in Xcode should be as easy as:
+
+```
+$ xcodegen                  # Create the xcodeproj with all project source files
+$ pod install               # Create the xcworkspace with all project dependencies
+$ open Riot.xcworkspace     # Open Xcode
+```
+
+Else, you can visit our [installation guide](./INSTALL.md). This guide also offers more details and advanced usage like using [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk) and [MatrixKit](https://github.com/matrix-org/matrix-ios-kit) in their development versions.
 
 ## Contributing
 
-If you want to contribute to Element iOS code or translations please refer to the [contribution guide](CONTRIBUTING.md).
+If you want to contribute to Element iOS code or translations, go to the [contribution guide](CONTRIBUTING.md).
 
 ## Support
 
@@ -42,7 +50,7 @@ If after your research you still have a question, ask at [#element-ios:matrix.or
 
 Copyright (c) 2014-2017 OpenMarket Ltd  
 Copyright (c) 2017 Vector Creations Ltd  
-Copyright (c) 2017-2020 New Vector Ltd
+Copyright (c) 2017-2021 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the [LICENSE](LICENSE) file, or at: