Merging upstream version 1.17.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 26 deletions

diff --git a/collectors/cups.plugin/README.md b/collectors/cups.plugin/README.md
index f04aa567f..b8d56387d 100644
--- a/collectors/cups.plugin/README.md
+++ b/collectors/cups.plugin/README.md
@@ -10,40 +10,46 @@ This plugin needs a running local CUPS daemon (`cupsd`). This plugin does not ne
 
 `cups.plugin` provides one common section `destinations` and one section per destination. 
 
-> Destinations in CUPS represent individual printers or classes (collections or pools) of printers (https://www.cups.org/doc/cupspm.html#working-with-destinations)
+> Destinations in CUPS represent individual printers or classes (collections or pools) of printers (<https://www.cups.org/doc/cupspm.html#working-with-destinations>)
 
 The section `server` provides these charts:
 
-1. **destinations by state**
- * idle
- * printing
- * stopped
+1.  **destinations by state**
 
-2. **destinations by options**
- * total
- * accepting jobs
- * shared
+    -   idle
+    -   printing
+    -   stopped
 
-3. **total job number by status**
- * pending
- * processing
- * held
+2.  **destinations by options**
 
-4. **total job size by status**
- * pending
- * processing
- * held
+    -   total
+    -   accepting jobs
+    -   shared
+
+3.  **total job number by status**
+
+    -   pending
+    -   processing
+    -   held
+
+4.  **total job size by status**
+
+    -   pending
+    -   processing
+    -   held
 
 For each destination the plugin provides these charts:
 
-1. **job number by status**
- * pending
- * held
- * processing
+1.  **job number by status**
+
+    -   pending
+    -   held
+    -   processing
+
+2.  **job size by status**
+
+    -   pending
+    -   held
+    -   processing
 
-3. **job size by status**
- * pending
- * held
- * processing
-  
 At the moment only job status pending, processing, and held are reported because we do not have a method to collect stopped, canceled, aborted and completed jobs which scales.