diff --git a/docs/source/CLI-vs-IDE.rst b/docs/source/CLI-vs-IDE.rst index 7da89e8cb1..a4888a7adb 100644 --- a/docs/source/CLI-vs-IDE.rst +++ b/docs/source/CLI-vs-IDE.rst @@ -9,11 +9,11 @@ a developer environment. IDE - IntelliJ -------------- -IntelliJ (R3's preferred IDE) integrates well with gradle (our chosen build, deployment and CLI tool). IntelliJ understands gradle -tasks and dependencies, automatically loading them in the background when a project is first opened or the gradle -project changes. Occasionally, however, you may need to refresh the gradle project manually - but this is hinted to you -by the IDE. It's a good idea to do this before carrying on with other work (and in fact you may find it is essential to pick -up new libraries, etc.). +IntelliJ (the preferred IDE for Corda) integrates well with gradle (Corda's default build, deployment and CLI tool). +IntelliJ understands gradle tasks and dependencies, automatically loading them in the background when a project is +first opened or the gradle project changes. Occasionally, however, you may need to refresh the gradle project manually +- but this is hinted to you by the IDE. It's a good idea to do this before carrying on with other work (and in fact you +may find it is essential to pick up new libraries, etc.). There are some great resources about how to get started using IntelliJ. As opposed to trying to repeat them here, we advise you to go to the `IntelliJ docs here `_. diff --git a/docs/source/codestyle.rst b/docs/source/codestyle.rst index 930e7f9868..71388c5e0d 100644 --- a/docs/source/codestyle.rst +++ b/docs/source/codestyle.rst @@ -1,7 +1,7 @@ Code style guide ================ -This document explains the coding style used in the R3 prototyping repository. You will be expected to follow these +This document explains the coding style used in the Corda repository. You will be expected to follow these recommendations when submitting patches for review. Please take the time to read them and internalise them, to save time during code review. diff --git a/docs/source/example-code/src/main/resources/example-node.conf b/docs/source/example-code/src/main/resources/example-node.conf index 08066a7964..8ae9a42475 100644 --- a/docs/source/example-code/src/main/resources/example-node.conf +++ b/docs/source/example-code/src/main/resources/example-node.conf @@ -15,5 +15,4 @@ rpcUsers : [ { username=user1, password=letmein, permissions=[ StartProtocol.net.corda.protocols.CashProtocol ] } ] devMode : true -// Certificate signing service will be hosted by R3 in the near future. -//certificateSigningService : "https://testnet.certificate.corda.net" +// certificateSigningService : "https://testnet.certificate.corda.net" diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst index 05d5211fa6..4432ddb2a2 100644 --- a/docs/source/glossary.rst +++ b/docs/source/glossary.rst @@ -53,8 +53,6 @@ Protocol The old name for a Corda "Flow" Quasar A library that provides performant lightweight threads that can be suspended and restored extremely quickly. -R3 - The consortium behind Corda SIMM Standard Initial Margin Model. A way of determining a counterparty's margin payment to another counterparty based on a collection of trades such that, in the event of default, the receiving counterparty has limited exposure. Serialization