Merge pull request #2915 from chrismeyersfsu/fix-label-docs

fix label docs
This commit is contained in:
Chris Meyers 2016-07-11 13:34:00 -04:00 committed by GitHub
commit 120d2eda33
2 changed files with 10 additions and 1 deletions

View File

@ -0,0 +1,9 @@
{% include "api/sub_list_create_api_view.md" %}
Labels not associated with any other resources are deleted. A label can become disassociated with a resource as a result of 3 events.
1. A label is explicitly diassociated with a related job template
2. A job is deleted with labels
3. A cleanup job deletes a job with labels
{% include "api/_new_in_awx.md" %}

View File

@ -34,7 +34,7 @@ existing {{ model_verbose_name }} with this {{ parent_model_verbose_name }}.
Make a POST request to this resource with `id` and `disassociate` fields to
remove the {{ model_verbose_name }} from this {{ parent_model_verbose_name }}
without deleting the {{ model_verbose_name }}.
{% if model_verbose_name != "label" %}}without deleting the {{ model_verbose_name }}{% endif %}.
{% endif %}
{% endif %}