diff --git a/src/docs/user/userguide/remarkup.diviner b/src/docs/user/userguide/remarkup.diviner
index 5c76d6884b..0d1e2c5550 100644
--- a/src/docs/user/userguide/remarkup.diviner
+++ b/src/docs/user/userguide/remarkup.diviner
@@ -18,7 +18,7 @@ formatting text in Remarkup.
 
 These are inline styles, and can be applied to most text:
 
-  **bold** //italic// ##monospaced## `monospaced` ~~deleted~~ __underlined__
+  **bold** //italic// `monospaced` ##monospaced## ~~deleted~~ __underlined__
   D123 T123 rX123           # Link to Objects
   {D123} {T123}             # Link to Objects (Full Name)
   {F123}                    # Embed Images
@@ -59,13 +59,13 @@ Format **basic text styles** like this:
 
   **bold text**
   //italic text//
-  ##monospaced text##
   `monospaced text`
+  ##monospaced text##
   ~~deleted text~~
   __underlined text__
 
-Those produce **bold text**, //italic text//, ##monospaced text##,
-`monospaced text`, ~~deleted text~~, and __underlined text__, respectively.
+Those produce **bold text**, //italic text//, `monospaced text`, ##monospaced
+text##, ~~deleted text~~, and __underlined text__, respectively.
 
 = Layout =
 
@@ -212,7 +212,7 @@ This produces a block like this:
     global $$variable_variable;
   }
 
-You can use ##lines=N## to limit the vertical size of a chunk of code, and
+You can use `lines=N` to limit the vertical size of a chunk of code, and
 `name=some_name.ext` to give it a name. For example, this:
 
   lang=text
@@ -279,7 +279,7 @@ the rendered result. For example
 URIs are automatically linked: http://phabricator.org/
 
 If you have a URI with problematic characters in it, like
-"##http://comma.org/,##", you can surround it with angle brackets:
+"`http://comma.org/,`", you can surround it with angle brackets:
 
   <http://comma.org/,>
 
@@ -411,7 +411,7 @@ If you set a configuration flag, you can embed media directly in text:
     and have them render inline.
 
 This option is disabled by default because it has security and/or
-silliness implications. Read the description in ##default.conf.php## before
+silliness implications. Read the description in `default.conf.php` before
 enabling it.
 
 = Image Macros =
@@ -470,7 +470,7 @@ You can link to Phriction documents with a name or path:
 
   Make sure you sign and date your [[legal/Letter of Marque and Reprisal]]!
 
-With a pipe (##|##), you can retitle the link. Use this to mislead your
+With a pipe (`|`), you can retitle the link. Use this to mislead your
 opponents:
 
   Check out these [[legal/boring_documents/ | exciting legal documents]]!