Merge branch 'master' into 'hardware'

# Conflicts:
#   APIs.rst

APIs.rst

@@ -3,11 +3,17 @@
 
 API Docs
 ========
-This page lists phone/Librem-5 specific API documentation. For links
-to upstream documentation check also :ref:`resources`. This list is
-currently being `filled in
+
+This chapter contains API documentation specific to the Librem 5 as well as
+links to upstream documentation.
+
+API documentation for the underlying GNOME platform can be found in
+:ref:`gnome_resources`. This list is currently being `filled in
 <https://source.puri.sm/Librem5/developer.puri.sm/issues/60>`_.
 
+See also the :ref:`software_reference` for detailed information about the
+Librem 5 software stack.
+
 Phone/Messaging APIs
 --------------------
 * Modem/Sim card access is provided via the `ModemManager`_  DBBus APIs

Apps.rst

@@ -8,9 +8,13 @@ App Development
    Apps/Constraints
    Apps/Gnome
    Apps/Kde
+   Apps/Design
    Apps/PublishingApps
 
-If you are interested in app development then you're in the right place! Here, you can find out how to make, build, deploy, and publish apps for distributing. Take a look at the flow charts below to get a visual idea of the layout of this apps section.
+If you are interested in app development then you're in the right place! Here,
+you can find out how to make, build, deploy, and publish apps for distributing.
+Take a look at the flow charts below to get a visual idea of the layout of this
+apps section.
 
 |pic1| |pic2|
 
@@ -29,7 +33,8 @@ First determine which phone environment you want to integrate with:
 
 For more information, see :ref:`environments`.
 
-Your environment will determine which tools and languages are available to you for app development.
+Your environment will determine which tools and languages are available to you
+for app development.
 
 Next, what kind of application format would you like?
 
@@ -44,8 +49,9 @@ You can follow the above charts to determine the IDE/build tool suggested.
   * :ref:`qt` provides QtCreator and QtDesigner, good tools for designing Qt based UIs
   * For building a deb package, `git-buildpackage <http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html>`_ is the preferred build method
 
-Once your app is ready to be distributed to other developers, you can submit your app for inclusion.
+Once your app is ready to be distributed to other developers, you can submit
+your app for inclusion.
 
-  * There will be a flatpak repository for only free software flatpaks. This repository will be hosted by PureOS
+  * There will be a flatpak repository for only free software flatpaks. This
+    repository will be hosted by PureOS
   * To submit your app for inclusion into Debian, follow `standard Debian package submission procedures <https://www.debian.org/doc/manuals/distribute-deb/distribute-deb.html#adding-packages-to-debian>`_
-