Merged in andrius-doc-tweak (pull request #572)

docs/source/corda-configuration-file.rst

@@ -1,8 +1,8 @@
-The Corda configuration file
-============================
+Node configuration
+==================
 
-Location
---------
+File location
+-------------
 
 The Corda all-in-one ``corda.jar`` file is generated by the ``gradle buildCordaJAR`` task and defaults to reading configuration from a ``node.conf`` file in the present working directory.
 This behaviour can be overidden using the ``--config-file`` command line option to target configuration files with different names, or different file location (relative paths are relative to the current working directory).
@@ -24,11 +24,11 @@ Examples
 General node configuration file for hosting the IRSDemo services.
 
 .. literalinclude:: example-code/src/main/resources/example-node.conf
-    :language: cfg
+    :language: javascript
 
 NetworkMapService plus Simple Notary configuration file.
 
-.. code-block:: text
+.. parsed-literal::
 
     basedir : "./nameserver"
     myLegalName : "Notary Service"
@@ -39,9 +39,9 @@ NetworkMapService plus Simple Notary configuration file.
     webAddress : "localhost:12346"
     extraAdvertisedServiceIds: ""
     useHTTPS : false
-    devMode = true
+    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"
 
 Fields
 ------
@@ -97,9 +97,9 @@ Fields
         :permissions: A list of permission strings which RPC methods can use to control access
 
     If this field is absent or an empty list then RPC is effectively locked down.
-    
+
 :devMode:
     This flag indicate if the node is running in development mode. On startup, if the keystore ``<workspace>/certificates/sslkeystore.jks`` does not exist, a developer keystore will be used if ``devMode`` is true. The node will exit if ``devMode`` is false and keystore does not exist.
-    
+
 :certificateSigningService:
     Certificate Signing Server address. It is used by the certificate signing request utility to obtain SSL certificate. (See :doc:`permissioning` for more information.)

docs/source/example-code/src/main/resources/example-node.conf

@@ -17,6 +17,6 @@ useHTTPS : false
 rpcUsers : [
     { user=user1, password=letmein, permissions=[ StartProtocol.net.corda.protocols.CashProtocol ] }
 ]
-devMode = true
+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"