diff --git a/docs/api/index.md b/docs/api/index.md
index 22cf6eb5f2e3811b1a0af8f779368fe26989766e..c0f25ee72236f81bce6ff10ea334067267d2b453 100644
--- a/docs/api/index.md
+++ b/docs/api/index.md
@@ -48,5 +48,4 @@ From the API explorer, you can click on the **Examples** tab to find examples of
## Changelog
-All important changes made to the API are be recorded on the wiki at:
-[API changes](/api/changes.md)
+All important changes made to the API are recorded in [API changes](/api/changes.md).
diff --git a/docs/basics/planning.md b/docs/basics/planning.md
index d09c71df9589d11985205fd89e1ca9f65660a570..71b56fab66f95c5e617c424b64b0c09c2e806615 100644
--- a/docs/basics/planning.md
+++ b/docs/basics/planning.md
@@ -34,9 +34,13 @@ practice, even for relatively small projects, to write
The requirements are typically written to be understandable to end
users, and the specification can be thought of as a translation of those
-requirements into the language of CiviCRM. Both requirements and
-specification should go on the
-[wiki](http://wiki.civicrm.org/confluence/display/CRM/CiviCRM+Wiki).
+requirements into the language of CiviCRM.
+
+Store your requirements and specifications in a public location such as:
+
+* A markdown file in your project's repository
+* A google doc
+* The [CiviCRM wiki](http://wiki.civicrm.org/confluence/display/CRM/CiviCRM+Wiki)
Once you've written the requirements and specification document, you
should go about soliciting feedback. Get feedback on the requirements
diff --git a/docs/basics/requirements.md b/docs/basics/requirements.md
index 71b38311e735b0fc31d6fa484f755c48cff79204..70b8beded379df602135a437bd105b9d8ad914e6 100644
--- a/docs/basics/requirements.md
+++ b/docs/basics/requirements.md
@@ -23,9 +23,7 @@ Civi development should work with most packages -- but there's one proviso:
Some packages are configured properly out-of-the-box. (Linux distributions
do a pretty good job of this.) Other packages require extra configuration
-steps (e.g. [Setup Command Line
-PHP](http://wiki.civicrm.org/confluence/display/CRMDOC/Setup+Command-Line+PHP)
-for MAMP).
+steps.
In subsequent steps, the download script will attempt to identify
misconfigurations and display an appropriate message.
diff --git a/docs/documentation/index.md b/docs/documentation/index.md
index 51460ebc16531c579c14a95298b0a5b1e0fd3873..d1f40df6eb2d83e56475f89459496f4c18c86843 100644
--- a/docs/documentation/index.md
+++ b/docs/documentation/index.md
@@ -186,7 +186,7 @@ This is relevant when you want to copy content *out of* our documentation books.
2. Navigate to the corresponding markdown file within GitHub (it will match the URL path of the published content).
3. Click on "Blame" to see detailed information about content authors, line, by line.
-### How to displaying attributing for content migrated *into* our books {:#attributing-imports}
+### How to display attribution for content migrated *into* our books {:#attributing-imports}
The [CiviCRM wiki](https://wiki.civicrm.org/confluence/dashboard.action) and [Stack Exchange](http://civicrm.stackexchange.com/) also use the CC BY-SA 3.0 license, which is convenient because content is regularly migrated into our MkDocs guides from these sources. But to comply with the license, we must attribute the original content authors
diff --git a/docs/extensions/civix.md b/docs/extensions/civix.md
index 09943e6b5ff7c55403ea6d6a3588c86e5aa8c52c..d09c656922eb797818f1ffe10b464312578aa2dd 100644
--- a/docs/extensions/civix.md
+++ b/docs/extensions/civix.md
@@ -71,7 +71,7 @@ or
**Administer » Customize Data and Screens » Manage Extensions.**
For more detailed instructions, see
-[Extensions](http://wiki.civicrm.org/confluence/display/CRMDOC/Extensions).
+[Extensions](/extensions/index.md).
## Add features
diff --git a/docs/extensions/index.md b/docs/extensions/index.md
index 843d787cbcc615877cf76a786517351bc84bf262..4b21c17d1056a15cbf7b4b9e76089e038f5b7aca 100644
--- a/docs/extensions/index.md
+++ b/docs/extensions/index.md
@@ -24,12 +24,12 @@ different short-name, but that requires extra work.
- Have basic knowledge of PHP, Unix, and object-oriented programming
- Install ***civix v14.01*** or newer. For instructions, see
- [Civix Doumentation/](/extensions/civix.md/)
- . This wiki page assumes that "civix" is installed and registered in
+ [Civix Documentation](/extensions/civix.md/).
+ This page assumes that "civix" is installed and registered in
the PATH.
- Configure an extensions directory. For instructions, see
[Extensions](/extensions/index.md).
- This wiki page assumes the directory is "/var/www/extensions", but
+ This page assumes the directory is `/var/www/extensions`, but
you should adapt as appropriate.
Your extensions directory must be under the CMS root directory so
that civix can find and bootstrap the CMS. Otherwise, it will fail
@@ -39,7 +39,7 @@ different short-name, but that requires extra work.
to read all CMS files, including configuration files, and write to
the extensions directory.
For example, Debian's drupal7 package saves database configuration
- to /etc/drupal/7/sites/default/dbconfig.php, which is only readable
+ to `/etc/drupal/7/sites/default/dbconfig.php`, which is only readable
by the www-data user. You will need to make this file readable by
your development user account for civix to work.
diff --git a/docs/tools/debugging.md b/docs/tools/debugging.md
index 5f188e2e4b9233eb9b481fb58250dbc3e9af88d9..34dd62a63218d1b3ecb72c3830a760b07b8529a7 100644
--- a/docs/tools/debugging.md
+++ b/docs/tools/debugging.md
@@ -335,7 +335,7 @@ The webserver can be configured to display errors to screen, but it also logs er
- `/var/log/php5/*log` PHP-FPM & PHP-CGI error logs
- `/path/to/site/err*log` Some hosting environments
-And a **CiviCRM specific debug log** file - location varies depending on hosting environment *and* CMS, refer to [this wiki page](/tools/debugging.md#Debuggingfordevelopers-Logfiles) for location -
+And a **CiviCRM specific debug log** file - location varies depending on hosting environment *and* CMS, refer to [this page](/tools/debugging.md#Debuggingfordevelopers-Logfiles) for location -
path/to/site/path/to/civicrm/files/ConfigAndLog/CiviCRM*log
@@ -373,7 +373,6 @@ This is where you can start debugging meaningfully. There's a good chance you're
* https://civicrm.stackexchange.com/questions/376/where-should-one-look-for-logs-when-debugging-a-new-problem
* [Drupal.org: Blank pages or White Screen of Death](https://www.drupal.org/node/158043)
* [Joomla SE: What is an efficient way to troubleshoot a White Screen of Death](https://joomla.stackexchange.com/questions/299/what-is-an-efficient-way-to-troubleshoot-a-white-screen-of-death)
- * [CiviCRM wiki: Debugging for developers](/tools/debugging.md#Debuggingfordevelopers-Logfiles)
**Notes**