Documentation fixes

ambitioninc · Jan 8, 2015 · 456ae2a · 456ae2a
1 parent 4644d44
commit 456ae2a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 5 deletions.
diff --git a/docs/Makefile b/docs/Makefile
@@ -50,7 +50,7 @@ clean:
 	rm -rf $(BUILDDIR)/*
 
 html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	$(SPHINXBUILD) -b html -W $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -14,8 +14,10 @@ Currently Supported Resources
 * Applications (:doc:`API Reference <ref/applications>`)
 * Application Hosts (:doc:`API Reference <ref/application_hosts>`)
 * Application Instances (:doc:`API Reference <ref/application_instances>`)
+* Browser Applications (:doc:`API Reference <ref/browser_applications>`)
 * Components (:doc:`API Reference <ref/components>`)
 * Key Transactions (:doc:`API Reference <ref/key_transactions>`)
+* Labels (:doc:`API Reference <ref/labels>`)
 * Notification Channels (:doc:`API Reference <ref/notification_channels>`)
 * Plugins (:doc:`API Reference <ref/plugins>`)
 * Servers (:doc:`API Reference <ref/servers>`)

diff --git a/docs/ref/browser_applications.rst b/docs/ref/browser_applications.rst
@@ -0,0 +1,14 @@
+.. _ref-browser_applications:
+
+Browser Applications
+====================
+
+newrelic_api.browser_applications
+---------------------------------
+
+.. automodule:: newrelic_api.browser_applications
+.. autoclass:: newrelic_api.browser_applications.BrowserApplications
+    :members:
+    :undoc-members:
+
+    .. automethod:: __init__
diff --git a/docs/ref/labels.rst b/docs/ref/labels.rst
@@ -0,0 +1,14 @@
+.. _ref-labels:
+
+Labels
+======
+
+newrelic_api.labels
+-------------------
+
+.. automodule:: newrelic_api.labels
+.. autoclass:: newrelic_api.labels.Labels
+    :members:
+    :undoc-members:
+
+    .. automethod:: __init__
diff --git a/docs/toc.rst b/docs/toc.rst
@@ -12,8 +12,10 @@ Table of Contents
    ref/applications
    ref/application_hosts
    ref/application_instances
+   ref/browser_applications
    ref/components
    ref/key_transactions
+   ref/labels
    ref/notification_channels
    ref/plugins
    ref/servers

diff --git a/newrelic_api/browser_applications.py b/newrelic_api/browser_applications.py
@@ -8,10 +8,10 @@ class BrowserApplications(Resource):
     def list(self, filter_name=None, filter_ids=None, page=None):
         """
         This API endpoint returns a list of the Browser Applications associated
-            with your New Relic account.
+        with your New Relic account.
 
         Browser Applications can be filtered by their name, or by the
-            application IDs.
+        application IDs.
 
         :type filter_name: str
         :param filter_name: Filter by application name

diff --git a/newrelic_api/labels.py b/newrelic_api/labels.py
@@ -62,7 +62,7 @@ def list(self, page=None):
     def create(self, name, category, applications=None, servers=None):
         """
         This API endpoint will create a new label with the provided name and
-            category
+        category
 
         :type name: str
         :param name: The name of the label
@@ -119,7 +119,7 @@ def create(self, name, category, applications=None, servers=None):
     def delete(self, key):
         """
         When applications are provided, this endpoint will remove those
-            applications from the label.
+        applications from the label.
 
         When no applications are provided, this endpoint will remove the label.