From 8ddbb01559ec61f93010642d55b124e7f999f169 Mon Sep 17 00:00:00 2001
From: "bubulle@debian.org" <>
Date: Sat, 26 Sep 2009 11:19:29 +0200
Subject: Fix ftp(archive(1) documentation of -o

---
 doc/apt-ftparchive.1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-ftparchive.1.xml')

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 7131303ae..334cc85da 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -39,7 +39,7 @@
       <arg><option>--delink</option></arg>
       <arg><option>--readonly</option></arg>
       <arg><option>--contents</option></arg>
-      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+      <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg>
       <arg><option>-c=<replaceable>file</replaceable></option></arg>      
       <group choice="req">
          <arg>packages<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
-- 
cgit v1.2.3


From 5f4331c4d265aa83229e3e58edd49e54731fb646 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 29 Oct 2009 00:14:21 +0100
Subject: correct various errors, typos and oddities in the manpages Patch by
 Chris Leick which closes his on bug. Thanks! * doc/ various manpages:   -
 correct various errors, typos and oddities (Closes: #552535) *
 doc/apt-secure.8.xml:   - replace literal with emphasis tags in Archive
 configuration

---
 doc/apt-ftparchive.1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-ftparchive.1.xml')

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 334cc85da..d4d77c68e 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -158,7 +158,7 @@
      <para>
      The <literal>Dir</literal> section defines the standard directories needed to 
      locate the files required during the generation process. These 
-     directories are prepended to certain relative paths defined in later 
+     directories are prepended certain relative paths defined in later 
      sections to produce a complete an absolute path.</para>
      <variablelist>     
       <varlistentry><term>ArchiveDir</term>
-- 
cgit v1.2.3


From 9d20d8c8eb99ff85d082956813c3d624132d5399 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Dec 2009 21:48:54 +0100
Subject: merged -r 1920..1922 from lp:~donkult/apt/sid

---
 doc/apt-ftparchive.1.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'doc/apt-ftparchive.1.xml')

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index d4d77c68e..d47df957a 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -15,7 +15,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>29 February 2004</date>
+   <date>17 August 2009</date>
  </refentryinfo>
  
  <refmeta>
@@ -543,7 +543,16 @@ for i in Sections do
      Make the caching databases read only. 
      Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem>
      </varlistentry>   
-   
+
+     <varlistentry><term><option>APT::FTPArchive::LongDescription</option></term>
+     <listitem><para>
+     This configuration option defaults to "<literal>true</literal>" and should only be set to
+     <literal>"false"</literal> if the Archive generated with &apt-ftparchive; also provides
+     <filename>Translation</filename> files. Note that it is currently not possible to create these
+     files with <command>apt-ftparchive</command>.
+     </para></listitem>
+     </varlistentry>
+
      &apt-commonoptions;
      
    </variablelist>
-- 
cgit v1.2.3


From ca4907db7c8ec2d409a9ca32aeb2ccb4c3cd40aa Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 11 Dec 2009 00:48:52 +0100
Subject: fix a few typos in strings, comments and manpage of apt-ftparchive
 thanks Karl Goetz! (Closes: #558757)

---
 doc/apt-ftparchive.1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/apt-ftparchive.1.xml')

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index d47df957a..fb1b10adc 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -285,7 +285,7 @@
       
       <varlistentry><term>Sources</term>
       <listitem><para>
-      Sets the output Packages file. Defaults to 
+      Sets the output Sources file. Defaults to 
       <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
       </varlistentry>
       
-- 
cgit v1.2.3


From f8b832bdbe85ca315404edcf1159fb1225fddfbf Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 12 Dec 2009 16:32:18 +0100
Subject: remove informalexample tag which hides the programlisting in the tree
 section of the apt-ftparchive manpage, thanks Chris Leick for noticing it!

---
 doc/apt-ftparchive.1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc/apt-ftparchive.1.xml')

diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index fb1b10adc..c56ff235a 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -350,11 +350,11 @@
      <para>
      When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> 
      performs an operation similar to:
-<informalexample><programlisting>
+     <programlisting>
 for i in Sections do 
    for j in Architectures do
       Generate for DIST=scope SECTION=i ARCH=j
-</programlisting></informalexample></para>
+     </programlisting></para>
 
      <variablelist>     
       <varlistentry><term>Sections</term>
-- 
cgit v1.2.3