Update README.textile and macros files

README.textile file needed extraneous spaces removed, (source) and
(binaries) labels added, and some text corrected.  'macros' file
needed a urlindlabel macro added which would apply a label to an
indented url.

Change-Id: I4e7715a69f458d1e4e53235df14191ac0a8690f1

2 files changed, 18 insertions, 5 deletions

diff --git a/components/toolchain/binaries/README.textile b/components/toolchain/binaries/README.textile
index f555c1c..8ddbe48 100644
--- a/components/toolchain/binaries/README.textile
+++ b/components/toolchain/binaries/README.textile
@@ -12,6 +12,7 @@
 {% from "components/toolchain/binaries/macros" import header with context -%}
 {% from "components/toolchain/binaries/macros" import url with context -%}
 {% from "components/toolchain/binaries/macros" import urlind with context -%}
+{% from "components/toolchain/binaries/macros" import urlindlabel with context -%}
 {% from "components/toolchain/binaries/macros" import email with context -%}
 {% from "components/toolchain/binaries/macros" import format with context -%}
 
@@ -45,8 +46,8 @@ The {{ linaro_gcc_version }} {{ snap_rc_release }} is now available.
 
 Download {{ snap_rc_release|lower }} packages from:
 
-{{ urlind(8,srcurl) }}
-{{ urlind(8,binurl) }}
+{{ urlindlabel(8,"sources",srcurl) }}
+{{ urlindlabel(8,"binaries",binurl) }}
 
 Previous snapshots and release-candidates are at:
 
@@ -56,7 +57,7 @@ Previous releases are at:
 
 {{ urlind(8,"http://releases.linaro.org/components/toolchain/binaries/") }}
 
-A description of what each ABI or triplet is can be found at:
+A description of the arm and Aarch64 target triples can be found at:
 
 {{ urlind(8,"https://collaborate.linaro.org/display/TCWGPUB/ARM+and+AArch64+Target+Triples") }}
 
@@ -94,8 +95,6 @@ The host system upon which the cross-compiler will run requires a minimum of gli
 
 {% block gdb_version_block %}{% endblock %}
 
-{% block linux_version_block %}{% endblock %}
-
 {% call format("para") %}
 Linaro toolchain package git branches are hosted at:
 {% endcall %}
diff --git a/components/toolchain/binaries/macros b/components/toolchain/binaries/macros
index 692aee4..bdb9476 100644
--- a/components/toolchain/binaries/macros
+++ b/components/toolchain/binaries/macros
@@ -50,6 +50,20 @@
     {%- endif -%}
 {% endmacro %}
 
+{# An indented URL with a label (for text). #}
+{% macro urlindlabel(ind,label,text) %}
+    {% if announce != "yes" -%}
+	p
+	{%- for i in range(0, ind // 2) -%}
+	(
+	{%- endfor -%}
+	. ({{label}}) "{{ text }}":{{ text }}
+    {% else -%}
+        {% set labeltext=['(',label,')',text] -%}
+	{{ labeltext|join|indent(ind, true) }}
+    {%- endif -%}
+{% endmacro %}
+
 {# Format a 'NEWS' section item.
    if it is news we use '* ' and don't indent the first line.
    if it is newscont we don't use '* ' and we do indent the first line.