Merge pull request mozilla-services#1729 from mozilla-services/carbon…

…_line_docs Wire the schema_carbon_line encoder up to the config docs.
bshang · Sep 14, 2015 · d501394 · d501394
2 parents 4bce24b + ca22fb8
commit d501394
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/docs/source/config/encoders/index.rst b/docs/source/config/encoders/index.rst
@@ -21,6 +21,7 @@ Available Encoder Plugins
    protobuf
    rst
    sandbox
+   schema_carbon_line
    schema_influx
    schema_influx_line
    statmetric_influx
diff --git a/docs/source/config/encoders/index_noref.rst b/docs/source/config/encoders/index_noref.rst
@@ -30,6 +30,9 @@ Encoders
 .. include:: /config/encoders/sandbox.rst
    :start-line: 1
 
+.. include:: /config/encoders/schema_carbon_line.rst
+   :start-line: 1
+
 .. include:: /config/encoders/schema_influx.rst
    :start-line: 1
 

diff --git a/docs/source/config/encoders/schema_carbon_line.rst b/docs/source/config/encoders/schema_carbon_line.rst
@@ -0,0 +1,13 @@
+.. _config_schema_carbon_line_encoder:
+
+Schema Carbon Line Encoder
+==========================
+
+.. versionadded:: 0.10
+
+| Plugin Name: **SandboxEncoder**
+| File Name: **lua_encoders/schema_carbon_line.lua**
+
+.. include:: /../../sandbox/lua/encoders/schema_carbon_line.lua
+	:start-after: --[=[
+	:end-before: --]=]
diff --git a/docs/source/sandbox/encoder.rst b/docs/source/sandbox/encoder.rst
@@ -27,7 +27,7 @@ ESPayloadEncoder
    :end-before: --]]
 
 Schema Carbon Line Encoder
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. include:: /../../sandbox/lua/encoders/schema_carbon_line.lua
    :start-after: --[=[
    :end-before: --]=]
@@ -39,7 +39,7 @@ Schema InfluxDB Encoder
    :end-before: --]=]
 
 Schema InfluxDB Line Encoder
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 .. include:: /../../sandbox/lua/encoders/schema_influx_line.lua
    :start-after: --[=[
    :end-before: --]=]