[git-index] rename GitAcceptConflictSideAction file to GitConflictActions
[idea/community.git] / CONTRIBUTING.md
index 4f3612d24ba06eabf5aa1874f228e8fbae235e36..c37af9283019234404e5ada5dc6ed62efffac0aa 100644 (file)
@@ -1,13 +1,12 @@
-Contributting to IntelliJ IDEA
+Contributing to IntelliJ IDEA
 ===
 
 Opening a PR, please make sure you've read these articles:
-- [IntelliJ Coding Guidelines](http://www.jetbrains.org/display/IJOS/IntelliJ+Coding+Guidelines)
-- [Contributor License Agreement](http://www.jetbrains.org/display/IJOS/Contributor+Agreement)
-- [Contribute Code](http://www.jetbrains.org/display/IJOS/Contribute#Contribute-ContributeCode)
+- [IntelliJ Coding Guidelines](https://www.jetbrains.org/intellij/sdk/docs/basics/intellij_coding_guidelines.html)
+- [Contribute Code](https://www.jetbrains.org/display/IJOS/Contribute#Contribute-ContributeCode)
 
-Additionally, you **NEED** to have a signed CLA sent to JetBrains before your
-code can be merged, You can download one from [Contributor License Agreement](http://www.jetbrains.org/display/IJOS/Contributor+Agreement)
+Additionally, you **NEED** to have a signed Contributor License Agreement (CLA) sent to JetBrains before your
+code can be merged. Please [request it here](https://www.jetbrains.com/agreements/cla/).
 
 Building the IDE
 ==