diff --git a/_data/glossary.csv b/_data/glossary.csv
index f238107b..b4805444 100644
--- a/_data/glossary.csv
+++ b/_data/glossary.csv
@@ -1,60 +1,66 @@
-Term,Definition,Areas
-App Review,An incentive mechanism for application developers in the early stage (first four years) of the ecosystem and helps with bootstrapping the two-sided market.,
-App Mining,"A system where the Blockstack community funds decentralized app teams.",
-association token,"A whitelisted key used in a Gaia Storage system.",Blockstack Tech
-Atlas,A peer network provide a global index for discovery,Blockstack Tech
+Term,Definition
+App Mining,A system where the Blockstack community funds decentralized app teams.
+App Review,An incentive mechanism for application developers in the early stage (first four years) of the ecosystem and helps with bootstrapping the two-sided market.
+Atlas,A peer network provide a global index for discovery
+Bitcoin (BTC) address,
A string of letters and numbers.
3E53XjqK4Cxt71BGeP2VhpcotM8LZ853C8
Sharing this address allows anyone to send Bitcoin to the address.
block,"A discrete group of records written to a blockchain that can effectively be identified and referenced by the
-use of headers that contain a digital fingerprint of the records each block contains.",Filing
-blockchain,A database created and shared by the members of a peer-to-peer computer network which each member of that network can independently trust due to the rules governing the database’s creation. A blockchain can therefore be used to replace centralized databases.,Filing
-Blockchain Name System (BNS),Replacement for DNS.,Blockstack Tech
-blockstack browser,An application for accessing identity and storage.,Blockstack Tech
-Blockstack Core,"A complete version of our open-source software available on Github at https://github.com/blockstack/blockstack-core/ that governs the creation of the blockchain, the smart contracts that may be written to our blockchain, and other systems that make up the Blockstack network, when run on the systems and devices of our users and developers.",Filing
-blockstack id,See id.blockstack,
-Burning,Burning a token means that the token is transferred to an address that is a black hole—one that is not owned by any entity and for which guessing the applicable private key is effectively impossible based on known mathematical principles. This effectively destroys the token by making it unavailable for future use and decreases the total number of tokens available from that point forward.,Filing
-consensus hash,"A consensus hash is a cryptographic hash that each node calculates at each block. It is derived from the accepted state transitions in the last-processed block, and a geometric series of prior-calculated consensus hashes.
-",General Tech
-Consensus rules,"The rules governing the creation of new valid records in a blockchain database, and the mining algorithms used for this purpose.",Filing
-control plane ,The part of a network that carries signaling traffic and is responsible for routing. Control packets originate from or are destined for a router. Functions of the control plane include system configuration and management.,General Tech
-core node,A server that runs Blockstack Core services.,Filing
-crypto-asset,"A digital asset which utilises cryptography, peer-to-peer networking, and a public ledger to regulate the creation of new units, verify transactions, and secure the transactions without the intervention of any middleman.",Filing
-cryptography,"The practise and study of encryption and decryption - encoding data so that it can only be decoded by specific individuals. A system for encrypting and decrypting data is a cryptosystem.",General Tech
-decentralized application (DApp),"A DApp is a service that enables direct interaction between end users and providers (e.g. connecting buyers and sellers in some marketplace, owners and stores in file storage). A term coined by Ethereum. See their glossary: http://ethdocs.org/en/latest/glossary.html",Blockchain general
-digital asset,"Also referred to as a crypto-asset. Any set of unique digital information—including, for example, programs, decentralized programs, isolated chunks of programming code, collections of data, e-mail or web addresses or cryptocurrency tokens—that is capable of being stored and uniquely tracked on a computer network such as the Blockstack network and over which a user can maintain control through that network.",Filing
-digital fingerprint,"A digital fingerprint is a unique number of a fixed length that can be produced by running any set of digital information through something called a cryptographic hash function. Each set of digital information (including a digital asset, and the digital record of any network operation on that digital asset) should (as a practical matter) have a unique digital fingerprint, which allows that set of digital information to be identified. However, it is almost impossible to recreate a digital asset from its digital fingerprint. The Blockstack network uses industry-standard algorithms such as SHA-256 to create digital fingerprints.",Filing
-digital signature,"A digital signature is a sequence of digital information combining a user’s private key and any digital information that the user wishes to sign. Any other party can use the user’s paired public key to verify that the digital signature is authentic, i.e. that the public key was generated from a particular piece of digital information and the user’s private key.",Filing
-distributed hash tables (DHT),"A form of network used to store some content in the form of key/value pairs. ... This experimental project try to avoid keeping all the blockchain, but instead prefers to store it in a DHT.",General Tech
-ephemeral key,A cryptographic key is called ephemeral if it is generated for each execution of a key establishment process.,
-fork,"The term fork is used to refer both to any situation where there are two or more competing versions of a blockchain on a network (a situation that may arise and resolve itself in the ordinary course of network operations due to lags in communication between core nodes) and any software update that is proposed for adoption by the core nodes of a blockchain network that may result in a persistent fork on the network, with core nodes that adopt the update recognizing one version of the blockchain and those which do not recognizing another.",Filing
-Gaia,Decentralized storage ,Blockstack Tech
-genesis block,"The genesis block is the first block of the Stacks blockchain, which will create the initial 1.32 billion Stacks tokens.",Filing
-id.blockstack,"An identifier in the Blockstack, for example moxiegirl.id.blockstack. This is your name & identity that is registered in the .id namespace on Blockstack. Your personal data and storage are built around this ID. Apps that want to access your data use your permission and identity to find it. An id is usually a shorthand for a longer, hash ID string, for example ID-1Fj9kkw15P51Fj9kkw15P5xJmyefWhLKrQMKNPREfaqsJ
-",Blockstack Tech
-identity management (IDM),"Identity management, also known as identity and access management is, in computer security, the security and business discipline that enables the right individuals to access the right resources at the right times and for the right reason",General Tech
-know your customer (KYC),"Or KYC, is a popular term used in the banking or financial field. KYC is a process where financial institutions, insurers and other companies obtain information about the identity and address of the customers as part of risk management.",
-KYC,See know your customer,
-light clients,"Clients that can independently validate the existence of transactions by downloading only block headers and not the entire blockchain.",
-mesh network,"A local network topology in which the infrastructure nodes (i.e. bridges, switches, and other infrastructure devices) connect directly, dynamically and non-hierarchically to as many other nodes as possible and cooperate with one another to efficiently route data from/to clients.",General Tech
-mining,"Mining generally refers to the process of performing certain functions for a network such as adding new records to a blockchain in exchange for mining rewards; it may also refer to other mechanisms whereby rewards (usually in the form of cryptocurrency) are provided for performing other tasks helpful to the network.",Filing
-mining power,"A miner’s (or group of miners’) mining power is equal to the probability it will be selected to write a new block to the blockchain. Depending on the mechanism for mining, this is usually related to the overall share of computing power or cryptoassets the miner or miners possess relative to all miners for that blockchain.",Filing
-mining rewards,Mining rewards are newly issued tokens received by miners in exchange for adding new records to the blockchain or other activities beneficial to the network.,Filing
-name,"An identifier or name. Names are a type of digital asset in the Blockstack network. If you have signed into the Blockstack Browser, you created a name. If an application developer registered an application within Blockstack, then they registered a name.",General
-network operation,"A network operation is any change to the information about a digital asset (or smart contract) stored on a blockchain, including, for example, a change in the digital asset’s owner, or a change in the location at which it is stored on the network. How and when these network operations are performed for each digital asset is governed, on the Blockstack network, either by the Blockstack Core software or a smart contract.",Filing
-Public Key Infrastructure (PKI),A system which returns a cryptographic public key associated with a name.,General Tech
-private key,"A private key is a very large random sequence of digital information (effectively a very long password) that should be known only by a single user of the network and cannot be plausibly guessed by a third party in a reasonable amount of time. A user generates this large random sequence locally on a computer and should never share it with anyone. Each private key has a paired sequence of digital information, called a public key, which a user can share publicly.",Filing
-proof-of-burn mining,"The consensus algorithm used in the Stacks blockchain where miners destroy a proof-of-work-based cryptocurrency (currently Bitcoin) to get tokens; this enables the functionality where nodes can select between conflicting blockchain forks, as the blockchain fork with the most amount of cryptocurrency burned is considered to be the correct fork.",
-proof-of-work,"A proof-of-work system or proof-of-work mining is a mining mechanism where miners must expend computing power to solve complicated cryptographic puzzles, and prove that they have done so by writing the solution to the blockchain, in order to be allowed to add blocks to a blockchain. This is the mining system used, for example, by Bitcoin.",Filing
-replicated state machines (RSMs),"This is a model for reasoning about distributed computer programs -- any program (plus it's input) can be represented as a state machine, and when trying to get a distributed set of servers to agree on the output of an algorithm, you can model that process as N different state machines",General Tech
-smart contract,"A smart contract is a computer program written to a blockchain such as the Blockstack blockchain by developers. This computer program defines the various network operations that can be performed on the digital assets on the blockchain, the computations that can be performed using the smart contract, along with defining various important properties of the respective digital assets like ownership rights and the cost in fuel required to register the digital assets.",Filing
-soft fork,"A soft fork is a proposed update to the software governing the network that results in a post-update network that is compatible with the network as it existed prior to the update, because it restricts the network operations that can be performed after the update.",Filing
-Stacks blockchain,The Stacks blockchain is the custom blockchain being developed for use by the Blockstack network that will use the Stacks token as its native currency and which will include the genesis block and subsequent blocks created by the mining activities described in The Blockstack Network—Development of the Blockstack network.,Filing
-storage hub,"An Gaia instance run by a hub provider or software. A Gaia hub stores data in separate, addressed location.",Blockstack Tech
-storage provider,"A third-party company cloud or software provider that hosts one or more Gaia storage hubs.",Blockstack Tech
-transaction,"A transaction is a unit of work within a block.",General Tech
-transaction fee,"Fees paid by participants in a transaction to miners.",Blockstack Tech
-two-sided market problem,Economic platforms having two distinct user groups that provide each other with network benefits. The Blockstack platform is a classic two-sided market.,
-username,A shorthand name for your your id.blockstack.,Blockstack Tech
-virtual blockchain,A layer that sits on top of a blockchain that introduces new functionality and operations without requiring changes to the underlying blockchain,Blockstack Tech
-wallet address,A wallet address is the form in which a public key can be presented and recorded on a blockchain. Wallet addresses are therefore used to assign the ownership of digital assets on the Blockstack network.,Filing
+use of headers that contain a digital fingerprint of the records each block contains."
+blockchain,A database created and shared by the members of a peer-to-peer computer network which each member of that network can independently trust due to the rules governing the database’s creation. A blockchain can therefore be used to replace centralized databases.
+Blockchain Name System (BNS),Replacement for DNS.
+blockstack browser,An application for accessing identity and storage.
+Blockstack Core,"A complete version of our open-source software available on Github at https://github.com/blockstack/blockstack-core/ that governs the creation of the blockchain, the smart contracts that may be written to our blockchain, and other systems that make up the Blockstack network, when run on the systems and devices of our users and developers."
+blockstack id,See id.blockstack
+Blockstack Owner Address,Looks like a bitcoin address but starts with ID
for example:
ID-1J3PUxY5uDShUnHRrMyU6yKtoHEUPhKULs
+Burning,Burning a token means that the token is transferred to an address that is a black hole—one that is not owned by any entity and for which guessing the applicable private key is effectively impossible based on known mathematical principles. This effectively destroys the token by making it unavailable for future use and decreases the total number of tokens available from that point forward.
+consensus hash,"A consensus hash is a cryptographic hash that each node calculates at each block. It is derived from the accepted state transitions in the last-processed block, and a geometric series of prior-calculated consensus hashes."
+Consensus rules,"The rules governing the creation of new valid records in a blockchain database, and the mining algorithms used for this purpose."
+control plane,The part of a network that carries signaling traffic and is responsible for routing. Control packets originate from or are destined for a router. Functions of the control plane include system configuration and management.
+core node,A server that runs Blockstack Core services.
+crypto-asset,"A digital asset which utilises cryptography, peer-to-peer networking, and a public ledger to regulate the creation of new units, verify transactions, and secure the transactions without the intervention of any middleman."
+cryptography,The practise and study of encryption and decryption - encoding data so that it can only be decoded by specific individuals. A system for encrypting and decrypting data is a cryptosystem.
+decentralized application (DApp),"A DApp is a service that enables direct interaction between end users and providers (e.g. connecting buyers and sellers in some marketplace, owners and stores in file storage). A term coined by Ethereum. See their glossary: http://ethdocs.org/en/latest/glossary.html"
+digital asset,"Also referred to as a crypto-asset. Any set of unique digital information—including, for example, programs, decentralized programs, isolated chunks of programming code, collections of data, e-mail or web addresses or cryptocurrency tokens—that is capable of being stored and uniquely tracked on a computer network such as the Blockstack network and over which a user can maintain control through that network."
+digital fingerprint,"A digital fingerprint is a unique number of a fixed length that can be produced by running any set of digital information through something called a cryptographic hash function. Each set of digital information (including a digital asset, and the digital record of any network operation on that digital asset) should (as a practical matter) have a unique digital fingerprint, which allows that set of digital information to be identified. However, it is almost impossible to recreate a digital asset from its digital fingerprint. The Blockstack network uses industry-standard algorithms such as SHA-256 to create digital fingerprints."
+digital signature,"A digital signature is a sequence of digital information combining a user’s private key and any digital information that the user wishes to sign. Any other party can use the user’s paired public key to verify that the digital signature is authentic, i.e. that the public key was generated from a particular piece of digital information and the user’s private key."
+distributed hash tables (DHT),"A form of network used to store some content in the form of key/value pairs. ... This experimental project try to avoid keeping all the blockchain, but instead prefers to store it in a DHT."
+ephemeral key,A cryptographic key is called ephemeral if it is generated for each execution of a key establishment process.
+fork,"The term fork is used to refer both to any situation where there are two or more competing versions of a blockchain on a network (a situation that may arise and resolve itself in the ordinary course of network operations due to lags in communication between core nodes) and any software update that is proposed for adoption by the core nodes of a blockchain network that may result in a persistent fork on the network, with core nodes that adopt the update recognizing one version of the blockchain and those which do not recognizing another."
+Gaia,Decentralized storage
+genesis block,"The genesis block is the first block of the Stacks blockchain, which will create the initial 1.32 billion Stacks Tokens."
+id.blockstack,"An identifier in the Blockstack, for example moxiegirl.id.blockstack. This is your name & identity that is registered in the .id namespace on Blockstack. Your personal data and storage are built around this ID. Apps that want to access your data use your permission and identity to find it. An id is usually a shorthand for a longer, hash ID string, for example ID-1Fj9kkw15P51Fj9kkw15P5xJmyefWhLKrQMKNPREfaqsJ"
+identity,"A way to identify a person or an organization on the Blockstack network. An identity is unique, both moxiegirl.id.blockstack
or chad.id
are examples of IDs.
"
+identity management (IDM),"Identity management, also known as identity and access management is, in computer security, the security and business discipline that enables the right individuals to access the right resources at the right times and for the right reason"
+know your customer (KYC),"Or KYC, is a popular term used in the banking or financial field. KYC is a process where financial institutions, insurers and other companies obtain information about the identity and address of the customers as part of risk management."
+KYC,See know your customer
+light clients,Clients that can independently validate the existence of transactions by downloading only block headers and not the entire blockchain.
+Magic Recovery Code,"An long encrypted string, for example:
36mWivFdy0YPH2z31EflpQz/Y0UMrOrJ++lH=0EI7c3mop2JuRBm5WXxSTazJsUjOA...
Do not share the QR code that accompanied your code either. This is a QR code:
"
+mesh network,"A local network topology in which the infrastructure nodes (i.e. bridges, switches, and other infrastructure devices) connect directly, dynamically and non-hierarchically to as many other nodes as possible and cooperate with one another to efficiently route data from/to clients."
+mining,Mining generally refers to the process of performing certain functions for a network such as adding new records to a blockchain in exchange for mining rewards; it may also refer to other mechanisms whereby rewards (usually in the form of cryptocurrency) are provided for performing other tasks helpful to the network.
+mining power,"A miner’s (or group of miners’) mining power is equal to the probability it will be selected to write a new block to the blockchain. Depending on the mechanism for mining, this is usually related to the overall share of computing power or cryptoassets the miner or miners possess relative to all miners for that blockchain."
+mining rewards,Mining rewards are newly issued tokens received by miners in exchange for adding new records to the blockchain or other activities beneficial to the network.
+name,"An identifier or name. Names are a type of digital asset in the Blockstack network. If you have signed into the Blockstack Browser, you created a name. If an application developer registered an application within Blockstack, then they registered a name."
+network operation,"A network operation is any change to the information about a digital asset (or smart contract) stored on a blockchain, including, for example, a change in the digital asset’s owner, or a change in the location at which it is stored on the network. How and when these network operations are performed for each digital asset is governed, on the Blockstack network, either by the Blockstack Core software or a smart contract."
+private key,"Private keys matches a corresponding public key. A public key also looks like a string of letters and numbers:
The exact format of the public and private key depend on the software you use to create them.
"
+proof-of-burn mining,"The consensus algorithm used in the Stacks blockchain where miners destroy a proof-of-work-based cryptocurrency (currently Bitcoin) to get tokens; this enables the functionality where nodes can select between conflicting blockchain forks, as the blockchain fork with the most amount of cryptocurrency burned is considered to be the correct fork."
+proof-of-work,"A proof-of-work system or proof-of-work mining is a mining mechanism where miners must expend computing power to solve complicated cryptographic puzzles, and prove that they have done so by writing the solution to the blockchain, in order to be allowed to add blocks to a blockchain. This is the mining system used, for example, by Bitcoin."
+public key,Public and private key pair comprise of two uniquely related cryptographic keys. It looks like a long random string of letters and numbers:
3048 0241 00C9 18FA CF8D EB2D EFD5 FD37 89B9 E069 EA97 FC20 …
The exact format of the public and private key depend on the software you use to create them.
+Public Key Infrastructure (PKI),A system which returns a cryptographic public key associated with a name.
+replicated state machines (RSMs),"This is a model for reasoning about distributed computer programs -- any program (plus it's input) can be represented as a state machine, and when trying to get a distributed set of servers to agree on the output of an algorithm, you can model that process as N different state machines"
+Secret Recovery Key,Used to access an identity on the Blockstack blockchain. A 24-word sequence of words for example:
applied binge crisp pictorial fiery
dancing agreeable frogs light finish ping apple
The early Blockstack recovery keys were 12-word sequences.
+seed phrase,"Used to access Stacks Wallet software. The seed phrase consists of 24 words in a sequence. Both the word and its position the sequence are important.
Write down your seed phrase and store it in a secure location such as a safe deposit box. When you write the seed phrase down, include its position, for example,1-frog, 2-horse, 3-building
and so on until you reach a final position 24-ocean
.
"
+smart contract,"A smart contract is a computer program written to a blockchain such as the Blockstack blockchain by developers. This computer program defines the various network operations that can be performed on the digital assets on the blockchain, the computations that can be performed using the smart contract, along with defining various important properties of the respective digital assets like ownership rights and the cost in fuel required to register the digital assets."
+soft fork,"A soft fork is a proposed update to the software governing the network that results in a post-update network that is compatible with the network as it existed prior to the update, because it restricts the network operations that can be performed after the update."
+Stacks (STX) address," A STX address is a string of letters and numbers starting with an SP
or SM
, for example: SM3KJBA4RZ7Z20KD2HBXNSXVPCR1D3CRAV6Q05MKT
If you created a software-only wallet with the Stacks Wallet software, the wallet has a single STX address which is also sometimes called the wallet address. You access a software wallet with a seed phrase.
"
+Stacks blockchain,The Stacks blockchain is the custom blockchain being developed for use by the Blockstack network that will use the Stacks token as its native currency and which will include the genesis block and subsequent blocks created by the mining activities described in The Blockstack Network—Development of the Blockstack network.
+storage hub,"An Gaia instance run by a hub provider or software. A Gaia hub stores data in separate, addressed location."
+storage provider,A third-party company cloud or software provider that hosts one or more Gaia storage hubs.
+transaction,A transaction is a unit of work within a block.
+transaction fee,Fees paid by participants in a transaction to miners.
+two-sided market problem,Economic platforms having two distinct user groups that provide each other with network benefits. The Blockstack platform is a classic two-sided market.
+username,A shorthand name for your your id.blockstack.
+virtual blockchain,A layer that sits on top of a blockchain that introduces new functionality and operations without requiring changes to the underlying blockchain
+wallet address,A wallet address is the form in which a public key can be presented and recorded on a blockchain. Wallet addresses are therefore used to assign the ownership of digital assets on the Blockstack network.
watch-only wallet,A wallet without send and receive ability. You can view only balances and transaction history.
-Web of trust mining,"Web-of-trust mining provides incentive mechanisms for users where an initial trusted-set of unique users is curated in the genesis block and, in the future, the initial set of users can expand the web-of-trust after the network goes live. ",
-Zone file,"A Domain Name System (DNS) zone file is a text file that describes a DNS zone. A DNS zone is a subset, often a single domain, of the hierarchical domain name structure of the DNS.",General Tech
+Web of trust mining,"Web-of-trust mining provides incentive mechanisms for users where an initial trusted-set of unique users is curated in the genesis block and, in the future, the initial set of users can expand the web-of-trust after the network goes live."
+Zone file,"A Domain Name System (DNS) zone file is a text file that describes a DNS zone. A DNS zone is a subset, often a single domain, of the hierarchical domain name structure of the DNS."
+,
\ No newline at end of file
diff --git a/_data/theFAQs.json b/_data/theFAQs.json
index b562f903..d21ce05c 100644
--- a/_data/theFAQs.json
+++ b/_data/theFAQs.json
@@ -69,7 +69,7 @@
{
"category":"appusers",
"question":"How do I get an identity? Is it free?",
- "answer":"Normally, registering an identity as a digital asset on the Stacks blockchain requires burning of Stacks tokens as fuel. However, Blockstack PBC is currently running a free service to pay for identities on behalf of the users. Through this service, you can get a free identity from Blockstack in the id.blockstack namespace. A namespace is similar to a domain (checklist.com, for example) on the old internet. So, a free identity has blockstack suffix in its name; for example, moxiegirl.id.blockstack is a free Blockstack identity.
"
+ "answer":"Normally, registering an identity as a digital asset on the Stacks blockchain requires burning of Stacks tokens as fuel. However, Blockstack PBC is currently running a free service to pay for identities on behalf of the users. Through this service, you can get a free identity from Blockstack in the id.blockstack namespace. A namespace is similar to a domain (checklist.com, for example) on the old internet. So, a free identity has blockstack suffix in its name; for example, moxiegirl.id.blockstack is a free Blockstack identity.
"
},
{
"category":"appusers",
@@ -503,13 +503,13 @@
},
{
"category":"wallet",
- "question":"When will the new Stacks wallet be available?",
- "answer":"The Stacks wallet is available for download at wallet.blockstack.org.
"
+ "question":"When will the new Stacks Wallet be available?",
+ "answer":"The Stacks Wallet is available for download at wallet.blockstack.org.
"
},
{
"category":"wallet",
- "question":"What is a public Stacks wallet address?",
- "answer":"During the initial grant process, investors submitted a public Stacks wallet address to Blockstack. This is a string of letters and numbers starting with an ‘SP’ or SM’, for example SP017AUV5YRM7HT3TSQXJF7FCCYXETAB276BQ6XY
is a wallet address.
If you purchased Stacks tokens through CoinList, you can find your address at CoinList. If you submitted your Stacks address directly to Blockstack, you can either use the “Restore from Seed Phrase” feature on the Stacks wallet or contact us at hello@stackstoken.com for help.
"
+ "question":"What is a public Stacks Wallet address?",
+ "answer":"During the initial grant process, investors submitted a public Stacks Wallet address to Blockstack. This is a string of letters and numbers starting with an ‘SP’ or SM’, for example SP017AUV5YRM7HT3TSQXJF7FCCYXETAB276BQ6XY
is a wallet address.
If you purchased Stacks tokens through CoinList, you can find your address at CoinList. If you submitted your Stacks address directly to Blockstack, you can either use the “Restore from Seed Phrase” feature on the Stacks Wallet or contact us at hello@stackstoken.com for help.
"
},
{
"category":"wallet",
diff --git a/_develop/communityResources.md b/_develop/communityResources.md
index db45280f..5044696c 100644
--- a/_develop/communityResources.md
+++ b/_develop/communityResources.md
@@ -17,7 +17,7 @@ other resources.
{% for resource in site.data.community.resources %}
- {{ resource.title }} {{resource.description}} ({{resource.type}}) |
+ {{ resource.title }} {{resource.description}} ({{resource.type}}) |
{{resource.date}} |
{% endfor %}
diff --git a/_includes/keyphrase.md b/_includes/keyphrase.md
index 9102aaf5..37e48503 100644
--- a/_includes/keyphrase.md
+++ b/_includes/keyphrase.md
@@ -9,42 +9,38 @@ Use the following table to answer questions about keys/phrases/values you can sh
Secret Recovery Key
- 12 word seed phrase
- 24 word seed phrase
|
PROTECT |
- A 12 or 24 sequence of words for example:
+ Used to access an identity on the Blockstack blockchain. A 24-word sequence of words for example:
applied binge crisp pictorial fiery
dancing agreeable frogs light finish ping apple
+ The early Blockstack recovery keys were 12-word sequences.
|
- Identity
+ identity
Blockstack identity
Blockstack ID
|
SHAREABLE |
- A username, Both moxiegirl.id.blockstack or chad.id are examples of IDs.
+ A way to identify a person or an organization on the Blockstack network. An identity is unique, both moxiegirl.id.blockstack or chad.id are examples of IDs.
|
Magic Recovery Code |
PROTECT |
- An long encrypted string, for example:
- 36mWivFdy0YPH2z31EflpQz/Y0UMrOrJ++lH=0EI7c3mop2JuRBm5WXxSTazJsUjOA...
- Do not share the QR code that accompanied your code either. This is a QR code:
-
+ | An long encrypted string, for example: 36mWivFdy0YPH2z31EflpQz/Y0UMrOrJ++lH=0EI7c3mop2JuRBm5WXxSTazJsUjOA... Do not share the QR code that accompanied your code either. This is a QR code:
|
Blockstack Owner Address |
SHAREABLE |
- Looks like a bitcoin address but starts with ID for example:
- ID-1J3PUxY5uDShUnHRrMyU6yKtoHEUPhKULs
- |
+
+ Looks like a bitcoin address but starts with ID for example: ID-1J3PUxY5uDShUnHRrMyU6yKtoHEUPhKULs
+ |
Bitcoin address
@@ -57,14 +53,11 @@ Use the following table to answer questions about keys/phrases/values you can sh
|
- Stacks Address
- Stacks Wallet Address
- STX address
+ | Stacks address or STX address
|
SHAREABLE |
- A string of letters and numbers starting with an SP or SM
- SM3KJBA4RZ7Z20KD2HBXNSXVPCR1D3CRAV6Q05MKT
- Sharing this allows anyone to send Stacks to the address, view the address balances, and view the address allocations.
+ |
+ A string of letters and numbers. 3E53XjqK4Cxt71BGeP2VhpcotM8LZ853C8 Sharing this address allows anyone to send Bitcoin to the address.
|
@@ -77,10 +70,30 @@ Use the following table to answer questions about keys/phrases/values you can sh
private key |
- |
+ PROTECT |
Private keys matches a corresponding public key. A public key also looks like a string of letters and numbers:
The exact format of the public and private key depend on the software you use to create them.
|
+
+
+ seed phrase
+ |
+ PROTECT |
+
+ Used to access Stacks Wallet software. The seed phrase consists of 24 words in a sequence. Both the word and its position the sequence are important. Write down your seed phrase and store it in a secure location such as a safe deposit box. When you write the seed phrase down, include its position, for example,1-frog, 2-horse, 3-building and so on until you reach a final position 24-ocean .
+ |
+
+
+
+ wallet address
+ |
+ SHAREABLE |
+
+
+ If you created a software-only wallet with the Stacks Wallet software, the wallet has a single STX address which is also sometimes called a Stacks (STX) address. You access a software wallet with a seed phrase.
+
+ |
+
diff --git a/_org/images/pending.png b/_org/images/pending.png
index 4fd8e87c..7b688dd7 100644
Binary files a/_org/images/pending.png and b/_org/images/pending.png differ
diff --git a/_org/images/receive-button.png b/_org/images/receive-button.png
index 1615b441..b8931a19 100644
Binary files a/_org/images/receive-button.png and b/_org/images/receive-button.png differ
diff --git a/_org/images/settings.png b/_org/images/settings.png
index 4e91791d..c035a428 100644
Binary files a/_org/images/settings.png and b/_org/images/settings.png differ
diff --git a/_org/images/top-up.png b/_org/images/top-up.png
index c0dea1b5..0eb3abca 100644
Binary files a/_org/images/top-up.png and b/_org/images/top-up.png differ
diff --git a/_org/secureref.md b/_org/secureref.md
index 89a8bd56..f7dfa3fd 100644
--- a/_org/secureref.md
+++ b/_org/secureref.md
@@ -2,6 +2,26 @@
layout: org
permalink: /:collection/:path.html
---
-# Phrase and Key Security
+# Wallet and identity security
+
+It is important that you understand how to keep good security for your Stacks Wallet software and your Blockstack identity.
+
+* TOC
+{:toc}
+
+## Backup your seed phrase and Secret Recovery Code
+
+Both your wallet seed phrase and your Secret Recovery Code are cryptographic keys. A seed phrase gives you access to your Stacks Wallet software. A **Secret Recovery Code** gives you access to your Blockstack identity. You need to use the strictest security available to you for both of these keys.
+
+The CrtypoCurrency Security Standard publishes guidelines for key storage. These guidelines are presented from least (Level I) to most secure (Level III). We recommend you store your keys with at least Level II security. This level states that you should:
+
+* Back up each of your cryptographic keys.
+* Store the backup in a location separate location from where you use a key. For example, if you use the key at the office, you can store the key are your office.
+* Protect your backup from access by unauthorized parties. For example, a safe, safe deposit box, or lock box are good examples of protecting access to a backup.
+* Employ some form of tamper mechanism that allows your to determine when if you key was accessed by someone else. For example, you could use a sealed paper envelopes with handwritten signatures over the seal as a tamper mechanism.
+
+You are responsible for recalling and protecting your keys. Blockstack does not store your seed phrase or **Secret Recovery Code**. If you lose your seed phrase, you lose the key to your STX tokens, which can be a very costly mistake. If you lose your **Secret Recovery Code**, you lose the key to your identity and cannot access your applications or the data you created with them.
+
+## Security terminology
{% include keyphrase.md %}
diff --git a/_org/token.md b/_org/token.md
index 339d7052..c3f6c6bb 100644
--- a/_org/token.md
+++ b/_org/token.md
@@ -20,7 +20,7 @@ the first block of a blockchain.
During the draft genesis block period token holders setup a seed phrase
(sometimes referred to as a _recovery phrase_ or a _recovery seed_ using the
-Stacks wallet software or their own hardware wallet.
+Stacks Wallet software or their own hardware wallet.
It was each token holder’s responsibility to store their own seed phrase in a
private and secure location. Holders could use their wallet to verify their
diff --git a/_org/tokenholders.md b/_org/tokenholders.md
index e790b9bf..e9f43799 100644
--- a/_org/tokenholders.md
+++ b/_org/tokenholders.md
@@ -4,19 +4,17 @@ permalink: /:collection/:path.html
---
# Information for current token holders
-The information on this page is intended for **current Stacks token holders** during Blockstack’s token sale through early 2018.
+The information on this page is intended for **current Stacks (STX) token holders** during Blockstack’s token sale through early 2018.
## Find your token balance and unlock date
-During your the initial grant process, you should have submitted a _public
-Stacks wallet address_ to Blockstack. The wallet address is a string of letters and numbers
-starting with an `SP` or `SM`, for example: `SM3KJBA4RZ7Z20KD2HBXNSXVPCR1D3CRAV6Q05MKT`
+During your the initial grant process, you should have submitted a public *Stacks (STX) address* (also known as a *wallet address*) to Blockstack. A STX address is a string of letters and numbers starting with an `SP` or `SM`, for example: `SM3KJBA4RZ7Z20KD2HBXNSXVPCR1D3CRAV6Q05MKT`
-If you purchased Stacks tokens through CoinList, you can find your address at
+If you purchased STX tokens through CoinList, you can find your address at
[CoinList](https://coinlist.co/distributions). If you submitted your Stacks
-address directly to Blockstack, you can either use the “Restore from Seed
-Phrase” feature on the Stacks wallet or contact us at for
+address directly to Blockstack, you can either use the **Restore from Seed
+Phrase** feature on the Stacks Wallet or contact us at for
help.
@@ -33,7 +31,7 @@ return false;
@@ -48,8 +46,8 @@ If you have questions or concerns about your report, please contact on this page.
+1. Select the **MacOS Download** button on this page.
This button downloads the software to your computer.
@@ -59,7 +51,7 @@ by Blockstack PBC." %}
## Windows Installation
-1. Select the **Windows Download** button on this page.
+1. Select the **Windows Download** button on this page.
This button downloads the software to your computer.
@@ -87,29 +79,25 @@ by Blockstack PBC." %}
5. Verify that the resulting hash (a string of letters and numbers) is the same as the latest hash published on this page.
-## Additional software requirements
+## Additional requirement and option
+
+Sending and receiving Stacks (STX) does require a Bitcoin account. You also have the option to use the wallet with or without a hardware wallet.
+
+### Bitcoin account for fuel (required)
-If you wish to use the Stacks Wallet software to send and receive Stacks, you
-need to ensure you also have a hardware wallet and a Bitcoin account.
+You need very small fractions of Bitcoin to fuel your Stacks Wallet transactions. For example, .00025 Bitcoin can fuel several transactions. You can acquire this Bitcoin fuel and send it to the Stacks Wallet via a Coinbase or other Bitcoin account. Before you begin using the wallet transactions, make sure that you have such an account. You must create this account yourself.
-### Hardware wallet
+### Hardware wallet (optional but recommended)
-If you have a paper wallet or a custodial wallet, you should setup. You can use
-any of these hardware wallets with the Stacks wallet:
+If you have a paper wallet or a custodial wallet, you should set up a secondary hardware. You can then transfer small amounts to this hardware wallet for use with your Stacks Wallet. You can use any of these hardware wallets with the Stacks Wallet:
* Trezor One
* Trezor Model T
* Ledger Nano S
-* Ledger Bluea hardware wallet.
+* Ledger Blue hardware wallet.
For information on setting up a hardware wallet, refer to the vendor's
documentation. We cannot help you set up your hardware wallet.
-### Bitcoin account for fuel
-You use this account to load very small fractions of Bitcoin to fuel your wallet
-transactions. For example, .00025 Bitcoin can fuel several transactions. You can
-acquire this Bitcoin and send it to the Stacks Wallet via a Coinbase or other
-Bitcoin account. Before you begin using the wallet transactions, make sure that
-you have such an account. You must create this account yourself.
diff --git a/_org/wallet-intro.md b/_org/wallet-intro.md
index bb833080..30d791e3 100644
--- a/_org/wallet-intro.md
+++ b/_org/wallet-intro.md
@@ -5,29 +5,36 @@ permalink: /:collection/:path.html
# Understand cryptocurrency wallets
If you are, or plan to be a Stacks token holder, you need to think about how you
-can manage your tokens. How can you review your token balance or send and
-receive your tokens? You manage your tokens through a **cryptocurrency wallet**.
+can manage your Stacks (STX) tokens. How can you review your token balance? How can send or
+receive your tokens? STX tokens are a cryptocurrency and you manage your tokens through a **cryptocurrency wallet**. This overview introduces basic wallet terminology and concepts.
-Unlike the wallets you carry physical money in, a cryptocurrency wallet doesn’t
-hold your tokens. Your tokens are recorded by transactions which are themselves
-encrypted on the Stacks blockchain. The cryptocurrency wallet holds software
-keys. You use these keys and some software to interact with the blockchain and
-gain use of your tokens.
+* TOC
+{:toc}
-## Token flow and wallets
+## Wallets, addresses, and tokens
-Tokens move from one wallet to a another via the blockchain. For example, say
-Lena decides to buy a book from Bitbooks, a company that accepts tokens. A
-complete purchase, has the following general steps:
+Cryptocurrency wallets are software that make sending and receiving cryptocurrency easier. Unlike the wallets you carry physical money in, a cryptocurrency wallet doesn’t
+contain your tokens. A wallet has one or more cryptocurrency addresses, in the case of Stacks these are *Stacks token address*.
- 
+An address is public and can be viewed by other people much like your house is visible to any passerby. To open a particular address, you must know the address value and you must have the private key for that address. Wallets can read existing addresses to send from or create new addresses to send to. A wallet can show you the history of transactions for an address on the blockchain.
+Exchanging cryptocurrency requires moving currency from one address to another. Say a company, Bitbook, is selling books and receive crypto currency in payment. Lena sees a book she wants to buy on Bitbook, she selects a **Buy** button and Bitbook gives her an address to send currency to. Lena uses her private key to open one of her cryptocurrency addresses. She then sends from this address to BitBook's address.
+
+
+
+Token exchanges are recorded by *transactions* on a blockchain. In the case of STX, these exchanges appear on the Stacks blockchain. The movement of tokens from Lena to Bitbook is recorded on the blockchain. The private key Lena uses is not recorded.
+
+
+
Security tip: What to share and what not to
+
A Stacks address is a string of letters and numbers starting with an SP
or SM
, like SM3KJBA4RZ7Z20KD2HBXNSXVPCR1D3CRAV6Q05MKT
. You can and should share the address when you want someone to send STX tokens to you.
+
Your seed phrase, 24 words in an ordered sequence, is the private key for your addresses and wallet. never share your seed phrase with anyone.
+
## Large-scale or institutional token holders
Just as you don’t keep all the money you have in your bank in a physical wallet,
-you shouldn’t keep large amounts of tokens in your cryptocurrency wallet.
+you shouldn’t keep large numbers of tokens in your cryptocurrency wallet.
Instead, if you have a large number of crypto assets, you should store them with
a custodial service. Custodial services protect your token holdings using
high-security systems.
@@ -39,10 +46,7 @@ assets as an investment, you should choose a custodial service as if you were
selecting any investment service. Consider your needs, the firm’s reputation,
fees, and so forth.
-{% include warning.html content="None of our ecosystem entities, Blockstack PBC,
-Blockstack Signature Fund, and Blockstack Token LLC, are custodial services.
-Neither the pre-genesis software wallet or the upcoming wallet are recommended for
-institutional holdings." %}
+{% include warning.html content="None of our ecosystem entities, Blockstack PBC, Blockstack Signature Fund, and Blockstack Token LLC, are custodial services. Or the Stacks Wallet is not recommended for institutional holdings." %}
Blockstack suggests a firm such as [Coinbase
Custody](https://custody.coinbase.com/) for institutional holders. Coinbase
@@ -65,11 +69,7 @@ they are on one system, they are vulnerable to theft either of the computer
itself or through computer hacking. Computer viruses can also impact desktop
wallets.
-Similarly, mobile wallets are, but they also tend to be smaller and simpler.
-Online wallets run over the web and are accessible from any networked device,
-computer or phone. However, online wallets are vulnerable to hacking as well and
-also rely on third-party service providers who themselves may also be
-vulnerable.
+Similarly, mobile, online wallets do not require a desktop, but they also tend to be smaller and simpler. Online wallets run over the web and are accessible from any networked device, computer or phone. However, online wallets are vulnerable to hacking as well and also rely on third-party service providers who themselves may also be vulnerable.
Hardware wallets store your seed and addresses on a device like a USB. To use
these wallets, you connect them to a networked computer, enter a pin, and
@@ -88,11 +88,11 @@ use multiple wallets choosing whichever works best for you at a specific time.
For example, the Stacks Wallet is a software wallet. It operates with and
without a link to a hardware wallet. With a link to a hardware wallet, you can
-use the Stacks wallet to send and receive Stacks. When used without a hardware
-wallet link, the Stacks wallet is in _watch-only_ mode. This means the wallet
+use the Stacks Wallet to send and receive Stacks. When used without a hardware
+wallet link, the Stacks Wallet is in _watch-only_ mode. This means the wallet
cannot send or receive Stacks. You can view only balances and transaction
history.
-In some cases, you may need to transfer Stacks to or reference token address in whichever
+In some cases, you may need to transfer Stacks to a reference token address in whichever
wallet you want to move. Consult the documentation for your wallets for more
information.
diff --git a/_org/wallet-use.md b/_org/wallet-use.md
index 35291d49..9acc7ae7 100644
--- a/_org/wallet-use.md
+++ b/_org/wallet-use.md
@@ -5,89 +5,109 @@ permalink: /:collection/:path.html
# Use the Stacks Wallet software
{:.no_toc}
-This page describes how to manage your Stacks using the Stacks Wallet software.
-The Stacks Wallet software is installed on your computer. This page contains
-the following topics:
+This page describes how to use the Stacks Wallet software to manager your Stacks (STX) tokens. This page contains the following topics:
* TOC
{:toc}
-This page assumes you have already [downloaded, verified, and installed the
-wallet software](wallet-install.html).
+The Stacks Wallet software is installed on your computer, it is not a web application. You should have already [downloaded, verified, and installed the wallet software](wallet-install.html).
-## Use the Stacks Wallet with or without a hardware wallet
+## Key concepts you should understand
-You can use the Stacks Wallet software by itself or together with a hardware
-wallet. When used by itself, the Stacks Wallet software acts as a _watch-only
-wallet_. You can view STX balances and transaction history.
+ You use Stacks Wallet software to manage STX tokens. Using the wallet you can:
-When you use the Stacks Wallet together with a hardware wallet, you can also
-send and receive Stacks. To do this, you must first top up the wallet's "gas" which is
-Bitcoin. A **_very small_** amount of Bitcoin is required to send Stacks. No
-gas is required to receive Stacks. You can use any of these hardware wallets with the Stacks wallet:
+* send STX from a specific STX address
+* receive STX at a specific STX address
+* view balances on an address
+* review transaction history associated with an address
+
+To send STX, you need Bitcoin in your wallet. Bitcoin is the "gas" for transactions on the Stacks blockchain. A **_very small_** amount of Bitcoin is required to send STX. The gas price fluctuates like any market and is driven by the price of Bitcoin. Gas is not required to receive STX.
+
+You can use the Stacks Wallet software by itself or together with a hardware wallet. Using with a hardware wallet is recommended but not required.
+
+
+
Investers and large token holdings: Hardware devices
+
If you are an investor or current Stacks token holder, you should have your relevant STX addresses on a configured hardware device before using the Stacks Wallet software. If you have very large holdings, we recommend and anticipate these are held with a custodial service. In the case of a custodial service, you would work with your service to transfer a portion of your holdings to an appropriate hardware device before using the Stacks Wallet software.
+
+
+### A hardware device with the wallet
+
+You can use any of these hardware wallets with the Stacks Wallet:
* Trezor One
* Trezor Model T
* Ledger Nano S
* Ledger Blue
-Once connected, the Stacks Wallet only uses the hardware wallet when signing
-send transactions. This means, you can connect to the hardware wallet when you
-start the Stacks Wallet software. After starting, you can disconnect the
-hardware wallet and put it away until you want to send Stacks.
+The private key on your hardware wallet is used by the Stacks Wallet software to sign send transactions. Receive transactions don't require a signature. Please consult the device's manufacturer for support in setting up and configuring your hardware device.
-The **Reset** function is always available regardless of whether you are using a
-hardware wallet as well. A reset returns the Wallet Software to its original
-state. It does not change your Stacks balance or your hardware wallet in any
-way.
+### Software only wallet and a seed phrase
+You can use the Stacks Wallet software without a hardware device to create one or more software wallets. Each wallet has its own address which corresponds to a STX address on the Stacks blockchain. You access this address with a unique, **seed phrase**. The software generates a seed phrase for you when create a software-only wallet. The seed phrase consists of 24 words in a sequence. Both the word _and its position the sequence_ are important.
-## Open the wallet
+Write down your seed phrase and store it in a secure location such as a safe deposit box. When you write the seed phrase down, include its position, for example,`1-frog, 2-horse, 3-building` and so on until you reach a final position `24-ocean`.
-You can use the Stacks Wallet software with or without a hardware wallet. To
-send Stacks, a hardware wallet is required.
+{% include warning.html content="Do not lose your seed phrase. If you lose your seed phrase, you lose any STX tokens in that associated wallet. No person or organization, including Blockstack, can recover a lost seed phrase." %}
-### Stacks Wallet software only
+### About the reset function
-You need at least one Stacks Address to create a wallet. A Stacks address is a
-unique string of letters and numbers, for example:
-`SM7KJBA4UZ7Z20KD2HBXNSXVPCR1D7CRAV605MKT`.
+The **Reset** function is always available regardless of whether you are using a hardware wallet or a software-only. A **Reset** returns a wallet to its original state. It does not change your STX balance, your Stacks addresses, or any connected hardware wallet in any way.
-1. Double-click on the wallet software to open it.
-2. Select **Use a Stacks Address**.
+### Used an older version of the wallet?
+
+If you used the original, v1, version of the wallet, you should instead begin using the new Stacks Wallet v3. you should have a 24 word seed phrase from that wallet. You can use this same seed phrase to open this new version of the Stacks Wallet Software.
- The system asks you to enter an address. If you are a token holder, you
- should have generated several Stacks address during your the initial grant
- process. You can provide one of these addresses to the Stacks wallet when you
- start it.
+The v2 version of the wallet required a hardware wallet to send and receive. You can connect this same hardware wallet to the v3 version of the Stacks Wallet software. If this is your situation, choose **Use existing wallet** when you first start the Stacks Wallet v3; you don't need to create a new wallet.
- 
-3. Select **Continue**.
+## Create a new or open an existing wallet
- The system displays the balance for that address.
+When you start the Stacks Wallet it prompts you to create a new or choose an existing wallet. You should create a new wallet if you have not previously connected a hardware device to the Stacks Wallet v3 software or if you do not have an existing 24 word seed phrase.
+### Use with a hardware wallet
-### Hardware wallet
+Initialize and configure your wallet according to the manufacturer's instructions before you use it with the Stacks Wallet software. Some hardware wallets require that you have additional software installed to support the hardware wallets interactions with the Stacks Wallet.
-It is a good idea to connect your hardware wallet to your computer before
-starting the Stacks wallet software, but it is not required. Some hardware
-wallets require that you have additional software installed to support the
-hardware wallets interactions with the Stacks wallet.
+
+
+ Hardware wallet |
+ Prerequisite software |
+
+
+ Trezor One |
+ Trezor Bridge |
+
+
+ Trezor Model T |
+ Trezor Bridge |
+
+
+ Ledger Nano S |
+ None. |
+
+
+ Ledger Blue |
+ None. |
+
+
-| Hardware wallet | Prerequisite software |
-|----------------- |------------------------ |
-| Trezor One | Trezor Bridge |
-| Trezor Model T | Trezor Bridge |
-| Ledger Nano S | None. |
-| Ledger Blue | None. |
+Make sure you have installed any prerequisite software. It is a good idea to connect your hardware wallet to your computer before starting the Stacks Wallet software, but it is not required.
-Make sure you have installed any prerequisite software. Then, do the following to start the Stacks Wallet with a Hardware wallet:
+When your hardware device is ready, do the following:
1. Connect your hardware wallet to your computer as you normally would.
2. Double-click on the wallet software to open it.
-3. Select **Use a Hardware Wallet**.
-4. Select the hardware wallet you want to use.
+3. Select **Create new wallet** or **Use existing wallet**.
+
+ If you connected your hardware device to an old version of the Stacks Wallet software, you choose **Create new wallet**. After you make this initial connection, the *next time* you start the wallet, you can choose **Use existing wallet**.
+
+ The system asks if you have a hardware wallet.
+
+4. Choose **Yes, I do**.
+
+ The system prompts you to select a hardware wallet.
+
+5. Select the hardware wallet you want to use.
This example uses a Trezor wallet.
@@ -96,29 +116,52 @@ Make sure you have installed any prerequisite software. Then, do the following t
The system prompts you to connect your
device.
-5. Connect your wallet to your computer and choose **Continue**.
+6. Connect your wallet to your computer and choose **Continue**.
The system prompts you to export a public key.

-6. Select **Export**.
+7. Select **Export**.
The Stacks Wallet shows the current wallet balance.
+### Software only wallet
+
+If you have an existing 24 word seed phrase from this or a previous version of the Stacks Wallet software, you don't need to create a new wallet, you can **Use existing wallet**. This procedure assumes you are creating a wallet for the first time.
+
+1. Double-click on the wallet software to open it.
+2. Select **Create new wallet**.
+
+ The system asks if you have a hardware wallet.
+
+3. Choose **No, I don't**.
+
+ The system prompts cautions you that a hardware wallet is recommended.
-## View Balance, Allocation, and transaction history
+4. Choose **Continue without a hardware wallet**.
+
+ The system generates a seed phrase for you and prompts you to write it down.
+ Don't lose your seed phrase. If you lose your seed phrase, you lose your STX tokens and can never get them back.
+
+5. Write down each word and its position, for example,` 1 - frog`.
+6. Store your written seed phrase in a secure location such as a safe deposit box.
+7. Click **I've written down my seed phrase**.
+
+ The system prompts you to re-enter your seed phrase. The sequence numbers are out of order. For example, `5` may appear in the `1` position. Enter the corresponding `5` and `1` word as appropriate.
+
+8. Select **Done**.
+
+ The system displays the balance for the address that corresponds to your seed phrase.
+
+## View balance, allocation, or transaction history
The default view for an open and loaded wallet is the **Wallet Balance** view.

-If you have started with a hardware wallet, your view includes **Send** and
-**Receive** buttons. If you open the same address in a watch-only wallet, you do
-not see these buttons:
-
-
+Notice this view includes **Send** and **Receive** buttons.
Both balances show **Transaction History** if it exists for an address. A
transaction summary appears on the initial screen. To see details,
@@ -126,49 +169,47 @@ click on a transaction:

-Not all addresses will have a balance. If you are a Stacks token holder, your
+Not all addresses have a balance. If you are a Stacks token holder, your
address shows with both a **Balance** and **Allocation**. The **Balance** is the
-Stackes you have unlocked. The **Allocation** is the amount still locked up.
+Stacks you have unlocked. The **Allocation** is the amount still locked up.

## Receive Stacks
-To receive Stack you pass a STX address directly to a user via email, for
-example. If your Stackes Wallet is connected to a hardware wallet, click the **Receive** button to
-display an address where others can send Stacks to.
+To receive Stacks: you give a STX address directly to a user via email or text, for
+example.
-
+1. Click the **Receive** button to display the wallet address. where others can send STX to.
-A stack address is a public addresses. Anyone with the address, can view the
-address balance or send money _**to**_ the address.
+ 
-{% include note.html content="Sending money from a
-Stacks address requires the private key. It is this private key together with
-your seed phrase that you should keep private and maintain with high security."
-%}
+2. Email or text the address to the person or organization sending to you.
-Blockchain transactions take time. There may be minutes or hours while the
-transaction is recorded in the blockchain. When the transaction is complete, you
-can see a receipt for the transaction in Software Wallet in watch-only mode or
-connected to a hardware wallet.
+ A Stacks address is a public addresses. Anyone with the address, can view the address balance or send money _**to**_ the address.
-## Top up Bitcoin gas
+3. Look for the receipt transaction in your transaction history.
-You require very small fractions of Bitcoin (.00001) to send Stacks with the wallet.
+ Once the person has sent you STX, you see a **PENDING** transaction which means the transaction is still being recorded by the blockchain.
+
+ 
+
+ Blockchain transactions take time. It may be minutes or hours before the transaction is recorded in the blockchain. When the transaction is complete, you can see a receipt for the transaction in your Stacks Wallet. The **PENDING** marker goes away once the funds are recorded on the blockchain.
+
+
+
+## Add Bitcoin gas
+
+The Stacks Wallet uses very small amounts of Bitcoin to pay fees for sending transactions. You need very small fractions of Bitcoin (BTC) for gas. The cost of gas you need fluctuates with the market price of Bitcoin.
{% include warning.html content="Very small amounts of Bitcoin are all you need
to fuel transactions. Never send an entire coin to your Stacks Wallet. Amounts
such as .0002 BTC are plenty." %}
-The Stacks Software wallet uses very small amounts of Bitcoin to pay fees for
-transactions. You can only receive Bitcoin with the wallet, you cannot send it
-from the Stacks Wallet. You need an account with Coinbase or similar exchange to
-buy Bitcoin or send Bitcoin.
+You can only receive Bitcoin with Stacks Wallet; you cannot send Bitcoin. You need an account with Coinbase or similar exchange to buy Bitcoin and send it to the Stacks Wallet.
-If you attempt to send Stacks with your wallet and you do not have enough
-Bitcoin to fuel the transaction, you see this dialog:
+If you attempt to send STX with your wallet and you do not have enough Bitcoin to fuel the transaction, you see this dialog:

@@ -183,12 +224,13 @@ Bitcoin to fuel the transaction, you see this dialog:
This dialog shows you how much BTC you currently have in your account.
-2. Select **Top up**.
+2. Select **Add BTC**.
The systems displays the **Top Up** dialog with a Bitcoin address.
-3. Record the address.
+ 
+3. Record the BTC address.
4. Go to your Coinbase or similar account.
5. Send Bitcoin to the address presented by the Stacks Wallet.
@@ -199,11 +241,9 @@ transaction history also shows any Bitcoin sent to your wallet.
## Send stacks
-You can only send Stacks if you have connected your Stacks wallet to a hardware
-wallet. The Stacks Wallet software uses the hardware wallet to sign your send
-transactions.
+Sending stacks is a transaction you must authorize or sign. If you have connected your Stacks Wallet to a hardware wallet. The Stacks Wallet software uses the hardware wallet to sign your send transactions. A software-only wallet asks you for the 24-word key phase you used to create the wallet.
-1. Open the Stacks wallet.
+1. Open the Stacks Wallet.
If you are starting after a reset, choose **Use a Hardware Wallet**.
@@ -241,10 +281,7 @@ transactions.
6. Select **Close**.
The send transaction appears in your **Transaction History**. Blockchain
- transactions can take minutes or hours to complete. Transactions that have
- not cleared yet show as **PENDING**.
-
- 
+ transactions can take minutes or hours to complete.
Select **Refresh** if you don't immediately see the transaction in your
history.
@@ -253,10 +290,10 @@ transactions.
## Reset the wallet
-Resetting a wallet clears all your data from the Stacks wallet and returns the
+Resetting a wallet clears all your data from the Stacks Wallet and returns the
wallet to its original state.
-* If you entered a Stacks address, resetting clears the address from the Stacks wallet.
+* If you entered a Stacks address, resetting clears the address from the Stacks Wallet.
* If you connected to a hardware wallet, resetting removes the connection to the hardware wallet.
Resetting the wallet does nothing to your addresses or their associated balances.
@@ -273,9 +310,6 @@ you do not restart the wallet, you can simple close it.

- The **Top Up** button is only visible when you have connected the Stacks
- Wallet to a hardware wallet.
-
2. Select **Reset Wallet**.
System asks for confirmation. If, for some reason, you want to stop the reset
diff --git a/_sass/theme/variables.scss b/_sass/theme/variables.scss
index c004beb0..d2515d95 100644
--- a/_sass/theme/variables.scss
+++ b/_sass/theme/variables.scss
@@ -1,4 +1,7 @@
// Color scheme variables
+$base-em-color:#5d3671;
+$base-code-color: #36074d;
+
// Main content
$color-main: #201F6D;
diff --git a/_storage/amazon-s3-deploy.md b/_storage/amazon-s3-deploy.md
index 562653d2..8aad6c75 100644
--- a/_storage/amazon-s3-deploy.md
+++ b/_storage/amazon-s3-deploy.md
@@ -15,7 +15,7 @@ This teaches you how to run a Gaia hub on Amazon EC2. Amazon EC2 is an affordabl
This documentation is appropriate for advanced power users who are familiar with command line tools, ssh
, and basic editing configuration files.
-If you are planning on running an open-membership hub or an application-specific hub, see the section on Hub Operation.
+If you are planning on running an open-membership hub or an application-specific hub, see the section on Hub Operation.
diff --git a/_storage/digital-ocean-deploy.md b/_storage/digital-ocean-deploy.md
index e1fd3e9d..098aa8e5 100644
--- a/_storage/digital-ocean-deploy.md
+++ b/_storage/digital-ocean-deploy.md
@@ -17,7 +17,7 @@ DigitalOcean provides you with a compute machines known as a **Droplets** and s
This documentation is appropriate for advanced power users who are familiar with command line tools, editing configuration files, and basic configuration of services of DNS or Nginx.
-If you are planning on running an open-membership hub or an application-specific hub, you'll should see the section on Hub Operation
.
+If you are planning on running an open-membership hub or an application-specific hub, you'll should see the section on Hub Operation
.
diff --git a/assets/css/main.scss b/assets/css/main.scss
index 68c0b1e3..24ca8435 100644
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@@ -49,3 +49,6 @@ body > div.uk-lightbox.uk-overflow-hidden.uk-lightbox-panel.uk-open > div.uk-lig
}
+.uk-table th {
+ vertical-align: top !important;
+}
\ No newline at end of file