integrations: Add incoming webhook macro to relevant docs.

Several integration docs instruct the user to create a bot, but don't
specify that the type of bot should be "Incoming webhook".

Renames create-a-bot.md -> create-an-incoming-webhook.md for clarity,
and replaces all incomplete instructions with this macro.
Renames bot_types.png -> bot_types_incoming_webhook.png and updates
the image with a screenshot of the latest UI.

templates/zerver/help/include/create-an-incoming-webhook.md

@@ -2,4 +2,4 @@
 {{ integration_display_name }}. Make sure that you select
 **Incoming webhook** as the **Bot type**:
 
-![](/static/images/integrations/bot_types.png)
+![](/static/images/integrations/bot_types_incoming_webhook.png)

templates/zerver/help/include/create-bot-construct-url.md

@@ -1,4 +1,4 @@
-{!create-a-bot.md!}
+{!create-an-incoming-webhook.md!}
 
 Construct the URL for the {{ integration_display_name }}
 bot using the bot's API key and the desired stream name:

templates/zerver/integrations/asana.md

@@ -2,11 +2,7 @@ Get Zulip notifications for your Asana projects via Zapier!
 
 1.  {!create-stream.md!}
 
-1.  Next, on your {{ settings_html|safe }}, create a bot for Asana.
+1. {!create-bot-construct-url.md!}
-    Construct the URL for the Asana bot using the bot API key and
-    stream name, like so:
-
-    `{{ api_url }}/v1/external/zapier?api_key=abcdefgh&stream=asana`
 
 1.  Start by setting up a [Zapier](https://zapier.com/) account.
 

templates/zerver/integrations/capistrano.md

@@ -1,6 +1,6 @@
 Get Zulip notifications for your Capistrano deploys!
 
-1.  {!create-a-bot.md!}
+1.  {!create-an-incoming-webhook.md!}
 
 1.  {!download-python-bindings.md!}
 

templates/zerver/integrations/codebase.md

@@ -5,7 +5,7 @@ Get Codebase notifications in Zulip!
    updates. We recommend naming the streams `codebase` and `tickets`, respectively.
    After creating these streams, make sure to subscribe all interested parties.
 
-1. {!create-a-bot.md!}
+1. {!create-an-incoming-webhook.md!}
 
 1. {!download-python-bindings.md!}
 

templates/zerver/integrations/discourse.md

@@ -1,9 +1,4 @@
-1.  On your {{ settings_html|safe }},
+1.  {!create-an-incoming-webhook.md!}
-    [create a bot](/help/add-a-bot-or-integration) for
-    {{ integration_display_name }}. Make sure that you select
-    **Incoming webhook** as the **Bot type**:
-
-    ![Bot types](/static/images/integrations/bot_types.png)
 
     The API keys for "Incoming webhook" bots are limited to only
     sending messages via webhooks. Thus, this bot type lessens

templates/zerver/integrations/git.md

@@ -1,6 +1,6 @@
 Get Zulip notifications for your Git repositories!
 
-1. {!create-a-bot.md!}
+1. {!create-an-incoming-webhook.md!}
 
 1. {!download-python-bindings.md!}
 

templates/zerver/integrations/jenkins.md

@@ -1,6 +1,6 @@
 1. {!create-stream.md!}
 
-1. {!create-a-bot.md!}
+1. {!create-an-incoming-webhook.md!}
 
 1. Install the "Zulip" plugin by going to
    **Manage Jenkins > Manage Plugins > Available**,

templates/zerver/integrations/nagios.md

@@ -2,8 +2,7 @@
 
 1.  {!download-python-bindings.md!}
 
-1.  Next, on your {{ settings_html|safe }}, create a bot for
+1.  {!create-an-incoming-webhook.md!}
-    {{ integration_display_name }}.
 
 1.  Next, open `integrations/nagios/zuliprc.example` in your favorite
     editor, and change the following lines to specify the email address

templates/zerver/integrations/twitter.md

@@ -4,12 +4,7 @@ important topics in real time.
 
 1.  {!create-stream.md!}
 
-1.  Next, on your {{ settings_html|safe }},
+1.  {!create-an-incoming-webhook.md!}
-    [create a bot](/help/add-a-bot-or-integration) for
-    {{ integration_display_name }}. Make sure that you select
-    **Incoming webhook** as the **Bot type**:
-
-    ![Bot types](/static/images/integrations/bot_types.png)
 
     The API keys for "Incoming webhook" bots are limited to only
     sending messages via webhooks. Thus, this bot type lessens

zerver/webhooks/beanstalk/doc.md

@@ -2,7 +2,7 @@ Zulip supports both SVN and Git notifications from Beanstalk.
 
 1. {!create-stream.md!}
 
-1. {!create-a-bot.md!}
+1. {!create-an-incoming-webhook.md!}
 
     {!webhook-url-with-bot-email.md!}
     {!git-append-branches.md!}

zerver/webhooks/buildbot/doc.md

@@ -6,7 +6,7 @@ Get Zulip notifications for your Buildbot builds!
 
 1. {!create-stream.md!}
 
-1. {!create-a-bot.md!}
+1. {!create-an-incoming-webhook.md!}
 
 1. Edit the Buildbot configuration file to add a new Zulip reporter
  ([or follow the steps listed here][1]):

zerver/webhooks/deskdotcom/doc.md

@@ -3,8 +3,7 @@
     Keep in mind you still need to create the stream first even
     if you are using this recommendation.
 
-1.  Next, on your {{ settings_html|safe }}, create a bot and
+1.  {!create-an-incoming-webhook.md!}
-    note its email and API key.
 
 1.  Next, in Desk.com, open your **Admin** view via the top-left
     dropdown. In the **Admin** view, click on **Apps**, then

zerver/webhooks/dialogflow/doc.md

@@ -1,17 +1,16 @@
-Get personal message notifications in Zulip for the results of your Dialogflow queries!
+Get personal message notifications in Zulip for the results of your
+Dialogflow queries!
 
 1. {!create-stream.md!}
 
-1. Next, on your {{ settings_html|safe }}, [create a bot](/help/add-a-bot-or-integration) for
+1. {!create-an-incoming-webhook.md!}
-   {{ integration_display_name }}. Make sure that you select
-   **Incoming webhook** as the **Bot type**.
 
     The API key for an incoming webhook bot cannot be used to read messages out
     of Zulip. Thus, using an incoming webhook bot lowers the security risk of
     exposing the bot's API key to a third-party service.
 
-    Construct the URL for the Dialogflow bot using the bot's API key and your Zulip email.
+    Construct the URL for the Dialogflow bot using the bot's API key and your
-    The webhook URL should look like:
+    Zulip email. The webhook URL should look like:
 
     `{{api_url}}?api_key=BOT'S_API_KEY&email=foo@example.com`
 

zerver/webhooks/homeassistant/doc.md

@@ -1,7 +1,6 @@
 1.  {!create-stream.md!}
 
-1.  Next, on your {{ settings_html|safe }}, create a bot and
+1.  {!create-an-incoming-webhook.md!}
-    note its email and API key.
 
 1.  In Home Assistant, you need to add the `notify` service to your
     `configuration.yaml` file.  This should look something like this:

zerver/webhooks/zapier/doc.md

@@ -4,7 +4,7 @@ sent by Zapier directly in Zulip.
 
 1. {!create-stream.md!}
 
-1. {!create-a-bot.md!}
+1. {!create-an-incoming-webhook.md!}
 
 1. Create an account on [Zapier](https://zapier.com).
 

zerver/webhooks/zendesk/doc.md

@@ -1,6 +1,6 @@
 1.  {!create-stream.md!}
 
-1.  Next, on your {{ settings_html|safe }}, create a bot.
+1.  {!create-an-incoming-webhook.md!}
 
 1.  Construct a webhook URL like the following: