Merge branch 'main' into repo-sync

Author: Octomerger

assets/images/help/writing/collapsed-section-view.png

@@ -10,6 +10,7 @@ versions:
   ghec: '*'
 children:
   - /organizing-information-with-tables
+  - /organizing-information-with-collapsed-sections
   - /creating-and-highlighting-code-blocks
   - /autolinked-references-and-urls
   - /attaching-files

assets/images/help/writing/open-collapsed-section.png

@@ -0,0 +1,42 @@
+---
+title: Organizing information with collapsed sections
+intro: 'You can streamline your Markdown by creating a collapsed section with the `<details>` tag.'
+versions:
+  fpt: '*'
+  ghes: '*'
+  ghae: '*'
+  ghec: '*'
+shortTitle: Collapsed sections
+---
+## Creating a collapsed section
+
+You can temporarily obscure sections of your Markdown by creating a collapsed section that the reader can choose to expand. For example, when you want to include technical details in an issue comment that may not be relevant or interesting to every reader, you can put those details in a collapsed section.
+
+Any Markdown within the `<details>` block will be collapsed until the reader clicks {% octicon "triangle-right" aria-label="The right triange icon" %} to expand the details. Within the `<details>` block, use the `<summary>` tag to create a label to the right of {% octicon "triangle-right" aria-label="The right triange icon" %}.
+
+```markdown
+<details><summary>CLICK ME</summary>
+<p>
+
+#### We can hide anything, even code!
+
+    ```ruby
+      puts "Hello World"
+    ```
+
+</p>
+</details>
+```
+
+The Markdown will be collapsed by default.
+
+![Rendered collapsed](/assets/images/help/writing/collapsed-section-view.png)
+
+After a reader clicks {% octicon "triangle-right" aria-label="The right triange icon" %}, the details are expanded.
+
+![Rendered open](/assets/images/help/writing/open-collapsed-section.png)
+
+## Further reading
+
+- [{% data variables.product.prodname_dotcom %} Flavored Markdown Spec](https://github.github.com/gfm/)
+- "[Basic writing and formatting syntax](/articles/basic-writing-and-formatting-syntax)"

content/github/writing-on-github/working-with-advanced-formatting/index.md

@@ -1,21 +1,46 @@
 import got from 'got'
-import { Failbot, HTTPBackend, LogBackend } from '@github/failbot'
+import { Failbot, HTTPBackend } from '@github/failbot'
 
 const HAYSTACK_APP = 'docs'
 
+async function retryingGot(url, args) {
+  return got(
+    url,
+    Object.assign({}, args, {
+      // With the timeout at 3000 (milliseconds) and the retry.limit
+      // at 4 (times), the total worst-case is:
+      // 3000 * 4  + 1000 + 2000 + 3000 + 4000 + 8000 = 30 seconds
+      timeout: 3000,
+      retry: {
+        // This means it will wait...
+        // 1. 1000ms
+        // 2. 2000ms
+        // 3. 4000ms
+        // 4. 8000ms
+        // 5. give up!
+        //
+        // From the documentation:
+        //
+        //   Delays between retries counts with function
+        //   1000 * Math.pow(2, retry - 1) + Math.random() * 100,
+        //   where retry is attempt number (starts from 1).
+        //
+        limit: 4,
+      },
+    })
+  )
+}
+
 export function report(error, metadata) {
   // If there's no HAYSTACK_URL set, bail early
   if (!process.env.HAYSTACK_URL) return
 
   const backends = [
     new HTTPBackend({
       haystackURL: process.env.HAYSTACK_URL,
-      fetchFn: got,
+      fetchFn: retryingGot,
     }),
   ]
-  if (process.env.NODE_ENV !== 'test') {
-    backends.push(new LogBackend({ log: console.log.bind(console) }))
-  }
   const failbot = new Failbot({
     app: HAYSTACK_APP,
     backends: backends,