From 430481e794a3fa2e75022c67e129b54d192ad54c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 2 Dec 2015 12:43:33 +0100 Subject: 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 --- doc/apt.conf.5.xml | 2 +- doc/examples/configure-index | 4 ++-- doc/po/apt-doc.pot | 2 +- doc/po/de.po | 2 +- doc/po/es.po | 2 +- doc/po/fr.po | 2 +- doc/po/it.po | 2 +- doc/po/ja.po | 2 +- doc/po/nl.po | 2 +- doc/po/pl.po | 2 +- doc/po/pt.po | 2 +- doc/po/pt_BR.po | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'doc') 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 Acquire::Changelogs::URI::Override::Origin::ORIGIN. The value should be a normal URI to a text file, expect that package specific data is - replaced with the placeholder CHANGEPATH. The + replaced with the placeholder @CHANGEPATH@. The value for it is: 1. if the package is from a component (e.g. main) 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 'lib' 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 "" "Acquire::Changelogs::URI::Override::Origin::ORIGIN. " "The value should be a normal URI to a text file, expect that package " "specific data is replaced with the placeholder " -"CHANGEPATH. The value for it is: 1. if the package is " +"@CHANGEPATH@. The value for it is: 1. if the package is " "from a component (e.g. main) 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 'lib' 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> or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib or Acquire::Changelogs::URI::Override::" "Origin::ORIGIN. The value should be a " "normal URI to a text file, expect that package specific data is replaced " -"with the placeholder CHANGEPATH. The value for it is: 1. " +"with the placeholder @CHANGEPATH@. The value for it is: 1. " "if the package is from a component (e.g. main) 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 'lib