elastic · dedemorton · Mar 28, 2017 · Mar 28, 2017 · Mar 28, 2017
diff --git a/metricbeat/docs/modules/windows.asciidoc b/metricbeat/docs/modules/windows.asciidoc
@@ -3,9 +3,9 @@ This file is generated! See scripts/docs_collector.py
 ////
 
 [[metricbeat-module-windows]]
-== windows Module
+== Windows Module
 
-This is the windows Module.
+This is the Windows module.
 
 
 [float]
@@ -21,7 +21,8 @@ metricbeat.modules:
 #  metricsets: ["perfmon"]
 #  enabled: true
 #  period: 10s
-#  perfmon.counters:----
+#  perfmon.counters:
+----
 
 [float]
 === Metricsets

diff --git a/metricbeat/metricbeat.full.yml b/metricbeat/metricbeat.full.yml
@@ -321,6 +321,7 @@ metricbeat.modules:
 #  enabled: true
 #  period: 10s
 #  perfmon.counters:
+
 #------------------------------ ZooKeeper Module -----------------------------
 #- module: zookeeper
   #metricsets: ["mntr"]

diff --git a/metricbeat/metricbeat.yml b/metricbeat/metricbeat.yml
@@ -54,6 +54,7 @@ metricbeat.modules:
 #  perfmon.counters:
 
 
+
 #================================ General =====================================
 
 # The name of the shipper that publishes the network data. It can be used to group

diff --git a/metricbeat/module/windows/_meta/config.yml b/metricbeat/module/windows/_meta/config.yml
@@ -2,4 +2,4 @@
 #  metricsets: ["perfmon"]
 #  enabled: true
 #  period: 10s
-#  perfmon.counters:
+#  perfmon.counters:
diff --git a/metricbeat/module/windows/_meta/docs.asciidoc b/metricbeat/module/windows/_meta/docs.asciidoc
@@ -1,3 +1,3 @@
-== windows Module
+== Windows Module
 
-This is the windows Module.
+This is the Windows module.
diff --git a/metricbeat/module/windows/perfmon/_meta/docs.asciidoc b/metricbeat/module/windows/perfmon/_meta/docs.asciidoc
@@ -1,24 +1,26 @@
-=== windows perfmon MetricSet
+=== Windows Perfmon MetricSet
 
-This is the perfmon metricset of the module windows.
+This is the perfmon metricset of the Windows module. It reads Windows
+performance counters.
 
 [float]
-=== Features and configuration
+=== Configuration
 
-Metricset to collect performance counters.
-Example configuration:
-```
+You must configure queries for the Windows performance counters that you wish
+to collect. The example below collects processor time and disk writes.
+
+[source,yaml]
+----
 - module: windows
   metricsets: ["perfmon"]
-  enabled: true
   period: 10s
   perfmon.counters:
-    - group: "processor"  
-      collectors:        
+    - group: "processor"
+      collectors:
         - alias: "processor_time"
           query: '\Processor Information(_Total)\% Processor Time'
     - group: "disk"
       collectors:
         - alias: "bytes_written"
           query: '\PhysicalDisk(_Total)\Disk Writes/sec'
-```
+----
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,6 +54,7 @@ metricbeat.modules:
		# perfmon.counters:



		#================================ General =====================================

		# The name of the shipper that publishes the network data. It can be used to group
Expand Down