use @CHANGEPATH@ as placeholder in changelog URI templates

This should make it more obvious that CHANGEPATH is a placeholder which
apt will replace with a package specific path rather than a string
constant.

Mail-Reference: <87d1upgvaf.fsf@deep-thought.43-1.org>
Mail-Archive: https://lists.debian.org/debian-dak/2015/12/msg00005.html

12 files changed, 13 insertions, 13 deletions

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e6cbc8bc4..54f1de22f 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -657,7 +657,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
 	  or <literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.
 
 	  The value should be a normal URI to a text file, expect that package specific data is
-	  replaced with the placeholder <literal>CHANGEPATH</literal>. The
+	  replaced with the placeholder <literal>@CHANGEPATH@</literal>. The
 	  value for it is: 1. if the package is from a component (e.g. <literal>main</literal>)
 	  this is the first part otherwise it is omitted, 2. the first letter of source package name,
 	  expect if the source package name starts with '<literal>lib</literal>' in which case it will
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 1339335fa..db85654ca 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -298,8 +298,8 @@ Acquire
      "fr";
   };
 
-  // Location of the changelogs with the placeholder CHANGEPATH (e.g. "main/a/apt/apt_1.1")
-  Changelogs::URI::Origin::Debian "http://metadata.ftp-master.debian.org/changelogs/CHANGEPATH_changelog";
+  // Location of the changelogs with the placeholder @CHANGEPATH@ (e.g. "main/a/apt/apt_1.1")
+  Changelogs::URI::Origin::Debian "http://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog";
 };
 
 // Directory layout
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index da32a7269..2b277b11d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -3498,7 +3498,7 @@ msgid ""
 "<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.  "
 "The value should be a normal URI to a text file, expect that package "
 "specific data is replaced with the placeholder "
-"<literal>CHANGEPATH</literal>. The value for it is: 1. if the package is "
+"<literal>@CHANGEPATH@</literal>. The value for it is: 1. if the package is "
 "from a component (e.g. <literal>main</literal>)  this is the first part "
 "otherwise it is omitted, 2. the first letter of source package name, expect "
 "if the source package name starts with '<literal>lib</literal>' in which "
diff --git a/doc/po/de.po b/doc/po/de.po
index 58d54976d..953e8804f 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -5057,7 +5057,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/es.po b/doc/po/es.po
index 1fbe79554..a8191e2b2 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -5099,7 +5099,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 2cb53680b..f4c2e0ecd 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -5047,7 +5047,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/it.po b/doc/po/it.po
index 56ceb1ccc..e3e767c55 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -5074,7 +5074,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index b007e0dd9..8dd876b0e 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -4883,7 +4883,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index f461a9ca8..7a9c9fbae 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -5138,7 +5138,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 91017eb96..cef4ca893 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -4720,7 +4720,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 01f6bd864..a74cab262 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -5028,7 +5028,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 39944e99b..312ab815d 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -3467,7 +3467,7 @@ msgid ""
 "replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
 "Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
 "normal URI to a text file, expect that package specific data is replaced "
-"with the placeholder <literal>CHANGEPATH</literal>. The value for it is: 1. "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: 1. "
 "if the package is from a component (e.g. <literal>main</literal>)  this is "
 "the first part otherwise it is omitted, 2. the first letter of source "
 "package name, expect if the source package name starts with '<literal>lib</"