summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-ftparchive.1.xml4
-rw-r--r--doc/examples/apt-ftparchive.conf6
-rw-r--r--doc/examples/configure-index1
-rw-r--r--doc/fr/apt-ftparchive.fr.1.xml6
-rw-r--r--doc/ja/apt-ftparchive.ja.1.xml7
-rw-r--r--doc/ja/apt-secure.ja.8.xml6
-rw-r--r--doc/sources.list.5.xml2
7 files changed, 17 insertions, 15 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 7c1ae9432..8cfbc72e9 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -407,10 +407,10 @@ for i in Sections do
Sets the Packages file output.</para></listitem>
</varlistentry>
- <varlistentry><term>SrcPackages</term>
+ <varlistentry><term>Sources</term>
<listitem><para>
Sets the Sources file output. At least one of
- <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+ <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem>
</varlistentry>
<varlistentry><term>Contents</term>
diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index 657ec5440..c9d352ab6 100644
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -20,21 +20,21 @@ Default {
// Contents file for these in the main section of the sid release
BinDirectory "pool/main" {
Packages "dists/sid/main/binary-i386/Packages";
- SrcPackages "dists/sid/main/source/Sources";
+ Sources "dists/sid/main/source/Sources";
Contents "dists/sid/Contents-i386";
}
// This is the same for the contrib section
BinDirectory "pool/contrib" {
Packages "dists/sid/contrib/binary-i386/Packages";
- SrcPackages "dists/sid/contrib/source/Sources";
+ Sources "dists/sid/contrib/source/Sources";
Contents "dists/sid/Contents-i386";
}
// This is the same for the non-free section
BinDirectory "pool/non-free" {
Packages "dists/sid/non-free/binary-i386/Packages";
- SrcPackages "dists/sid/non-free/source/Sources";
+ Sources "dists/sid/non-free/source/Sources";
Contents "dists/sid/Contents-i386";
};
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 9e851d753..b87e85030 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -244,6 +244,7 @@ DPkg
Debug
{
pkgProblemResolver "false";
+ pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
pkgAcquire "false";
pkgAcquire::Worker "false";
pkgDPkgPM "false";
diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml
index 61cdfa2ec..9ae6506fc 100644
--- a/doc/fr/apt-ftparchive.fr.1.xml
+++ b/doc/fr/apt-ftparchive.fr.1.xml
@@ -451,10 +451,10 @@ Indique le fichier «&nbsp;Packages&nbsp;» créé.
</para></listitem>
</varlistentry>
-<varlistentry><term>SrcPackages</term>
+<varlistentry><term>Sources</term>
<listitem><para>
Indique le fichier «&nbsp;Sources&nbsp;» créé. L'un des deux fichiers,
-<literal>Packages</literal> ou <literal>SrcPackages</literal> est nécessaire.
+<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire.
</para></listitem>
</varlistentry>
@@ -628,4 +628,4 @@ décimal 100 en cas d'erreur.
&manbugs;
&traducteur;
-</refentry> \ No newline at end of file
+</refentry>
diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml
index 82bd9c023..be6bbd767 100644
--- a/doc/ja/apt-ftparchive.ja.1.xml
+++ b/doc/ja/apt-ftparchive.ja.1.xml
@@ -90,7 +90,8 @@
<para>本質的㫠<command>apt-ftparchive</command> ã¯ã€
.deb ファイルã®å†…容をキャッシュã™ã‚‹ã®ã«ãƒã‚¤ãƒŠãƒªãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’使用ã§ãã¾ã™ã€‚
ã¾ãŸã€&gzip; 以外ã®ã„ã‹ãªã‚‹å¤–部プログラムã«ã‚‚ä¾å­˜ã—ã¾ã›ã‚“。
- ã™ã¹ã¦ç”Ÿæˆã™ã‚‹éš›ã€</para>
+ ã™ã¹ã¦ç”Ÿæˆã™ã‚‹éš›ã«ã¯ã€
+ ファイル変更点ã®æ¤œå‡ºã¨å¸Œæœ›ã—ãŸåœ§ç¸®å‡ºåŠ›ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½œæˆã‚’自動的ã«å®Ÿè¡Œã—ã¾ã™ã€‚</para>
<!--
<para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the
@@ -140,7 +141,7 @@
looked for with an extension of .src. The -\-source-override option can be
used to change the source override file that will be used.</para></listitem>
-->
- override ファイルを指定ã—ãŸå ´åˆã€.
+ override ファイルを指定ã—ãŸå ´åˆã€
src æ‹¡å¼µå­ãŒã¤ã„ãŸã‚½ãƒ¼ã‚¹ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’探ã—ã¾ã™ã€‚
使用ã™ã‚‹ã‚½ãƒ¼ã‚¹ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’変更ã™ã‚‹ã®ã«ã¯ã€
--source-override オプションを使用ã—ã¾ã™ã€‚</para></listitem>
@@ -833,7 +834,7 @@ for i in Sections do
ã¨ã„ã†å½¢å¼ã‹ã€å˜ç´”ã«
<literallayout>new</literallayout>
ã¨ãªã‚Šã¾ã™ã€‚
- 最åˆã®å½¢å¼ã¯ã€// ã§åŒºåˆ‡ã‚‰ã‚ŒãŸå¤ã„email アドレスã®ãƒªã‚¹ãƒˆã‚’許å¯ã—ã¾ã™ã€‚
+ 最åˆã®å½¢å¼ã¯ã€// ã§åŒºåˆ‡ã‚‰ã‚ŒãŸå¤ã„ email アドレスã®ãƒªã‚¹ãƒˆã‚’許å¯ã—ã¾ã™ã€‚
ã“ã®å½¢å¼ãŒã‚ã‚‹å ´åˆã¯ã€ãƒ¡ãƒ³ãƒ†ãƒŠãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ãªã‚‹ã‚ˆã† new ã«ç½®æ›ã—ã¦ãã ã•ã„。
2 番目ã®å½¢å¼ã¯ç„¡æ¡ä»¶ã«ãƒ¡ãƒ³ãƒ†ãƒŠãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«ç½®æ›ã—ã¾ã™ã€‚</para>
</refsect1>
diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml
index 33a829076..5b9612a7f 100644
--- a/doc/ja/apt-secure.ja.8.xml
+++ b/doc/ja/apt-secure.ja.8.xml
@@ -100,7 +100,7 @@
responsibility to ensure that the archive integrity is correct.
-->
apt アーカイブã‹ã‚‰ã‚¨ãƒ³ãƒ‰ãƒ¦ãƒ¼ã‚¶ã¾ã§ã®ä¿¡é ¼ã®è¼ªã¯ã€
- ã„ãã¤ã‹ã®ã‚¹ãƒ†ãƒƒãƒ—ã§o区政ã•ã‚Œã¦ã„ã¾ã™ã€‚
+ ã„ãã¤ã‹ã®ã‚¹ãƒ†ãƒƒãƒ—ã§æ§‹æˆã•ã‚Œã¦ã„ã¾ã™ã€‚
<command>apt-secure</command> ã¯ã€ã“ã®è¼ªã®æœ€å¾Œã®ã‚¹ãƒ†ãƒƒãƒ—ã§ã€
アーカイブを信頼ã™ã‚‹ã“ã¨ã¯ã€
パッケージã«æ‚ªæ„ã®ã‚るコードãŒå«ã¾ã‚Œã¦ã„ãªã„ã¨ä¿¡é ¼ã™ã‚‹ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€
@@ -182,7 +182,7 @@
per package basis. It is designed to prevent two possible attacks:
-->
<para>以上ã¯ã€ãƒ‘ッケージã”ã¨ã®ç½²åãƒã‚§ãƒƒã‚¯ã¨ã¯é•ã†ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。
- 以下ã®ç”¨ã«è€ƒãˆã‚‰ã‚Œã‚‹ 2 種類ã®æ”»æ’ƒã‚’防ãよã†è¨­è¨ˆã•ã‚Œã¦ã„ã¾ã™ã€‚
+ 以下ã®ã‚ˆã†ã«è€ƒãˆã‚‰ã‚Œã‚‹ 2 種類ã®æ”»æ’ƒã‚’防ãよã†è¨­è¨ˆã•ã‚Œã¦ã„ã¾ã™ã€‚
</para>
<itemizedlist>
@@ -243,7 +243,7 @@
<command>apt-key</command> ã¯ã€
apt ãŒä½¿ç”¨ã™ã‚‹ã‚­ãƒ¼ãƒªã‚¹ãƒˆã‚’管ç†ã™ã‚‹ãƒ—ログラムã§ã™ã€‚
ã“ã®ãƒªãƒªãƒ¼ã‚¹ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ã¯ã€Debian パッケージリãƒã‚¸ãƒˆãƒªã§ä½¿ç”¨ã™ã‚‹ã€
- キーã§ç½²åã™ã‚‹ デフォルト㮠Debian アーカイブをæä¾›ã—ã¾ã™ãŒã€
+ キーã§ç½²åã™ã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã® Debian アーカイブをæä¾›ã—ã¾ã™ãŒã€
<command>apt-key</command> ã§ã‚­ãƒ¼ã®è¿½åŠ ãƒ»å‰Šé™¤ãŒè¡Œãˆã¾ã™ã€‚
</para>
<para>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9762005b0..e47418b27 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -204,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
<para>Uses HTTP to access the archive at nonus.debian.org, under the
debian-non-US directory, and uses only files found under
- <filename>unstable/binary-i3866</filename> on i386 machines,
+ <filename>unstable/binary-i386</filename> on i386 machines,
<filename>unstable/binary-m68k</filename> on m68k, and so
forth for other supported architectures. [Note this example only
illustrates how to use the substitution variable; non-us is no longer
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:45:53 +0000