addressed feedback. still working.

content/reference-transaction-format.md

@@ -3,7 +3,6 @@
 A _Transaction_ is the only way to modify the XRP Ledger. Transactions are only valid if signed, submitted, and accepted into a validated ledger version following the [consensus process](https://ripple.com/build/ripple-ledger-consensus-process/). Some ledger rules also generate _[pseudo-transactions](#pseudo-transactions)_, which aren't signed or submitted, but still must be accepted by consensus. Transactions that fail are also included in ledgers because they modify balances of XRP to pay for the anti-spam [transaction cost](concept-transaction-cost.html).
 
 * [Authorizing Transactions](#authorizing-transactions)
-* [Understanding Master and Regular Keys](#understanding-master-and-regular-keys)
 * [Common Fields of All Transactions](#common-fields)
 * [Transaction Types](#transaction-types)
 * [Reliable Transaction Submission](#reliable-transaction-submission)
@@ -26,61 +25,7 @@ Any signature type can authorize any type of transaction, with the following exc
 * Only the master key can [permanently give up the ability to freeze](concept-freeze.html#no-freeze).
 * You can never remove the last method of signing transactions from an address.
 
-
+For more information about master and regular keys, see [Understanding Master and Regular Keys](concept-keys.md).
-## Understanding Master and Regular Keys
-
-In the XRP Ledger, a digital signature proves that a transaction is authorized to do a specific set of actions. A digital signature is created based on a key pair associated with the transaction's sending account. There are two types of key pairs available: master keys and regular keys. Each key pair includes a private key and a public key.
-
-***TODO: I feel like some concept docs on private and public keys would be great -- like when to use them. Talk about the master_key, master_seed, master_seed_hex, public_key, and public_key_hex, for example, and why we provide them and what are the use cases. It would also be good to provide concept doc on how keys are used to generate the "signature" and the different types of signature-like values that we generate: Signature, SigningPubKey, and TxnSignature, for example. What are the use cases? I believe this info is in the doc, but discussed in the context of tutorials.***
-
-### Master Keys
-
-When you create an account using the [`wallet_propose`](reference-rippled.html#wallet-propose) method, the `master_seed` (private key) and `public_key` returned in the response are the **master keys** for the account. These master keys are an intrinsic part of the account's identity as the `account_id` (account address), also returned in the `wallet_propose` response, and the `public_key` value are mathematically related.
-
-Here's a sample `wallet_propose` response, including the `master_seed` (private key), `public_key`, and `account_id` (account address) values:
-
-```
-{
-  "result": {
-    "account_id": "rM8oJwkKtgEU2HZkCHsJScLHqegWpgBRxt",
-    "key_type": "secp256k1",
-    "master_key": "SAY ARMY KITE LETS PAN WAVE JUKE ACRE MAT TILT FEAT LED",
-    "master_seed": "PrivateKeyXXXXXXXXXXXXXXXXXXX",
-    "master_seed_hex": "47E8F7F59D0CC9A3F01FD3D69CCAE93A",
-    "public_key": "aBQEK3r6hb8isnCWmortkNdv3MSMKP74o7gj3kHZQF9vDkbXo4Qs",
-    "public_key_hex": "032D911AE9887278110A8FE25169546D4E95A82AF5EFA25525FC3FDFFDC5A8B604"
-  },
-  "status": "success",
-  "type": "response"
-}
-```
-
-Master keys have more powerful signing authority than regular keys. In addition to being able to sign all transactions that regular keys can, master keys are the only keys that can be used to perform the following actions:
-
-* Use the master private key to [disable the master public key](#accountset-flags).
-* Permanently give up the ability to [freeze counterparties](concept-freeze.html#no-freeze).
-
-**Important:** Master keys can be disabled, but cannot be changed. This means that if your master private key is [compromised](concept-issuing-and-operational-addresses.html), you cannot change it to stop the compromise.
-
-This is a compelling reason to keep your master keys offline whenever possible and set up regular keys to sign transactions from your master account instead.
-
-
-### Regular Keys
-
-When you create an account using the [`wallet_propose`](reference-rippled.html#wallet-propose) method, the `master_seed` (private key) and `public_key` returned in the response are the master keys for the account. For the purposes of this discussion, let's call this account the master account. Ripple recommends that you keep the master account's master keys offline whenever possible and assign regular keys to the master account to sign your transactions instead.
-
-You generate regular keys using the same `wallet_propose` method used to generate a master account and master keys. However, you use this second account and key pair specifically with the `SetRegularKey` method to assign **regular keys** to the master account.
-
-Once you've assigned the regular keys, the master account has two key pairs associated with it:
-
-* Master keys that are intrinsically related to its address and which you keep offline whenever possible.
-* Regular keys that you've assigned to sign transactions.
-
-You can assign one regular key pair to a master account and use it to sign all transactions, except for the ones reserved for the [master keys](#master-keys).
-
-You can remove or change the regular keys at any time. This means that if a regular private key is compromised (but the master private key is not), you can regain control of your master account by simply removing or changing the regular key pair.
-
-For more information about assigning regular keys, see [Working with Regular Keys](tutorial-regular-keys.html).
 
 
 ## Signing and Submitting Transactions

content/tutorial-regular-keys.md

@@ -1,6 +1,6 @@
 # Working with Regular Keys
 
-Assign regular keys to your account to enable you to sign most transactions with regular keys, while keeping your master keys offline whenever possible. A master key [compromise](concept-issuing-and-operational-addresses.html) can be difficult to recover from, while removing or changing compromised regular keys is a simpler task.
+Assign regular keys to your funded account to enable you to sign most transactions with regular keys, while keeping your master keys offline. A master key [compromise](concept-issuing-and-operational-addresses.html) can be difficult to recover from, while removing or changing compromised regular keys is a simpler task.
 
 For an overview of master and regular keys, see [Understanding Master and Regular Keys](reference-transaction-format.html#understanding-master-and-regular-keys).
 
@@ -22,11 +22,12 @@ This tutorial walks you through the steps required to assign regular keys to an
 6. [Explore next steps](#6-explore-next-steps)
 
 
-### 1. Generate a Master Account and Its Master Keys
 
-If you already have a master account and master keys, skip this step.
+### 1. Generate an `account_id` and Keys
 
-Use the [`wallet_propose`](reference-rippled.html#wallet-propose) method to generate a master account, along with its master keys.
+If you already have a funded account, skip this step.
+
+Use the [`wallet_propose`](reference-rippled.html#wallet-propose) method to generate an `account_id`, along with keys.
 
 Here's an example `wallet_propose` request and response.
 
@@ -58,13 +59,13 @@ Here's an example `wallet_propose` request and response.
 ```
 
 
-### 2. Fund the Master Account
+### 2. Create and Fund an Account
 
-If you already have a funded master account, skip this step.
+If you already have a funded account, skip this step.
 
-A master account, such as the one created in step 1, must be funded before you can assign regular keys to it. Use the [`Payment`](reference-transaction-format.html#payment) transaction type to fund your master account.
+An `account_id`, such as the one generated in step 1, is not an actual account until it is funded. The act of sending a [`Payment`](reference-transaction-format.html#payment) transaction to the `account_id` creates the account in the XRP Ledger and funds it. After the account is created and funded, you can assign regular keys to it. ***TODO: Still working on this...***
 
-In the request, send the funder's `account_id` as the `Account` value, the funder's `master_seed` (private key) as the `secret` value, and the master account's `account_id` as the `Destination` value.
+In the `Payment` request, send the funder's `account_id` as the `Account` value, the funder's `master_seed` (private key) as the `secret` value, and the master account's `account_id` as the `Destination` value. ***TODO: Does not necessarily need to be the master_seed that signs. Could be whatever key the funding account uses to sign transactions.***
 
 Here's an example `Payment` request and response.
 

dactyl-config.yml

@@ -60,6 +60,7 @@ targets:
             "tutorial-paychan.html": https://ripple.com/build/payment-channels-tutorial/
             "tutorial-escrow.html": https://ripple.com/build/escrow-tutorials/
             "tutorial-listing-xrp.html": https://ripple.com/build/listing-xrp-exchange/
+            "concept-keys.html": https://ripple.com/build/keys/
             "concept-accounts.html": https://ripple.com/build/accounts/
             "concept-amendments.html": https://ripple.com/build/amendments/
             "concept-consensus.html": https://ripple.com/build/xrp-ledger-consensus-process/
@@ -325,6 +326,14 @@ pages:
             - local
             - ripple.com
 
+    -   name: Keys
+        category: Features
+        html: concept-keys.html
+        md: concept-keys.md
+        targets:
+            - local
+            - ripple.com
+
     -   md: concept-money.md
         category: Features
         html: concept-money.html