Add cross-links

content/docs/alerting/alertmanager.md

@@ -6,8 +6,9 @@ nav_icon: sliders
 
 # Alertmanager
 
-The Alertmanager handles alerts sent by client applications such as the 
-Prometheus server. It takes care of deduplicating, grouping, and routing
+The [Alertmanager](https://github.com/prometheus/alertmanager) handles alerts
+sent by client applications such as the Prometheus server.
+It takes care of deduplicating, grouping, and routing
 them to the correct receiver integration such as email, PagerDuty, or OpsGenie.
 It also takes care of silencing and inhibition of alerts.
 
@@ -59,3 +60,10 @@ matchers of an active silence.
 If they do, no notifications will be send out for that alert.
 
 Silences are configured in the web interface of the Alertmanager.
+
+
+## Client behavior
+
+The Alertmanager has [special requirements](../clients) for behavior of its
+client. Those are only relevant for advanced use cases where Prometheus
+is not used to send alerts.
\ No newline at end of file

content/docs/alerting/overview.md

@@ -7,14 +7,12 @@ nav_icon: sliders
 # Alerting Overview
 
 Alerting with Prometheus is separated into two parts. Alerting rules in
-Prometheus servers send alerts to an Alertmanager. The Alertmanager then
-manages those alerts, including silencing, inhibition, aggregation and sending
-out notifications via methods such as email, PagerDuty and HipChat.
-
-**WARNING: The Alertmanager is still considered to be very experimental.**
+Prometheus servers send alerts to an Alertmanager. The [Alertmanager](../alertmanager)
+then manages those alerts, including silencing, inhibition, aggregation and
+sending out notifications via methods such as email, PagerDuty and HipChat.
 
 The main steps to setting up alerting and notifications are:
 
-* Setup and configure the Alertmanager
+* Setup and [configure](../configuration) the Alertmanager
 * Configure Prometheus to talk to the Alertmanager with the `-alertmanager.url` flag
-* Create alerting rules in Prometheus
+* Create [alerting rules](../rules) in Prometheus

content/docs/alerting/rules.md

@@ -20,9 +20,9 @@ Alerting rules are defined in the following syntax:
 
     ALERT <alert name>
       IF <expression>
-      [FOR <duration>]
-      [LABELS <label set>]
-      [ANNOTATIONS <label set>]
+      [ FOR <duration> ]
+      [ LABELS <label set> ]
+      [ ANNOTATIONS <label set> ]
 
 The optional `FOR` clause causes Prometheus to wait for a certain duration
 between first encountering a new expression output vector element (like an
@@ -38,15 +38,17 @@ identifying for an alert instance. They are used to store longer additional
 information such as alert descriptions or runbook links. The annotation values
 can be templated.
 
-#### v0.16.2 and earlier
+#### Prometheus v0.16.2 and earlier
 
 In previous Prometheus versions the rule syntax is as follows:
 
     ALERT <alert name>
       IF <expression>
-      [FOR <duration>]
-      [WITH <label set>]
-      [ANNOTATIONS <label set>]
+      [ FOR <duration> ]
+      [ WITH <label set> ]
+      SUMMARY <string>
+      DESCRIPTION <string>
+      [ RUNBOOK <string> ]
 
 Annotations are not free form but fixed to a summary, a description, and a
 runbook field. Labels are attached using the `WITH` rather than the `LABELS`