Merge branch 'master' of github.com:ripple/xrpl-dev-portal into 2020refresh

content/references/rippled-api/validator-list.md

@@ -6,7 +6,8 @@ Like the [Peer Crawler](peer-crawler.html), the validator list method is availab
 
 ## Request Format
 
-To request the Peer Crawler information, make the following HTTP request:
+To request the Validator List information, make the following HTTP
+request:
 
 - **Protocol:** https
 - **HTTP Method:** GET
@@ -68,7 +69,7 @@ If you decode the `blob` from base64, the result is a JSON object with the follo
 |:-------------|:-------|:-----------------------------------------------------|
 | `sequence`   | Number | Unique sequence number for this list. A larger sequence number indicates a newer list; only the newest list is valid at a time. |
 | `expiration` | Number | The time this list expires, in [seconds since the Ripple Epoch][]. |
-| `validators  | Array  | A list of recommended validators.                    |
+| `validators` | Array  | A list of recommended validators.                    |
 
 Each member of the `validators` array has the following fields:
 
@@ -99,7 +100,7 @@ GET https://localhost:51235/vl
 *cURL*
 
 ```
-curl --insecure https://localhost:51235/vl
+curl --insecure https://localhost:51235/vl/ED2677ABFFD1B33AC6FBC3062B71F1E8397C1505E1C42C64D11AD1B28FF73F4734
 ```
 
 <!-- MULTICODE_BLOCK_END -->

content/tutorials/manage-the-rippled-server/configuration/connect-your-rippled-to-the-xrp-test-net.ja.md

@@ -63,15 +63,12 @@ Rippleは[代替となるテスト用および開発用ネットワーク](paral
 
         b. 次の信頼できるバリデータをvalidator.txtファイルに追加します。
 
-            # Hard-coded List of Devnet Validators
+            [validator_list_sites]
-            [validators]
+            https://vl.devnet.rippletest.net/index.json
-            n9Mo4QVGnMrRN9jhAxdUFxwvyM4aeE1RvCuEGvMYt31hPspb1E2c
+
-            n9MEwP4LSSikUnhZJNQVQxoMCgoRrGm6GGbG46AumH2KrRrdmr6B
+            [validator_list_keys]
-            n9M1pogKUmueZ2r3E3JnZyM3g6AxkxWPr8Vr3zWtuRLqB7bHETFD
+            EDDF2F53DFEC79358F7BE76BC884AC31048CFF6E2A00C628EAE06DB7750A247B12
-            n9MX7LbfHvPkFYgGrJmCyLh8Reu38wsnnxA4TKhxGTZBuxRz3w1U
+
-            n94aw2fof4xxd8g3swN2qJCmooHdGv1ajY8Ae42T77nAQhZeYGdd
-            n9LiE1gpUGws1kFGKCM9rVFNYPVS4QziwkQn281EFXX7TViCp2RC
-            n9Jq9w1R8UrvV1u2SQqGhSXLroeWNmPNc3AVszRXhpUr1fmbLyhS
 
 
 3. `rippled`を再起動します。

content/tutorials/manage-the-rippled-server/configuration/connect-your-rippled-to-the-xrp-test-net.md

@@ -4,32 +4,52 @@ Ripple hosts [alternative test and development networks](parallel-networks.html)
 
 **Note:** The XRP Testnet and Devnet ledger and balances are reset on a regular basis.
 
-To connect your `rippled` server to the XRP Testnet or Devnet, set the following configurations:
+## Steps
 
-1. Edit your `rippled.cfg` file to connect to a hub server in the network you want to connect to.
+To connect your `rippled` server to the XRP Testnet or Devnet, complete these steps. You can also use these steps to switch back to the production Mainnet after being on the Testnet or Devnet.
 
-    1. To connect to the [Testnet](xrp-testnet-faucet.html), uncomment or add the following section:
+## 1. Configure your server to connect to the right hub.
+
+Edit your `rippled.cfg` file.
+
+{% include '_snippets/conf-file-location.md' %}
+<!--{_ }-->
+
+1. Set an `[ips]` stanza with the hub for the network you want to connect to:
+
+    <!-- MULTICODE_BLOCK_START -->
+
+    *Testnet*
 
         [ips]
         s.altnet.rippletest.net 51235
 
-    2. To connect to the [Devnet](xrp-testnet-faucet.html), uncomment or add the following section:
+    *Devnet*
 
         [ips]
         s.devnet.rippletest.net 51235
 
-    3. Comment out the existing `[ips]` stanza:
+    *Mainnet*
+
+        # No [ips] stanza. Use the default hubs to connect to Mainnet.
+
+
+3. Comment out the previous `[ips]` stanza, if there is one:
 
         # [ips]
         # r.ripple.com 51235
+        # zaphod.alloy.ee 51235
+        # sahyadri.isrdc.in 51235
 
+## 2. Set your trusted validator list.
 
+Edit your `validators.txt` file. This file is located in the same folder as your `rippled.cfg` file and defines which validators your server trusts not to collude.
 
-2. Edit your `validators.txt` file.
+1. Uncomment or add the `[validator_list_sites]` and `[validator_list_keys]` stanzas for the network you want to connect to:
 
-    - To connect to the Testnet:
+    <!-- MULTICODE_BLOCK_START -->
 
-        1. Uncomment the following sections:
+    *Testnet*
 
         [validator_list_sites]
         https://vl.altnet.rippletest.net
@@ -37,7 +57,28 @@ To connect your `rippled` server to the XRP Testnet or Devnet, set the following
         [validator_list_keys]
         ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860
 
-        1. Comment out the following sections, as follows:
+    *Devnet*
+
+        [validator_list_sites]
+        https://vl.devnet.rippletest.net
+
+        [validator_list_keys]
+        EDDF2F53DFEC79358F7BE76BC884AC31048CFF6E2A00C628EAE06DB7750A247B12
+
+
+    *Mainnet*
+
+        [validator_list_sites]
+        https://vl.ripple.com
+
+        [validator_list_keys]
+        ED2677ABFFD1B33AC6FBC3062B71F1E8397C1505E1C42C64D11AD1B28FF73F4734
+
+    <!-- MULTICODE_BLOCK_END -->
+
+1. Comment out any previous `[validator_list_sites]`, `[validator_list_keys]`, or `[validators]` stanzas.
+
+    For example:
 
             # [validator_list_sites]
             # https://vl.ripple.com
@@ -45,57 +86,71 @@ To connect your `rippled` server to the XRP Testnet or Devnet, set the following
             # [validator_list_keys]
             # ED2677ABFFD1B33AC6FBC3062B71F1E8397C1505E1C42C64D11AD1B28FF73F4734
 
-    - To connect to the Devnet:
+            # Old hard-coded List of Devnet Validators
+            # [validators]
+            # n9Mo4QVGnMrRN9jhAxdUFxwvyM4aeE1RvCuEGvMYt31hPspb1E2c
+            # n9MEwP4LSSikUnhZJNQVQxoMCgoRrGm6GGbG46AumH2KrRrdmr6B
+            # n9M1pogKUmueZ2r3E3JnZyM3g6AxkxWPr8Vr3zWtuRLqB7bHETFD
+            # n9MX7LbfHvPkFYgGrJmCyLh8Reu38wsnnxA4TKhxGTZBuxRz3w1U
+            # n94aw2fof4xxd8g3swN2qJCmooHdGv1ajY8Ae42T77nAQhZeYGdd
+            # n9LiE1gpUGws1kFGKCM9rVFNYPVS4QziwkQn281EFXX7TViCp2RC
+            # n9Jq9w1R8UrvV1u2SQqGhSXLroeWNmPNc3AVszRXhpUr1fmbLyhS
 
-        1. Comment out the following sections:
+## 3. Restart the server.
 
-                # [validator_list_sites]
+```
-                # https://vl.altnet.rippletest.net
+$ sudo systemctl restart rippled
+```
 
-                # [validator_list_keys]
+## 4. Verify that your server syncs.
-                # ED264807102805220DA0F312E71FC2C69E1552C9C5790F6C25E3729DEB573D5860        
 
-                # [validator_list_sites]
+It takes about 5 to 15 minutes to sync to the network after a restart. After your server is synced, the [server_info method][] shows the a `validated_ledger` object based on the network you are connected to.
-                # https://vl.ripple.com
-                #
-                # [validator_list_keys]
-                # ED2677ABFFD1B33AC6FBC3062B71F1E8397C1505E1C42C64D11AD1B28FF73F4734
 
-        2. Add the following trusted validators to the `validator.txt` file:
+To verify that your `rippled` is connected to the XRP Testnet or Devnet, compare the results from your server to [a public server](get-started-with-the-rippled-api.html#public-servers) on the Testnet or Devnet. The `seq` field of the `validated_ledger` object should be the same on both servers (possibly off by one or two, if it changed as you were checking).
 
-                # Hard-coded List of Devnet Validators
+The following example shows how to check the latest validated ledger from the commandline:
-                [validators]
+
-                n9Mo4QVGnMrRN9jhAxdUFxwvyM4aeE1RvCuEGvMYt31hPspb1E2c
+<!-- MULTICODE_BLOCK_START -->
-                n9MEwP4LSSikUnhZJNQVQxoMCgoRrGm6GGbG46AumH2KrRrdmr6B
+
-                n9M1pogKUmueZ2r3E3JnZyM3g6AxkxWPr8Vr3zWtuRLqB7bHETFD
+*Local Server*
-                n9MX7LbfHvPkFYgGrJmCyLh8Reu38wsnnxA4TKhxGTZBuxRz3w1U
+
-                n94aw2fof4xxd8g3swN2qJCmooHdGv1ajY8Ae42T77nAQhZeYGdd
+```sh
-                n9LiE1gpUGws1kFGKCM9rVFNYPVS4QziwkQn281EFXX7TViCp2RC
+$ rippled server_info | grep seq
-                n9Jq9w1R8UrvV1u2SQqGhSXLroeWNmPNc3AVszRXhpUr1fmbLyhS
+```
+
+*Testnet*
+
+```sh
+# s.altnet.rippletest.net
+$ rippled --rpc_ip 35.158.96.209:51234 server_info | grep seq
+```
+
+*Devnet*
+
+```sh
+# s.devnet.rippletest.net
+$ rippled --rpc_ip 34.83.125.234:51234 server_info | grep seq
+```
 
 
-3. Restart `rippled`.
+*Mainnet*
 
-4. To verify that your `rippled` is connected to the XRP Testnet or Devnet, use the [server_info method][] on your server and compare it to the results from a public server on the Testnet or Devnet. The `seq` field of the `validated_ledger` object should be the same on both servers (possibly off by one or two, if it changed as you were checking).
+```sh
+# s1.ripple.com
+$ rippled --rpc_ip 34.201.59.230:51234 server_info | grep seq
+```
 
-    The following command checks the latest validated ledger of a Testnet server at `s.altnet.rippletest.net`:
+<!-- MULTICODE_BLOCK_END -->
 
-        $ ./rippled --rpc_ip 34.210.87.206:51234 server_info | grep seq
+**Note:** The IP addresses in these examples are for public servers, and may change periodically. If you get no response, look up the IP address of a [public server](get-started-with-the-rippled-api.html#public-servers), for example using the `dig` command.
 
-    The following command checks the latest validated ledger of a Devnet server at `s.devnet.rippletest.net`:
-
-        $ ./rippled --rpc_ip 34.83.125.234:51234 server_info | grep seq
-
-    The following command checks your local `rippled`'s latest validated ledger index:
-
-        $ ./rippled server_info | grep seq
 
 
 ## See Also
 
 - **Tools:**
     - [XRP Faucets](xrp-testnet-faucet.html)
-    - [WebSocket API Tool](websocket-api-tool.html) - Select 'Testnet Public Server' in the connection options.
+    - [WebSocket API Tool](websocket-api-tool.html) - Select 'Testnet Public Server' or 'Devnet Public Server' in the connection options.
 - **Concepts:**
     - [Parallel Networks](parallel-networks.html)
     - [Introduction to Consensus](intro-to-consensus.html)