Fixed conflict.

Author: Bosch-0

Gemfile.lock

@@ -82,15 +82,15 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -99,7 +99,7 @@ GEM
       forwardable-extended (~> 2.6)
     progress (3.6.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)

_compress_images_cache.yml

@@ -1659,6 +1659,8 @@ assets/images/guide/payments/activity/activity-bad-example.png: activity-bad-exa
 assets/images/guide/payments/activity/[email protected]: [email protected]
 assets/images/guide/payments/send/enter-pin-before-payment.png: enter-pin-before-payment.png
 assets/images/guide/payments/send/[email protected]: [email protected]
+assets/images/guide/payments/send/offline-error.png: offline-error.png
+assets/images/guide/payments/send/[email protected]: [email protected]
 assets/images/guide/payments/request/long-expiry.png: long-expiry.png
 assets/images/guide/payments/request/[email protected]: [email protected]
 assets/images/guide/payments/request/single-use-payment-request.png: single-use-payment-request.png

assets/images/guide/payments/send/offline-error.png

@@ -77,6 +77,9 @@ imagesErrors:
     - file: generic-error-details
       alt: A screen showing error details
       caption: Access to error details for problem-solving.
+    - file: offline-error
+      alt: A screen showing error details
+      caption: If the receiving Lightning wallet is offline, let the user know how to address this problem.
 imagesReview:
     - file: confirm
       alt: Invoice approval screen
@@ -114,9 +117,19 @@ layout = "full-width"
 %}
 
 # Sending bitcoin
+{:.no_toc}
 
 Sending bitcoin is one of the most essential user activities in a bitcoin application, and also one of the least structured ones. People may want to send bitcoin to a known contact, transfer it to another wallet on a different device, or make a purchase via a [payment processor]({{ '/guide/getting-started/software/#payment-processors' | relative_url }}).
 
+---
+
+<div class="glossary-toc" markdown="1">
+* Table of contents
+{:toc}
+</div>
+
+---
+
 ## Payment entry points
 
 The need to send bitcoin can be triggered by many different use cases, and initiated by both sender and receiver. Common entry points are: