Merge branch 'patch-1' of https://github.com/causten/docs into causten-patch-1
diff --git a/README.md b/README.md
index 9b69328..c0bae54 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,19 @@
-# docs
+# OpenBMC documentation
+
+This repository contains documentation for OpenBMC as a whole. There may
+be component-specific documentation in the repository for each component.
+
+ - [cheatsheet.md](cheatsheet.md): Quick reference for some common
+ development tasks
+
+ - [contributing.md](contributing.md): Guidelines for contributing to
+ OpenBMC
+
+ - [dbus-interfaces.md](dbus-interfaces.md): Reference for APIs exposed
+ to dbus
+
+ - [kernel-development.md](kernel-development.md): Reference for common
+ kernel development tasks
+
+ - [rest-api.md](rest-api.md): Introduction to using the OpenBMC REST
+ API
diff --git a/contributing.md b/contributing.md
index a975983..8867fb8 100644
--- a/contributing.md
+++ b/contributing.md
@@ -11,7 +11,7 @@
Structure
---------
-OpenBMC has quite a module structure, consisting of small daemons with a
+OpenBMC has quite a modular structure, consisting of small daemons with a
limited set of responsibilities. These communicate over dbus with other
components, to implement the complete BMC system.
@@ -116,6 +116,9 @@
* Declare internal-only functions as `static`, declare read-only data
as `const` where possble.
+ * Ensure that your code compiles without warnings, especially for changes
+ to the kernel.
+
Developer's Certificate of Origin 1.1
-------------------------------------
diff --git a/dbus-interfaces.md b/dbus-interfaces.md
index db0f232..b2a8ab0 100644
--- a/dbus-interfaces.md
+++ b/dbus-interfaces.md
@@ -87,6 +87,12 @@
* `worst_threshold_state`
+### `/org/openbmc/sensors/host/PowerCap`
+This object is used to set Host PowerCap. In turn a OCC "Set User PowerCap" command is sent to OCC.
+
+### `/org/openbmc/sensors/host/OccStatus`
+This object can set OCC state to either: "Enabled" or "Disabled".
+
# Inventory
## `/org/openbmc/inventory/<item hierarchy>`