diff --git a/non-code.md b/non-code.md
deleted file mode 100644
index dca7800..0000000
--- a/non-code.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Non-Code
-layout: default
-permalink: /non-code/
----
-
-While the focus of this site is open source software, there are other licenses more appropriate for projects that aren't code, e.g. [CC0](/licenses/cc0-1.0/) and the [Open Font License](/licenses/ofl-1.1/).
-
-If your project contains a mix of software and content, you can include multiple licenses, as long as you are explicit about which license applies to what segments of the project. See [the license disclaimer for this site](https://github.com/github/choosealicense.com#license) as an example.
diff --git a/non-software.md b/non-software.md
new file mode 100644
index 0000000..570dcf9
--- /dev/null
+++ b/non-software.md
@@ -0,0 +1,15 @@
+---
+title: Non-Software Licenses
+layout: default
+permalink: /non-software/
+---
+
+Open source software licenses can be used for non-software works, and often are the best choice. This is particularly the case when the works in question can be edited and versioned as source, e.g., **[open source hardware](http://www.oshwa.org/definition/) designs**. Choose an [open source software license](/licenses/).
+
+[CC0-1.0](/licenses/cc0-1.0/), [CC-BY-4.0](/licenses/cc-by-4.0/), and [CC-BY-SA-4.0](/licenses/cc-by-sa-4.0/) are [open](http://opendefinition.org) licenses used for **non-software material ranging from datasets to videos**. Note that Creative Commons licenses should [not be used for software](https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software.).
+
+Any open source software license or open Creative Commons license is applicable to **software documentation**. If you use different licenses for your software and its documentation, you may wish to take care that the licenses are compatible, or that source code examples in the documentation is also licensed under the software license.
+
+**Fonts** are software, but are a special case due to how they are used in other works. [SIL Open Font License 1.1](/licenses/ofl-1.1/) accounts for this.
+
+If your project contains a **mix of software and other material**, you can include multiple licenses, as long as you are explicit about which license applies to what parts of the project. See [the license notice for this site](https://github.com/github/choosealicense.com#license) as an example.