From 7994fe69b2015a40946040c8beb86ad03c40863d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Poulain?= <fpoulain@metrodore.fr>
Date: Wed, 14 Nov 2012 14:20:52 +0000
Subject: [PATCH] Migration of metadatas: translation of author-address ->
 author-affiliation

---
 devel/style/customize/customize-title.en.tm     |  4 ++--
 main/styles/header/header-title-customize.en.tm |  6 +++---
 main/styles/header/header-title-export.en.tm    | 10 +++++-----
 main/styles/header/header-title-global.de.tm    |  4 ++--
 main/styles/header/header-title-global.en.tm    |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/devel/style/customize/customize-title.en.tm b/devel/style/customize/customize-title.en.tm
index 45adbd4..ccec139 100644
--- a/devel/style/customize/customize-title.en.tm
+++ b/devel/style/customize/customize-title.en.tm
@@ -22,7 +22,7 @@
   to specify data for each of the authors of the document. Each child of the
   <markup|doc-author-data> tag is a tag with information about the
   corresponding author. Currently implemented tags with author information
-  are <markup|author-name>, <markup|author-address>, <markup|author-email>,
+  are <markup|author-name>, <markup|author-affiliation>, <markup|author-email>,
   <markup|author-homepage> and <markup|author-misc>.
 
   Most of the tags listed above also correspond to macros for rendering the
@@ -77,7 +77,7 @@
         <\quasi>
           <unquote*|<select|<quote-arg|data>|author-name>>
 
-          <unquote*|<select|<quote-arg|data>|author-address>>
+          <unquote*|<select|<quote-arg|data>|author-affiliation>>
         </quasi>
       </macro>>
 
diff --git a/main/styles/header/header-title-customize.en.tm b/main/styles/header/header-title-customize.en.tm
index 5ac10b9..26461c0 100644
--- a/main/styles/header/header-title-customize.en.tm
+++ b/main/styles/header/header-title-customize.en.tm
@@ -67,8 +67,8 @@
     an author.
   </explain>
 
-  <\explain|<explain-macro|author-address|address>>
-    Renders the <src-arg|address> of the author.
+  <\explain|<explain-macro|author-affiliation|affiliation>>
+    Renders the <src-arg|affiliation> of the author.
   </explain>
 
   <\explain|<explain-macro|author-email|email>>
@@ -111,4 +111,4 @@
   Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
   Texts. A copy of the license is included in the section entitled "GNU Free
   Documentation License".>
-</body>
\ No newline at end of file
+</body>
diff --git a/main/styles/header/header-title-export.en.tm b/main/styles/header/header-title-export.en.tm
index 5362ab7..b55e315 100644
--- a/main/styles/header/header-title-export.en.tm
+++ b/main/styles/header/header-title-export.en.tm
@@ -32,7 +32,7 @@
   </explain>
 
   <\explain|<explain-macro|doc-author-data|data-1|<with|mode|math|\<cdots\>>|data-n>>
-    Specify the data for one of the authors of the document (name, address,
+    Specify the data for one of the authors of the document (name, affiliation,
     <abbr|etc.>; see below).
   </explain>
 
@@ -77,8 +77,8 @@
     Specify the <src-arg|name> of the author.
   </explain>
 
-  <\explain|<explain-macro|author-address|address>>
-    An <src-arg|address> where the author can be reached.
+  <\explain|<explain-macro|author-affiliation|affiliation>>
+    The <src-arg|affiliation> of the author.
   </explain>
 
   <\explain|<explain-macro|author-email|email>>
@@ -90,7 +90,7 @@
   </explain>
 
   <\explain|<explain-macro|author-misc|note>>
-    A <src-arg|note> attached to the author, like a thank-word.
+    A miscellanous <src-arg|note> attached to the author, like a thank-word.
   </explain>
 
   As a general rule, the use of any of the subtags of <markup|doc-data> or
@@ -110,4 +110,4 @@
   Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
   Texts. A copy of the license is included in the section entitled "GNU Free
   Documentation License".>
-</body>
\ No newline at end of file
+</body>
diff --git a/main/styles/header/header-title-global.de.tm b/main/styles/header/header-title-global.de.tm
index 508c458..6e50298 100644
--- a/main/styles/header/header-title-global.de.tm
+++ b/main/styles/header/header-title-global.de.tm
@@ -89,7 +89,7 @@
   zurück mit den gesammelten Daten als Kinder. Z.B.\ 
 
   <\tm-fragment>
-    <inactive*|<style-with|src-compact|none|<doc-author-main|<author-address|Somewhere
+    <inactive*|<style-with|src-compact|none|<doc-author-main|<author-affiliation|Somewhere
     in Africa>|<author-name|The big GNU>|<author-misc|Very hairy indeed!>>>>
   </tm-fragment>
 
@@ -97,7 +97,7 @@
 
   <\tm-fragment>
     <with|src-special|raw|<inactive*|<\style-with|src-compact|none>
-      <author-address|Somewhere in Africa>
+      <author-affiliation|Somewhere in Africa>
 
       <author-name|The big GNU>
     </style-with>>>
diff --git a/main/styles/header/header-title-global.en.tm b/main/styles/header/header-title-global.en.tm
index 291253e..221d963 100644
--- a/main/styles/header/header-title-global.en.tm
+++ b/main/styles/header/header-title-global.en.tm
@@ -84,7 +84,7 @@
   <markup|document> tag with the selected data as its children. For instance,
 
   <\tm-fragment>
-    <inactive*|<style-with|src-compact|none|<doc-author-main|<author-address|Somewhere
+    <inactive*|<style-with|src-compact|none|<doc-author-main|<author-affiliation|Somewhere
     in Africa>|<author-name|The big GNU>|<author-misc|Very hairy indeed!>>>>
   </tm-fragment>
 
@@ -92,7 +92,7 @@
 
   <\tm-fragment>
     <with|src-special|raw|<inactive*|<\style-with|src-compact|none>
-      <author-address|Somewhere in Africa>
+      <author-affiliation|Somewhere in Africa>
 
       <author-name|The big GNU>
     </style-with>>>