Merge branch 'master' of https://github.com/monero-project/monero-site

knowledge-base/moneropedia/address.md

@@ -7,9 +7,16 @@ summary: "either an alias, such as donate.getmonero.org, or a set of 95 characte
 
 ### The Basics
 
-When you send Monero to someone you only need one piece of information, and that is their Monero address. A *raw* Monero address is a set of 95 characters starting with a 4. The Monero donation address, for instance, is <span class="long-term">44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A</span>.
+When you send Monero to someone you only need one piece of information, and that is their Monero address. A *raw* Monero address is a set of 95 characters starting with a '4'. The Monero donation address, for instance, is <span class="long-term">44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A</span>.
 
-Because those addresses are long and complex you will often encounter an @OpenAlias address instead. For example, Monero donations can be sent to <span class="long-term">[email protected]</span> or <span class="long-term">donate.getmonero.org</span>
+Because those addresses are long and complex you will often encounter an @OpenAlias address instead. For example, Monero donations can be sent to <span class="long-term">[email protected]</span> or <span class="long-term">donate.getmonero.org</span>.
 
 If you would like to get an @OpenAlias address of your own then there is some information on the [OpenAlias page](/knowledge-base/openalias).
 
+### Integrated address
+
+An integrated address is an address combined with an encrypted 64-bit @payment-ID. A raw integrated address is 106 characters long.
+
+### In-depth Information
+
+The address is actually the concatenation, in Base58 format, of the *public* @spend-key and the *public* @view-key, prefixed with the network byte (the number 18 for Monero) and suffixed with the first four bytes of the Keccac-256 hash of the whole string (used as a checksum).

knowledge-base/moneropedia/mnemonicseed.md

@@ -7,4 +7,9 @@ summary: "a 13 or 25 word phrase used to backup a Monero account, available in a
 
 ### The Basics
 
-{{ page.summary | capitalize }}.
\ No newline at end of file
+{{ page.summary | capitalize }}. This 25-word phrase (13 words in the case of MyMonero) has all the information needed to view and spend funds from a Monero @account.
+
+### In-depth Information
+
+In the official wallet, the mnemonic seed comprises 25 words with the last word being used as a checksum. Those words correspond to a 256-bit integer, which is the account's *private* @spend-key. The *private* @view-key is derived by hashing the private spend key with Keccak-256, producing a second 256-bit integer. The corresponding *public* keys are then derived from the private keys.
+

knowledge-base/moneropedia/paymentid.md

@@ -7,11 +7,20 @@ summary: "an optional flag that is added to identify transactions to merchants,
 
 ### The Basics
 
-Payment ID is an **arbitrary** and **optional** transaction attachment that consists of 32 bytes (64 hexadecimal characters).
+Payment ID is an **arbitrary** and **optional** transaction attachment that consists of 32 bytes (64 hexadecimal characters) or 8 bytes (in the case of integrated addresses).
 
-It is usually used to identify transactions to merchants and exchanges: Given the intrinsic privacy features built into Monero, where a single public address is usually used for incoming transactions, the Payment ID is especially useful to tie incoming payments with user accounts.
+The Payment ID is usually used to identify transactions to merchants and exchanges: Given the intrinsic privacy features built into Monero, where a single public address is usually used for incoming transactions, the Payment ID is especially useful to tie incoming payments with user accounts.
+
+### Compact Payment ID's and Integrated Addresses
+
+Since the 0.9 Hydrogen Helix version, the Payment IDs can be encrypted and embedded in a payment address. The payment ID's of this type should be 64-bits.
 
 ### Creating a Payment ID
 One can create a Payment ID quickly from the command line using OpenSSL:
 
 ```# openssl rand 32 -hex```
+
+or
+
+```# openssl rand 8 -hex``` to get a PaymentID for an Integrated Address.
+

knowledge-base/moneropedia/spendkey.md

@@ -2,9 +2,15 @@
 layout: moneropedia
 entry: "Spend Key"
 terms: ["spend-key", "spend-keys"]
-summary: "one of two sets of private and public cryptographic keys that each account has, with the private spend key required to spend any funds in the account"
+summary: "one of the two pairs of private and public cryptographic keys that each account has, with the *private* spend key used to spend any funds in the account"
 ---
 
 ### The Basics
 
-{{ page.summary | capitalize }}.
\ No newline at end of file
+{{ page.summary | capitalize }}.
+
+### In-depth Information
+
+The *private* spend key is a 256-bit integer that is used to sign Monero transactions. With the current deterministic key derivation method of the official wallet, the private spend key is also an alternate representation of the @mnemonic-seed. It can be used to derive all other account keys.
+
+

knowledge-base/user-guides/simplewallet.md

@@ -38,8 +38,7 @@ In this example, `Balance` is your total balance. The `unlocked balance` is the
 
 You will need the standard address you want to send to (a long string starting with '4'), and
 possibly a payment ID, if the receiving party requires one. In that latter case, that party
-may instead give you an integrated address, which is both of these packed into a single address
-(integrated address do not start with 4, but A).
+may instead give you an integrated address, which is both of these packed into a single address.
 
 ### Sending to a standard address: