diff --git a/README.md b/README.md
index 4a800ec2e..bb733f2ae 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ The process to create the guide started in the summer of 2020. The first draft o
On June 2, 2021, the community [announced](https://bitcoindesign.medium.com/announcing-the-bitcoin-design-guide-c4955d859fda) the launch of the initial version of the Bitcoin Design Guide to the public.
-On February 9, 2022, the community [announced](https://bitcoindesign.medium.com/design-better-lightning-wallets-with-the-bitcoin-design-guide-v2-2669f610ebc7) the completion of a major revision of the guide to include content about the Lightning network.
+On February 9, 2022, the community [announced](https://bitcoindesign.medium.com/design-better-lightning-wallets-with-the-bitcoin-design-guide-v2-2669f610ebc7) the completion of a major revision of the guide to include content about the Lightning Network.
See the [roadmap](https://github.com/orgs/BitcoinDesign/projects/2) for what we're currently working on.
diff --git a/guide/daily-spending-wallet/activity.md b/guide/daily-spending-wallet/activity.md
index 682092a4b..9216e186c 100644
--- a/guide/daily-spending-wallet/activity.md
+++ b/guide/daily-spending-wallet/activity.md
@@ -138,7 +138,7 @@ Wallets can also independently keep an eye on user funds, data traffic, and othe
### Smart organization
-The Lightning network makes micropayments economically and technically viable. For example, as a user listens to a podcast, they may stream 10 sats per minute to the host as a thank you. This can easily result in a cluttered activity list, which can be remedied via automatic grouping.
+The Lightning Network makes micropayments economically and technically viable. For example, as a user listens to a podcast, they may stream 10 sats per minute to the host as a thank you. This can easily result in a cluttered activity list, which can be remedied via automatic grouping.
{% include image-gallery.html pages = page.imagesGrouping %}
diff --git a/guide/daily-spending-wallet/backup-and-recovery/recovery.md b/guide/daily-spending-wallet/backup-and-recovery/recovery.md
index 57b50899d..037c3d548 100644
--- a/guide/daily-spending-wallet/backup-and-recovery/recovery.md
+++ b/guide/daily-spending-wallet/backup-and-recovery/recovery.md
@@ -37,7 +37,7 @@ Illustration sources:
There are several reasons why a user might need to restore their bitcoin wallet. They may have lost their device, be migrating from a different application or have deleted their wallet application. Regardless of why, it’s important that your wallet application has an easy way for users to recover their funds.
-However, not all wallets from one application can be recovered in another, depending on what standards they support, as covered in the [wallet interoperability]({{ 'guide/designing-products/interoperability' | relative_url }}) section. Lack of interoperability and vendor dependance is an issue for wallets holding bitcoin on the Lightning network. Lightning network wallets can currently only be restored in the application originally used. It's also worth noting that restoring from a [recovery phrase]({{ '/guide/glossary/#recovery-phrase' | relative_url }}) only restores the private keys, but no user data like transaction notes, [contacts]({{ '/guide/daily-spending-wallet/contacts/' | relative_url }}) etc.
+However, not all wallets from one application can be recovered in another, depending on what standards they support, as covered in the [wallet interoperability]({{ 'guide/designing-products/interoperability' | relative_url }}) section. Lack of interoperability and vendor dependance is an issue for wallets holding bitcoin on the Lightning Network. Lightning Network wallets can currently only be restored in the application originally used. It's also worth noting that restoring from a [recovery phrase]({{ '/guide/glossary/#recovery-phrase' | relative_url }}) only restores the private keys, but no user data like transaction notes, [contacts]({{ '/guide/daily-spending-wallet/contacts/' | relative_url }}) etc.
{% include picture.html
image = "/assets/images/guide/daily-spending-wallet/backup-and-recovery/recovery/import-options.png"
@@ -63,9 +63,9 @@ Users may have created a wallet with another wallet application. In this case, t
Some applications also provide an option for users to scan an encrypted proprietary QR code version of their recovery phrase. For a more detailed explanation of this recovery technique, check out this [blog post](https://blog.keys.casa/product-update-transaction-memos-encrypted-backups/) by Casa.
-### Restore a wallet with funds on the Lightning network
+### Restore a wallet with funds on the Lightning Network
-To fully restore a wallet with funds on the [Lightning network]({{ '/guide/getting-started/technology-primer/#the-lightning-payment-network' | relative_url }}), the state and history of the payment channels are needed in addition to the recovery phrase. As there are no standards for this yet, wallet applications need to have their own format for backing this up, and subsequently restoring. Due to the amount of information, a QR code of the encrypted data, like in the previous example, can be appropriate.
+To fully restore a wallet with funds on the [Lightning Network]({{ '/guide/getting-started/technology-primer/#the-lightning-payment-network' | relative_url }}), the state and history of the payment channels are needed in addition to the recovery phrase. As there are no standards for this yet, wallet applications need to have their own format for backing this up, and subsequently restoring. Due to the amount of information, a QR code of the encrypted data, like in the previous example, can be appropriate.
{% include tip/recommendation.html %}
diff --git a/guide/daily-spending-wallet/first-use.md b/guide/daily-spending-wallet/first-use.md
index 000df4a1f..5c4689b93 100644
--- a/guide/daily-spending-wallet/first-use.md
+++ b/guide/daily-spending-wallet/first-use.md
@@ -82,7 +82,7 @@ Wallet creation during onboarding is an excellent opportunity to educate your us
While this may sound daunting to first-time users, these caveats mustn't be hidden. Doing so may severely compromise their funds' safety, as their default assumptions and behaviors could potentially mimic how they typically use centralized applications (for example, feeling like it is OK if they forget their account information because they can contact customer support to help them recover it).
-Ideally your application supports both the base layer and the Lightning network. When talking about backups, you should be clear on what is possible and required in terms of restoring the user’s wallet from a backup.
+Ideally your application supports both the base layer and the Lightning Network. When talking about backups, you should be clear on what is possible and required in terms of restoring the user’s wallet from a backup.
Some studies suggest that users struggled greatly with technical terminology and feeling as though they had a lack of guidance during wallet setup. By walking users through single steps that clearly frame the features of self-custodial bitcoin wallets, users will feel well-equipped to navigate and use the wallet confidently.
diff --git a/guide/daily-spending-wallet/privacy.md b/guide/daily-spending-wallet/privacy.md
index 70b834170..b711578df 100644
--- a/guide/daily-spending-wallet/privacy.md
+++ b/guide/daily-spending-wallet/privacy.md
@@ -47,7 +47,7 @@ This page should inform about what information is made public when sending or re
It’s a common misconception that bitcoin payments are anonymous. Rather, bitcoin payments are [pseudonymous](https://en.wikipedia.org/wiki/Pseudonym), meaning no identifiable information is tied to transactions. Unless ownership is revealed, whether by the parties involved or some third-party, payments remain anonymous.
-It is important to differentiate between bitcoin and Lightning network privacy. Their differences in technical architecture result in different privacy considerations.
+It is important to differentiate between bitcoin and Lightning Network privacy. Their differences in technical architecture result in different privacy considerations.
Transactions, their signatures, and addresses added to the bitcoin blockchain remain public forever. This means that looking up any address or transaction is trivial, as demonstrated by going back to the very first block mined on [January 3, 2009](https://blockstream.info/tx/4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b). The key to keeping your transactions private is to prevent others from determining which addresses you own[^1]. Since [Satoshi](https://en.wikipedia.org/wiki/Satoshi_Nakamoto) let others know that they had mined the first block, which contained a single transaction, one can deduce that both the address that received the block reward and the sender address in the transaction belongs to Satoshi. This illustrates the permanence of associations between addresses and identity. While it’s possible to break assumptions of ownership going forward, the challenge is to recover privacy once an association is made public. That being said, in this case the pseudonym “Satoshi Nakamoto” has yet to be associated with any personal identity.
@@ -55,7 +55,7 @@ Transactions, their signatures, and addresses added to the bitcoin blockchain re
>
> As documented by Wasabi Wallet
-On the Lightning network, a payment is only stored by the respective sender and receiver, and only as long as the channel in which the payment was made is open. However, opening and closing channels requires entries on the bitcoin blockchain, and those are also publicly stored forever. Additionally, Lightning nodes are always online and usually directly tied to a single wallet, providing another data point. For a detailed analysis of privacy on Lighting, see the [Security and privacy chapter](https://github.com/lnbook/lnbook/blob/develop/16_security_privacy_ln.asciidoc) in the Mastering the Lightning Network book.
+On the Lightning Network, a payment is only stored by the respective sender and receiver, and only as long as the channel in which the payment was made is open. However, opening and closing channels requires entries on the bitcoin blockchain, and those are also publicly stored forever. Additionally, Lightning nodes are always online and usually directly tied to a single wallet, providing another data point. For a detailed analysis of privacy on Lighting, see the [Security and privacy chapter](https://github.com/lnbook/lnbook/blob/develop/16_security_privacy_ln.asciidoc) in the Mastering the Lightning Network book.
These are just some of the interactions through which we leave traces of data that diligent observers can connect and build user profiles around. For the rest of this page, we focus on what product builders and users can do to improve their payment privacy.
diff --git a/guide/daily-spending-wallet/requesting.md b/guide/daily-spending-wallet/requesting.md
index 850caae45..376f8dc7a 100644
--- a/guide/daily-spending-wallet/requesting.md
+++ b/guide/daily-spending-wallet/requesting.md
@@ -213,7 +213,7 @@ Currently there are limited reusable payment request options available. However,
### Lightning address
-[Lightning addresses](https://lightningaddress.com/), which look like regular emails (jane@domain.com), are reusable ways users can receive Lightning payments. These are not native to the Lightning network itself, but rather offered by a trusted server often ran by the wallet provider.
+[Lightning addresses](https://lightningaddress.com/), which look like regular emails (jane@domain.com), are reusable ways users can receive Lightning payments. These are not native to the Lightning Network itself, but rather offered by a trusted server often ran by the wallet provider.
Generating a Lightning address should be simple for users and done within a profile page or during the users [first use]({{ "/guide/daily-spending-wallet/first-use/" | relative_url }}). At a minimum, your wallet should support sending to Lightning addresses, so it's interoperable with other wallets.
@@ -271,7 +271,7 @@ If a sender supports Keysends they can make recurring payments with attached mes
Having the option to quickly generate a personalised QR code of your node ID from the home screen is recommended.
-This form of reusable payment request is not widely supported but offer a unique, way for users to make payments, tip users, and send messages over the Lightning network.
+This form of reusable payment request is not widely supported but offer a unique, way for users to make payments, tip users, and send messages over the Lightning Network.
diff --git a/guide/daily-spending-wallet/security.md b/guide/daily-spending-wallet/security.md
index 0f6dbcbd4..90719bf9d 100644
--- a/guide/daily-spending-wallet/security.md
+++ b/guide/daily-spending-wallet/security.md
@@ -13,7 +13,7 @@ image_base: /assets/images/guide/daily-spending-wallet/security/
images_watchtower:
- file: lightning-network-settings
alt:
- caption: A sample settings page for the lightning network.
+ caption: A sample settings page for the Lightning Network.
- file: watchtower-details
alt:
caption: Here, a default watchtower service is chosen.
diff --git a/guide/daily-spending-wallet/sending.md b/guide/daily-spending-wallet/sending.md
index 33db561fb..14f177e9c 100644
--- a/guide/daily-spending-wallet/sending.md
+++ b/guide/daily-spending-wallet/sending.md
@@ -210,7 +210,7 @@ Payment fees can drastically differ based on a few attributes:
**Lightning routing fees**
-On the Lightning network, payments are passed between nodes to get from the sender to the receiver. Each of those nodes may charge a base fee and a second fee based on a percentage of the amount forwarded. Fees paid can vary, but are typically in the single-digit or double-digit Satoshi range (a small fraction of on-chain fees).
+On the Lightning Network, payments are passed between nodes to get from the sender to the receiver. Each of those nodes may charge a base fee and a second fee based on a percentage of the amount forwarded. Fees paid can vary, but are typically in the single-digit or double-digit Satoshi range (a small fraction of on-chain fees).
**Lightning service fees**
@@ -254,7 +254,7 @@ If using a security step here, it should come after the user has selected all ot
## Transaction processing
-Processing times may also differ between on-chain and Lightning network payments. On-chain, pending transactions are bundled into a [new block]({{ '/guide/getting-started/technology-primer/#what-is-a-blockchain' | relative_url }}) roughly every 10 minutes. On the Lightning network, [payment routing]({{ '/guide/getting-started/technology-primer/#how-are-payments-routed' | relative_url }}) happens instantly and is largely dependent on the number of nodes involved, as well as their liquidity and processing speeds.
+Processing times may also differ between on-chain and Lightning Network payments. On-chain, pending transactions are bundled into a [new block]({{ '/guide/getting-started/technology-primer/#what-is-a-blockchain' | relative_url }}) roughly every 10 minutes. On the Lightning Network, [payment routing]({{ '/guide/getting-started/technology-primer/#how-are-payments-routed' | relative_url }}) happens instantly and is largely dependent on the number of nodes involved, as well as their liquidity and processing speeds.
When transactions take longer than expected, users need to be clearly informed about the status. In scenarios like in-store payments, speedy confirmation is of the essence, as the user wants to move on, and the merchant may have other customers waiting. In-app status updates can be coupled with notifications to ensure that both parties are confident that everything is in order. For a framework on timing, see [this article on response time limits](https://www.nngroup.com/articles/response-times-3-important-limits/).
@@ -305,7 +305,7 @@ It is ideal when the application can automatically identify and fix or avoid the
Effectively supporting users when problems occur can build trust and confidence, and essential aspect for financial applications.
-### Encouraging lightning network
+### Encouraging Lightning Network
Lightning is likely to be the best option for the majority of payments a user makes. It will be faster, more private, and cost less. An ideal scenario would be where the user does not spend time considering whether to pay on-chain or Lightning — it's all bitcoin to them.
diff --git a/guide/designing-products/common-user-flows.md b/guide/designing-products/common-user-flows.md
index a68c76111..b7bce3753 100644
--- a/guide/designing-products/common-user-flows.md
+++ b/guide/designing-products/common-user-flows.md
@@ -259,7 +259,7 @@ A good starting point today is an [HD wallet](/guide/glossary/wallet/#hd-wallet)
Some older software may create wallets with outdated technical formats, while others allow users to choose specific formats for their particular needs. Generally, this is difficult to understand for regular users and should either be automatically handled with good default settings, or explained in layman's terms. [Wallets Recovery](https://walletsrecovery.org) provides a great overview of different implementations and how nuanced some of the differences are.
-Most modern wallet applications should aim to support the Lightning network in addition to the base layer. While there are different options for how the applications interact with a Lightning network node, an HD wallet works fine for storing the required keys.
+Most modern wallet applications should aim to support the Lightning Network in addition to the base layer. While there are different options for how the applications interact with a Lightning Network node, an HD wallet works fine for storing the required keys.
Wallets can also be created with control shared between several other wallets, so called [multi-key wallets](/guide/private-key-management/multi-key/) (or multi-signature / multi-sig). This is typically done to increase security.
@@ -342,11 +342,11 @@ While we all prefer to receive bitcoin, there are times when we need to send the
-Bitcoin can be sent two ways; on the primary base layer, or the secondary [Lightning network](/guide/glossary/#lightning-network) layer.
+Bitcoin can be sent two ways; on the primary base layer, or the secondary [Lightning Network](/guide/glossary/#lightning-network) layer.
On the base layer, once a transaction is broadcast from a wallet, the bitcoin network starts processing it. Users may want to stay informed about this progress, particularly when a transaction takes longer than expected. The average transaction time on the base layer is 10 minutes, but this can vary a lot depending on the fee the sender was willing to pay. In extreme cases, it is possible to retroactively increase the transaction fee to get validated faster with a [Replace-by-Fee](/guide/glossary/#replace-by-fee-rbf) technique.
-On the Lightning network, transactions happen inside payment channels that are established on the base layer between two participants. The state of ownership of the bitcoin within the channel is maintained by the participant Lightning network nodes. Transactions on this layer are almost instant, and have negligible fees. However, there are fees to open and close channels, as this is recorded on the base layer.
+On the Lightning Network, transactions happen inside payment channels that are established on the base layer between two participants. The state of ownership of the bitcoin within the channel is maintained by the participant Lightning Network nodes. Transactions on this layer are almost instant, and have negligible fees. However, there are fees to open and close channels, as this is recorded on the base layer.
To find out more, visit the [Sending bitcoin](/guide/payments/send/) page.
@@ -396,7 +396,7 @@ While it is possible to re-use the same receiving address repeatedly, this pract
For more information-rich base layer requests, [BIP 21](https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki) describes a URI scheme to turn requests into links that can be shared like any other link. On click, wallets that support this scheme can immediately show the send screen with the correct information pre-filled. Links can also be encoded and transmitted via QR code. Since the scheme also allows for the inclusion of an address label and transaction description, it allows both sender and recipient to stay organized.
-For requests on the Lightning network, the receiver needs to create a lightning invoice that includes the amount, and then share the invoice with the sender.
+For requests on the Lightning Network, the receiver needs to create a lightning invoice that includes the amount, and then share the invoice with the sender.
## Receiving bitcoin
@@ -427,7 +427,7 @@ Once a user has requested payment, they are naturally interested in knowing when
A user may also want to check in and see if any previous requests have not been completed yet. This is easily possible if the user has initiated all requests on the same wallet and used a new address for each one. In this case, a request can be considered fulfilled if at least one payment has been received with the total amount the user asked for. It is not as clear if addresses are getting re-used (how to tell which payment was for which purpose?) or the request has been made with another wallet (as this metadata is not stored and synced via the bitcoin network).
-On the Lightning network, receiving bitcoin requires an invoice. This makes it easy to track if payments have been completed or not.
+On the Lightning Network, receiving bitcoin requires an invoice. This makes it easy to track if payments have been completed or not.
@@ -472,7 +472,7 @@ The owner may want to increase the security of their wallet, either by using a s
In the worst-case scenario, the wallet might have been compromised, and funds should be saved by sending them all to a different bitcoin wallet.
-Whatever the reason, the import and backup of wallets is a vital function for users that applications should support. While it is easy to send all funds to a new address, additional meta and state data stored in wallet applications also need to be considered for full compatibility. It's not recommended to switch wallets that include funds on the Lightning network, as standards for backing up channel state have yet to emerge. See also, [Wallet interoperability](/guide/designing-products/interoperability/).
+Whatever the reason, the import and backup of wallets is a vital function for users that applications should support. While it is easy to send all funds to a new address, additional meta and state data stored in wallet applications also need to be considered for full compatibility. It's not recommended to switch wallets that include funds on the Lightning Network, as standards for backing up channel state have yet to emerge. See also, [Wallet interoperability](/guide/designing-products/interoperability/).
diff --git a/guide/designing-products/getting-to-know-your-users.md b/guide/designing-products/getting-to-know-your-users.md
index 1d9144a83..763ba8230 100644
--- a/guide/designing-products/getting-to-know-your-users.md
+++ b/guide/designing-products/getting-to-know-your-users.md
@@ -40,7 +40,7 @@ When building bitcoin applications, it is important to understand and develop kn
This observation could take the form of [user research]({{ 'guide/designing-products/user-research/' | relative_url }}), user interviews and surveys aimed at a range of participants to observe and identify what they do, how they think, and what they want. Let’s consider some things you might want to ask yourself when improving the experience for new users:
-* [What is their perception of bitcoin?](https://docs.google.com/forms/d/e/1FAIpQLSdzT8cb54NgT7hGUnC_5ow6rDy-A9p_CA-5ptiQxrG8wQWvzQ/viewform)
+* What is their perception of bitcoin?
* Why do they intend to use bitcoin, investment, savings or spending?
* Where do they prefer to store most of their value, mobile or desktop wallets?
* Where do they experience frustration?
diff --git a/guide/designing-products/interoperability.md b/guide/designing-products/interoperability.md
index 3613841b0..4a35ed1ee 100644
--- a/guide/designing-products/interoperability.md
+++ b/guide/designing-products/interoperability.md
@@ -88,9 +88,9 @@ Wallet backups generated in one wallet application should be able to be easily r
Over the years, bitcoin wallets have implemented various features in different ways, partly because standards take time to evolve. Standards such as [BIP39 recovery phrases](/guide/glossary/#recovery-phrase) and [wallet descriptors](/guide/glossary/#output-script-descriptor) should be used to create wallet backups within your applications.
-Backing up payment channels that are part of the Lightning network can be more difficult. Currently, no standards exist for this, nor is it possible to have a static backup method like you can with on-chain bitcoin. Payment channels states regularly change and thus need to be regularly updated. Some applications make use of static-channel-backup (SCB) files, though this is still an evolving standard.
+Backing up payment channels that are part of the Lightning Network can be more difficult. Currently, no standards exist for this, nor is it possible to have a static backup method like you can with on-chain bitcoin. Payment channels states regularly change and thus need to be regularly updated. Some applications make use of static-channel-backup (SCB) files, though this is still an evolving standard.
-It should be convenient for users to back up the relevant information they need for recovery with other applications. An example solution is to provide a [printable template or downloadable PDF](https://www.figma.com/file/sJYnyi2amehFJ2JpDgj978/Bitcoin-Wallet---Paper-Backup-Template?node-id=1%3A535) with the wallet name, software name and version, address type, wallet descriptors, and other non-standard information. If your application makes use of the Lightning network this could be done in conjunction with regular, encrypted SCB cloud backups.
+It should be convenient for users to back up the relevant information they need for recovery with other applications. An example solution is to provide a [printable template or downloadable PDF](https://www.figma.com/file/sJYnyi2amehFJ2JpDgj978/Bitcoin-Wallet---Paper-Backup-Template?node-id=1%3A535) with the wallet name, software name and version, address type, wallet descriptors, and other non-standard information. If your application makes use of the Lightning Network this could be done in conjunction with regular, encrypted SCB cloud backups.
@@ -189,11 +189,11 @@ Although every application will have its own unique interface, there are certain
layout = "float-right-desktop"
%}
-Connecting to the bitcoin or Lightning network should be as trust-minimized and privacy preserving as possible. While it is convenient when applications provide their own node connection, it is beneficial to allow users to connect to a trusted node or their own self-hosted bitcoin or Lightning node.
+Connecting to the bitcoin or Lightning Network should be as trust-minimized and privacy preserving as possible. While it is convenient when applications provide their own node connection, it is beneficial to allow users to connect to a trusted node or their own self-hosted bitcoin or Lightning node.
Having the option to choose how that data is queried, say using [Neutrino over SPV](https://bitcoin.design/guide/glossary/node/#light-nodes), should also be an option. This results in better network [decentralization](https://bitcoin.design/guide/getting-started/principles/#decentralization), and has privacy and [security](https://bitcoin.design/guide/getting-started/principles/#security) benefits for users.
-If your application uses the Lightning network, users should be running their own Lightning node. However, there are certain aspects of a Lightning node that can be outsourced, such as creating inbound liquidity from an LSP or constructing payment paths.
+If your application uses the Lightning Network, users should be running their own Lightning node. However, there are certain aspects of a Lightning node that can be outsourced, such as creating inbound liquidity from an LSP or constructing payment paths.
Your application should give users options as to which services (if any) they want to trust a third party to conduct. Your application should try to avoid having users locked into your application and give them various options for outsourcing Lightning services.
diff --git a/guide/designing-products/personal-finance.md b/guide/designing-products/personal-finance.md
index 1ae8a5269..b3c1e8a94 100644
--- a/guide/designing-products/personal-finance.md
+++ b/guide/designing-products/personal-finance.md
@@ -99,7 +99,7 @@ For small, frequent payments, we generally accept greater risk in exchange for c
Most stores (online and offline) don’t currently accept bitcoin. When they do, users who already pay with smartphones or NFC-enabled credit cards can easily transition to bitcoin apps.
-A typical scenario could be that users create dedicated mobile bitcoin wallets for on-the-go payments, in addition to having separate wallets for larger amounts. Similar to having a bank account and regularly taking out cash at an ATM, users could refill their mobile wallets. The mobile wallet is connected to the Lightning network, which allows the user to make very fast (almost instant) payments. This wallet may use [automatic cloud backup]({{ '/guide/how-it-works/private-key-management/cloud-backup/' | relative_url }}) for the private key as well as the lightning channel state. The user's primary wallet however, would be more strongly secured with a [hardware wallet]({% link guide/getting-started/hardware.md %}#hardware-wallets) or even a [multi-key]({{ '/guide/how-it-works/private-key-management/multi-key/' | relative_url }}) configuration. This would mirror the primary focus of convenience over security. Beyond key management, payment interactions could be identical to what users are already familiar with.
+A typical scenario could be that users create dedicated mobile bitcoin wallets for on-the-go payments, in addition to having separate wallets for larger amounts. Similar to having a bank account and regularly taking out cash at an ATM, users could refill their mobile wallets. The mobile wallet is connected to the Lightning Network, which allows the user to make very fast (almost instant) payments. This wallet may use [automatic cloud backup]({{ '/guide/how-it-works/private-key-management/cloud-backup/' | relative_url }}) for the private key as well as the lightning channel state. The user's primary wallet however, would be more strongly secured with a [hardware wallet]({% link guide/getting-started/hardware.md %}#hardware-wallets) or even a [multi-key]({{ '/guide/how-it-works/private-key-management/multi-key/' | relative_url }}) configuration. This would mirror the primary focus of convenience over security. Beyond key management, payment interactions could be identical to what users are already familiar with.
For more on this use case, see the [daily spending reference design]({{ '/guide/daily-spending-wallet' | relative_url }}).
@@ -138,7 +138,7 @@ The higher-value of these payments necessitates a greater level of security than
At the moment, a good solution is a desktop application which relies on a hardware device to sign transactions. This reduces the risk of keeping funds on a mobile wallet configuration but adds acceptable friction for transactions that occur less frequently. See the [savings wallet reference design]({{ '/guide/savings-wallet/' | relative_url }}) for an exploration of this user experience.
-A disadvantage to this solution is that it does not use the Lightning network, meaning that the user will need to wait longer for their [transaction to confirm]({{'/guide/how-it-works/transactions/#7-confirmations' | relative_url}}) as well as pay an on-chain transaction fee. However, this will likely not always be the case: in the future, projects such as [Lightning Signer](https://gitlab.com/lightning-signer/docs) may solve this issue by allowing the private keys to be stored separately from the Lightning node on hardware that is security-hardened.
+A disadvantage to this solution is that it does not use the Lightning Network, meaning that the user will need to wait longer for their [transaction to confirm]({{'/guide/how-it-works/transactions/#7-confirmations' | relative_url}}) as well as pay an on-chain transaction fee. However, this will likely not always be the case: in the future, projects such as [Lightning Signer](https://gitlab.com/lightning-signer/docs) may solve this issue by allowing the private keys to be stored separately from the Lightning node on hardware that is security-hardened.
## Emergency funds
diff --git a/guide/designing-products/units-and-symbols.md b/guide/designing-products/units-and-symbols.md
index ca8bb43f5..b32864b95 100644
--- a/guide/designing-products/units-and-symbols.md
+++ b/guide/designing-products/units-and-symbols.md
@@ -73,7 +73,7 @@ Bitcoin, bits, sats. The format and presentation of bitcoin values are probably
## Current adoption
-Bitcoin is most commonly expressed as BTC (bitcoin) or sat (satoshi), with 1 bitcoin being 100 million satoshi. The unicode symbol ₿, formalized in June 2017, is also used to represent BTC (bitcoin), but typeface support is still limited. While not as common, other denominations of BTC such as mBTC (millibitcoins), μBTC (bits), as well as msat (millisatoshi) in the Lightning network are sometimes used. The chart below illustrates how each unit relates to the bitcoin unit.
+Bitcoin is most commonly expressed as BTC (bitcoin) or sat (satoshi), with 1 bitcoin being 100 million satoshi. The unicode symbol ₿, formalized in June 2017, is also used to represent BTC (bitcoin), but typeface support is still limited. While not as common, other denominations of BTC such as mBTC (millibitcoins), μBTC (bits), as well as msat (millisatoshi) in the Lightning Network are sometimes used. The chart below illustrates how each unit relates to the bitcoin unit.
| Unit | Symbol | Bitcoin value |
| ------------ | ------------ | ----------------- |
diff --git a/guide/designing-products/user-research.md b/guide/designing-products/user-research.md
index badec6866..690f40492 100644
--- a/guide/designing-products/user-research.md
+++ b/guide/designing-products/user-research.md
@@ -117,9 +117,9 @@ Bitcoin only knows its users through pseudonymous addresses. We can analyze on-c
Bitcoin is a protocol with [layers](https://bitcoin.design/guide/getting-started/technology-primer/#do-all-transactions-have-to-be-this-secure) built on top of it.
-The base layer is a public record of transactions that can easily be analyzed. However, layers built on top, such as [Lightning network](/guide/getting-started/technology-primer/#the-lightning-payment-network) make analysis of specific transaction impossible, thanks to [payment channels](/guide/getting-started/technology-primer/#what-is-a-payment-channel).
+The base layer is a public record of transactions that can easily be analyzed. However, layers built on top, such as [Lightning Network](/guide/getting-started/technology-primer/#the-lightning-payment-network) make analysis of specific transaction impossible, thanks to [payment channels](/guide/getting-started/technology-primer/#what-is-a-payment-channel).
-While we often can’t know who is responsible for a specific transaction, on the Lightning network, we can attempt to analyze the overall network activity and look into metrics such as number of nodes, network capacity, payment channels changes.
+While we often can’t know who is responsible for a specific transaction, on the Lightning Network, we can attempt to analyze the overall network activity and look into metrics such as number of nodes, network capacity, payment channels changes.
No other currency in history has offered such a transparent way to analyze network activity. As designers, what can we learn from this data that allows us to improve the experience of our users.
diff --git a/guide/getting-started/hardware.md b/guide/getting-started/hardware.md
index 97cb1bffb..bea536895 100644
--- a/guide/getting-started/hardware.md
+++ b/guide/getting-started/hardware.md
@@ -79,11 +79,11 @@ You may already be familiar with physical security keys from your bank or work.
Bitcoin hardware wallets, also called signers, act like bitcoin-centric security keys. They isolate the recovery phrase, private keys, and other sensitive data like output descriptors from the internet and other devices.
-Hardware wallets only exchange non-sensitive information with external devices. Sensitive processes happen on the device, such as signing a transaction to open a Lightning network payment channel. Most interactions with hardware wallets happen via desktop [software, like wallets]({{ '/guide/getting-started/software/#wallets' | relative_url }}).
+Hardware wallets only exchange non-sensitive information with external devices. Sensitive processes happen on the device, such as signing a transaction to open a Lightning Network payment channel. Most interactions with hardware wallets happen via desktop [software, like wallets]({{ '/guide/getting-started/software/#wallets' | relative_url }}).
## Nodes
-A node is a device that participates in a network. There are two types of nodes to understand: A bitcoin node that participates in the bitcoin network and a Lightning node that participates in the Lightning network. For a deeper dive into what purpose these nodes serve check out the [technology primer]({{ '/guide/getting-started/technology-primer/' | relative_url }}).
+A node is a device that participates in a network. There are two types of nodes to understand: A bitcoin node that participates in the bitcoin network and a Lightning node that participates in the Lightning Network. For a deeper dive into what purpose these nodes serve check out the [technology primer]({{ '/guide/getting-started/technology-primer/' | relative_url }}).
{% include picture.html
image = "/assets/images/guide/getting-started/hardware/node-hardware.jpg"
@@ -139,7 +139,7 @@ Bitcoin Automated Teller Machines (ATM) are a convenient way to buy or sell bitc
Much like traditional ATMs, bitcoin ATMs allow the deposit and withdrawal of money. Bitcoin ATMs, however allow someone to deposit fiat currencies in exchange for bitcoin.
-Modern bitcoin ATMs take advantage of the bitcoin Lightning network. This enables almost instant withdrawals and cheaper fees, making the purchase experience more friendly and cost-effective.
+Modern bitcoin ATMs take advantage of the bitcoin Lightning Network. This enables almost instant withdrawals and cheaper fees, making the purchase experience more friendly and cost-effective.
Bitcoin ATMs are usually bound to local money transmission laws and regulations, such as Know Your Customer (KYC) and Anti-Money Laundering (AML) regulations. More on [Wikipedia](https://en.wikipedia.org/wiki/Bitcoin_ATM).
@@ -147,7 +147,7 @@ You can find local ATMs using services like [coinatmradar](https://coinatmradar.
## Point of sale
-People looking to accept bitcoin payments, especially when using the lightning network, sometimes use dedicated point of sale (POS) hardware terminals when selling goods and services.
+People looking to accept bitcoin payments, especially when using the Lightning Network, sometimes use dedicated point of sale (POS) hardware terminals when selling goods and services.
{% include picture.html
image = "/assets/images/guide/getting-started/hardware/point-of-sale.jpg"
diff --git a/guide/getting-started/principles.md b/guide/getting-started/principles.md
index ae8ea349c..70ad29227 100644
--- a/guide/getting-started/principles.md
+++ b/guide/getting-started/principles.md
@@ -255,7 +255,7 @@ The bitcoin network doesn’t need to know your name for you to use it. Strive t
**Do**
- Minimize the personal information you collect
-- Encourage usage of the Lightning network for improved privacy
+- Encourage usage of the Lightning Network for improved privacy
- Avoid address reuse
- Embrace privacy-preserving options when relevant (running a full node, compact block filters, Tor, coin selection, schnorr signatures, payjoin, coinswap, etc.)
diff --git a/guide/getting-started/software.md b/guide/getting-started/software.md
index 15f43e478..62028f4f1 100644
--- a/guide/getting-started/software.md
+++ b/guide/getting-started/software.md
@@ -57,7 +57,7 @@ Wallets are perhaps the most important bitcoin applications. They provide easy-t
Wallet features vary by application but always include [wallet setup]({{ '/guide/designing-products/common-user-flows/#software-onboarding' | relative_url }}), balance and transaction records, and the ability to [send]({{ '/guide/payments/send/' | relative_url }}) and [receive]({{ '/guide/payments/request/' | relative_url }}) bitcoin. The full range of features that wallets may support is broad and includes security and [privacy]({{ '/guide/payments/privacy/' | relative_url }}) options, currency exchange features, accounting tools, [interoperability]({{ '/guide/getting-started/principles/#interoperability' | relative_url }}), accessibility, and localization options.
Few wallets support the full range of features. The reasons for this can vary from; standards not being available when the wallet was first developed (newer [address formats]({{ '/guide/glossary/address/' | relative_url }}) or [HD wallets]({{ '/guide/glossary/wallet/#hd-wallet' | relative_url }}) for example), the choice to not include anything that implies trusting a third party, or simply because it does not fit the intended use case for the software.
-The features you include should be based on the needs of your users. Try to maximize interoperability with other bitcoin products by supporting modern standards and emerging technologies. For example, a wallet project started today should almost certainly support the Lightning network.
+The features you include should be based on the needs of your users. Try to maximize interoperability with other bitcoin products by supporting modern standards and emerging technologies. For example, a wallet project started today should almost certainly support the Lightning Network.
Due to bitcoin’s open-source nature, anyone with the technical skills can develop a bitcoin wallet. Many code libraries are available to simplify this task.
@@ -67,7 +67,7 @@ Due to bitcoin’s open-source nature, anyone with the technical skills can deve
-Exchanges let users swap between currencies and networks (for example USD to bitcoin, or from the base layer to the Lightning network). They typically fall into three general categories.
+Exchanges let users swap between currencies and networks (for example USD to bitcoin, or from the base layer to the Lightning Network). They typically fall into three general categories.
{% include image.html
@@ -94,13 +94,13 @@ If the blockchain is a public database, explorers are simply windows into that d
For bitcoin, block explorers let users view transaction data, latest blocks, block height, etc. They also provide insight into bigger picture activity on the bitcoin network, such as daily transaction numbers. For example, there are typically fewer transactions on weekends, resulting in lower fees, ideal for low-priority transactions.
-As transactions in Lightning payment channels are not recorded on the blockchain, there are also Lightning network explorers. These let you see public information about the nodes and the network, such as channel count, capacity and status. Only participant nodes can look up specific transaction information in a channel.
+As transactions in Lightning payment channels are not recorded on the blockchain, there are also Lightning Network explorers. These let you see public information about the nodes and the network, such as channel count, capacity and status. Only participant nodes can look up specific transaction information in a channel.
{% include image.html
image = "/assets/images/guide/getting-started/software/explorer-example.jpg"
retina = "/assets/images/guide/getting-started/software/explorer-example@2x.jpg"
alt-text = "Illustrative interface for block explorer software"
- caption = 'Explorers offer insight into activity on the bitcoin and Lightning networks. Texture by [Mike van den Bos](https://unsplash.com/@mike_van_den_bos){:target="_blank" rel="nofollow"} on [Unsplash](https://unsplash.com){:target="_blank" rel="nofollow"}.'
+ caption = 'Explorers offer insight into activity on the bitcoin and Lightning Networks. Texture by [Mike van den Bos](https://unsplash.com/@mike_van_den_bos){:target="_blank" rel="nofollow"} on [Unsplash](https://unsplash.com){:target="_blank" rel="nofollow"}.'
width = 800
height = 492
%}
@@ -139,7 +139,7 @@ Payment processing applications offer easy-to-use online stores and point-of-sal
Bitcoin [node]({{ '/guide/glossary/node/' | relative_url }}) software connects to and participates in the bitcoin network. Nodes typically download and broadcast user transactions, and optionally help verify blockchain data more broadly. Some wallet software comes with built-in node capabilities, such as [Bitcoin Core]({{ '/guide/glossary/#bitcoin-core-client' | relative_url }}), but most wallet software connects to external nodes. Learn more on the [Node page]({{ '/guide/glossary/node/' | relative_url }}) in the glossary.
-Lightning node software connects to and participates in the Lightning network, extending bitcoin with payment channels to increase transaction speed and lower costs. It is becoming widely adopted and accepted as the preferred way to scale bitcoin.
+Lightning node software connects to and participates in the Lightning Network, extending bitcoin with payment channels to increase transaction speed and lower costs. It is becoming widely adopted and accepted as the preferred way to scale bitcoin.
It’s common to use node management software separate from the node software itself. This simplifies the setup, management and monitoring of nodes by providing graphical user interfaces to interact with the lower level node software instead of CLIs.
@@ -176,7 +176,7 @@ Bitcoin [mining]({{ '/guide/getting-started/technology-primer/#how-is-the-blockc
Mining has become primarily a professional undertaking with dedicated software to manage racks of [mining hardware]({{ '/guide/getting-started/hardware/#mining-hardware' | relative_url }}). However, some wallets still offer mining features, and there are also cloud mining providers that allow customers to rent mining capacity.
-Mining does not exist for transactions on the Lightning network, so there is no equivalent software. However, opening and closing payment channels on Lightning involve transactions that need to be mined on the bitcoin network.
+Mining does not exist for transactions on the Lightning Network, so there is no equivalent software. However, opening and closing payment channels on Lightning involve transactions that need to be mined on the bitcoin network.
diff --git a/guide/getting-started/technology-primer.md b/guide/getting-started/technology-primer.md
index 01fcaac0a..fea85dd28 100644
--- a/guide/getting-started/technology-primer.md
+++ b/guide/getting-started/technology-primer.md
@@ -218,7 +218,7 @@ A payment channel is a [joint account]({{'/guide/glossary/#multi-signature-walle
layout = "float-right-desktop"
%}
-The Lightning network is a network of payment channels. Lightning nodes allow you to have multiple channels with different parties to route payments through. This new network forms a second layer on top of bitcoin. This has some privacy benefits, too: payment information is only recorded to the blockchain when the payment channel is opened and closed. Every payment that happens in between the opening and closing is not stored “on-chain”.
+The Lightning Network is a network of payment channels. Lightning nodes allow you to have multiple channels with different parties to route payments through. This new network forms a second layer on top of bitcoin. This has some privacy benefits, too: payment information is only recorded to the blockchain when the payment channel is opened and closed. Every payment that happens in between the opening and closing is not stored “on-chain”.
## What are ways to receive bitcoin?
@@ -254,7 +254,7 @@ To transfer bitcoin, the recipient needs to provide the sender with the destinat
To make a Lightning payment, you don't need to open a channel with everyone you transact with. Lightning nodes talk to one another and declare their payment channels. It's typical for nodes to have multiple channels to access different parts of the network for better routing. With an invoice, the sender finds a path to the receiver, and the payment hops from channel to channel until it reaches the destination.