From 49468adc9e078833949684fba6ce4a743ae8f5a6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 11 Jul 2018 15:53:59 +0200
Subject: doc: Rename macro inddpcvs to inddpvcs and cvsname to vcsname

Add backward compatibility aliases for both macro and argument so that
the call sites do not have to be updated right away causing translation
work. But this will make it possible to switch these to a generic macro
piece by piece.
---
 english/doc/manuals.defs | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/english/doc/manuals.defs b/english/doc/manuals.defs
index 075b4b38975..6439f6ae25f 100644
--- a/english/doc/manuals.defs
+++ b/english/doc/manuals.defs
@@ -58,17 +58,20 @@
 </tr>
 </define-tag>
 
+# Alias for inddpcvs for those looking for 'cvs' here
+<define-tag inddpcvs whitespace=delete>
+    <inddpvcs %attributes>
+</define-tag>
+
 # Alias for inddpsvn for those looking for 'svn' here
 <define-tag inddpsvn whitespace=delete>
-    <inddpcvs %attributes>
+    <inddpvcs %attributes>
 </define-tag>
 
-# NOTE defined as 'inddpcvs' although now the repo is SVN
-# kept to minimise the number of changes in the pages
-<define-tag inddpcvs whitespace=delete>
-  <preserve name index baselink langs formats basename path loc txt version cvsname naming srctype vcstype vcsweb vcsrepo />
+<define-tag inddpvcs whitespace=delete>
+  <preserve name index baselink langs formats basename path loc txt version cvsname naming srctype vcsname vcstype vcsweb vcsrepo />
   <set-var %attributes />
-  <if <get-var name /> "" <exit message="you must pass a name to the inddpcvs tag" /> />
+  <if <get-var name /> "" <exit message="you must pass a name to the inddpvcs tag" /> />
   #   Default values
   <defvar index index />
   <if <get-var langs />
@@ -78,7 +81,8 @@
   <defvar formats html />
   <defvar path "manuals/<get-var name />" />
   <defvar basename "<get-var name />" />
-  <defvar cvsname <get-var name /> />
+  <defvar cvsname <get-var name /> /> # Deprecated variable, alias for vcsname
+  <defvar vcsname <get-var cvsname /> />
 # naming: default(extention: pt-br, ...), locale(extention: pt_BR, ...), none(no listing)
   <defvar naming default />
   <defvar srctype XML />
@@ -139,7 +143,7 @@
       </when>
       [<a href="<get-var path />/<get-var loc />"><get-var txt /></a>]
 #      <if <match <get-var format /> "(html|txt|pdf|ps)" action=report /> ""
-#        <exit message="you must pass a valid format to the inddpcvs tag" />
+#        <exit message="you must pass a valid format to the inddpvcs tag" />
 #      />
     </foreach>
     </li>
@@ -149,8 +153,8 @@
  </when>
 # DDP Git repo access (used)
  <when <match <get-var vcstype /> "ddp" action=report />>
-  <set-var vcsweb="https://salsa.debian.org/ddp-team/<get-var cvsname />" />
-  <set-var vcsrepo="https://salsa.debian.org/ddp-team/<get-var cvsname />.git" />
+  <set-var vcsweb="https://salsa.debian.org/ddp-team/<get-var vcsname />" />
+  <set-var vcsrepo="https://salsa.debian.org/ddp-team/<get-var vcsname />.git" />
   <p><gettext domain="doc">The latest <get-var srctype /> source is available through the <a href="https://packages.debian.org/git">Git</a> repository.</gettext></p>
   <ul>
     <li><gettext domain="doc">Web interface: </gettext><a href="<get-var vcsweb />"><get-var vcsweb /></a></li>
@@ -181,7 +185,7 @@
     <li><gettext domain="doc">VCS interface: </gettext><tt>git clone <get-var vcsrepo /></tt></li>
   </ul>
  </when>
-  <restore name index baselink langs formats basename path loc txt version cvsname naming srctype vcstype vcsweb vcsrepo />
+  <restore name index baselink langs formats basename path loc txt version cvsname naming srctype vcsname vcstype vcsweb vcsrepo />
 </define-tag>
 
 <define-tag inbfdcvs>
-- 
cgit v1.2.3