diff --git a/src/docs/contributing/general_coding_standards.diviner b/src/docs/contributing/general_coding_standards.diviner
index f34342d8ff..a70e489897 100644
--- a/src/docs/contributing/general_coding_standards.diviner
+++ b/src/docs/contributing/general_coding_standards.diviner
@@ -135,7 +135,8 @@ handling and makes it easier to get right than wrong:
   Filesystem::writeFile('file.bak', $data);         //  Best
   do_something_dangerous();
 
-See @{article:System Commands} for details on the APIs used in this example.
+See @{article@libphutil:Command Execution} for details on the APIs used in this
+example.
 
 = Documentation, Comments and Formatting =
 
diff --git a/src/docs/developer/unit_tests.diviner b/src/docs/developer/unit_tests.diviner
index a9a2ebfa72..55a67403f8 100644
--- a/src/docs/developer/unit_tests.diviner
+++ b/src/docs/developer/unit_tests.diviner
@@ -60,7 +60,7 @@ You can see this class at @{class:PhabricatorTrivialTestCase} and run it with:
    PASS   <1ms*  testAllIsRightWithTheWorld
 
 For more information on writing tests, see
-@{class@arcnaist:ArcanistPhutilTestCase} and @{class:PhabricatorTestCase}.
+@{class@arcanist:ArcanistPhutilTestCase} and @{class:PhabricatorTestCase}.
 
 = Database Isolation =
 
diff --git a/src/docs/feedback.diviner b/src/docs/feedback.diviner
index 0fa1f3f323..ed208dafc3 100644
--- a/src/docs/feedback.diviner
+++ b/src/docs/feedback.diviner
@@ -56,4 +56,4 @@ Continue by:
 
   - Filing a bug of feature request in
     [[http://secure.phabricator.com/maniphest/task/create/ | Maniphest]]; or
-  - contributing to Phabricator with @{article:Contibutor Introduction}.
+  - contributing to Phabricator with @{article:Contributor Introduction}.
diff --git a/src/docs/technical/conduit.diviner b/src/docs/technical/conduit.diviner
index a5c3523bb3..8a9997693c 100644
--- a/src/docs/technical/conduit.diviner
+++ b/src/docs/technical/conduit.diviner
@@ -47,7 +47,7 @@ Console", implemented by @{class:PhabricatorConduitConsoleController} at
 ##/conduit/##.
 
 A log of connections and calls is stored by
-@{class:PhabriatorConduitConnectionLog} and
+@{class:PhabricatorConduitConnectionLog} and
 @{class:PhabricatorConduitMethodCallLog}, and can be accessed on the web via
 @{class:PhabricatorConduitLogController} at ##/conduit/log/##.
 
diff --git a/src/docs/userguide/arcanist_lint.diviner b/src/docs/userguide/arcanist_lint.diviner
index 760b262a50..67f5513e38 100644
--- a/src/docs/userguide/arcanist_lint.diviner
+++ b/src/docs/userguide/arcanist_lint.diviner
@@ -67,7 +67,7 @@ Additionally, Arcanist ships with some general purpose linters:
     mistakes.
   - @{class@arcanist:ArcanistFilenameLinter}, which can enforce generally
     sensible rules about not giving files nonsense names.
-  - @{class@arcanist:ArcanistLicenseLinter.php}, which can make sure license
+  - @{class@arcanist:ArcanistLicenseLinter}, which can make sure license
     headers are applied to all source files.
   - @{class@arcanist:ArcanistNoLintLinter}, which can disable lint for files
     marked unlintable.
diff --git a/src/infrastructure/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php
index d980f4835b..f532e39c4e 100644
--- a/src/infrastructure/storage/lisk/LiskDAO.php
+++ b/src/infrastructure/storage/lisk/LiskDAO.php
@@ -132,9 +132,9 @@
  *   $pugs = $dog->loadAllWhere('breed = %s', 'Pug');
  *   $sawyer = $dog->loadOneWhere('name = %s', 'Sawyer');
  *
- * These methods work like @{function:queryfx}, but only take half of a query
- * (the part after the WHERE keyword). Lisk will handle the connection, columns,
- * and object construction; you are responsible for the rest of it.
+ * These methods work like @{function@libphutil:queryfx}, but only take half of
+ * a query (the part after the WHERE keyword). Lisk will handle the connection,
+ * columns, and object construction; you are responsible for the rest of it.
  * @{method:loadAllWhere} returns a list of objects, while
  * @{method:loadOneWhere} returns a single object (or `null`).
  *