Browse Source

* doc/*.xml:

- mark even more stuff as untranslateable and improve the
    markup here and there (no real text change)
tags/devuan/2.0.1+devuan1
David Kalnischkies 8 years ago
parent
commit
aec2216091
13 changed files with 385 additions and 598 deletions
  1. +3
    -0
      debian/changelog
  2. +1
    -3
      doc/apt-cache.8.xml
  3. +2
    -3
      doc/apt-cdrom.8.xml
  4. +1
    -1
      doc/apt-config.8.xml
  5. +7
    -7
      doc/apt-ftparchive.1.xml
  6. +4
    -5
      doc/apt-mark.8.xml
  7. +12
    -0
      doc/apt-verbatim.ent
  8. +2
    -2
      doc/apt.ent
  9. +2
    -2
      doc/makefile
  10. +141
    -249
      doc/po/apt-doc.pot
  11. +194
    -308
      doc/po/de.po
  12. +5
    -4
      doc/po4a.conf
  13. +11
    -14
      doc/sources.list.5.xml

+ 3
- 0
debian/changelog View File

@@ -3,6 +3,9 @@ apt (0.9.6) UNRELEASED; urgency=low
* apt-pkg/contrib/fileutl.cc:
- dup() given compressed fd in OpenDescriptor if AutoClose
is disabled as otherwise gzclose() and co will close it
* doc/*.xml:
- mark even more stuff as untranslateable and improve the
markup here and there (no real text change)

-- David Kalnischkies <kalnischkies@gmail.com> Tue, 22 May 2012 18:13:19 +0200



+ 1
- 3
doc/apt-cache.8.xml View File

@@ -168,9 +168,7 @@ Reverse Provides:

<varlistentry><term><option>search</option> <option><replaceable>&synopsis-regex;</replaceable>…</option></term>
<listitem><para><literal>search</literal> performs a full text search on all available package
lists for the POSIX regex pattern given, see
<citerefentry><refentrytitle><command>regex</command></refentrytitle>
<manvolnum>7</manvolnum></citerefentry>.
lists for the POSIX regex pattern given, see &regex;.
It searches the package names and the
descriptions for an occurrence of the regular expression and prints out
the package name and the short description, including virtual package


+ 2
- 3
doc/apt-cdrom.8.xml View File

@@ -49,8 +49,8 @@
</para>

<para>Unless the <option>-h</option>, or <option>--help</option> option is
given one of the commands below must be present.
given, one of the commands below must be present.</para>
<variablelist>
<varlistentry><term><option>add</option></term>
<listitem><para><literal>add</literal> is used to add a new disc to the
@@ -75,7 +75,6 @@
</listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>

<refsect1><title>Options</title>


+ 1
- 1
doc/apt-config.8.xml View File

@@ -42,7 +42,7 @@
manner that is easy to use by scripted applications.</para>

<para>Unless the <option>-h</option>, or <option>--help</option> option is
given one of the commands below must be present.
given, one of the commands below must be present.
</para>
<variablelist>


+ 7
- 7
doc/apt-ftparchive.1.xml View File

@@ -51,8 +51,8 @@
programs aside from &gzip;. When doing a full generate it automatically
performs file-change checks and builds the desired compressed output files.</para>
<para>Unless the <option>-h</option>, or <option>--help</option> option is given one of the
commands below must be present.</para>
<para>Unless the <option>-h</option>, or <option>--help</option> option is given,
one of the commands below must be present.</para>
<variablelist>
<varlistentry><term><option>packages</option></term>
@@ -141,7 +141,7 @@
<para>
The generate configuration has 4 separate sections, each described below.</para>

<refsect2><title>Dir Section</title>
<refsect2><title><literal>Dir</literal> Section</title>
<para>
The <literal>Dir</literal> section defines the standard directories needed to
locate the files required during the generation process. These
@@ -173,7 +173,7 @@
</variablelist>
</refsect2>
<refsect2><title>Default Section</title>
<refsect2><title><literal>Default</literal> Section</title>
<para>
The <literal>Default</literal> section specifies default values, and settings
that control the operation of the generator. Other sections may override
@@ -239,7 +239,7 @@
</variablelist>
</refsect2>
<refsect2><title>TreeDefault Section</title>
<refsect2><title><literal>TreeDefault</literal> Section</title>
<para>
Sets defaults specific to <literal>Tree</literal> sections. All of these
variables are substitution variables and have the strings $(DIST),
@@ -339,7 +339,7 @@
</variablelist>
</refsect2>
<refsect2><title>Tree Section</title>
<refsect2><title><literal>Tree</literal> Section</title>
<para>
The <literal>Tree</literal> section defines a standard Debian file tree which
consists of a base directory, then multiple sections in that base
@@ -407,7 +407,7 @@ for i in Sections do
</variablelist>
</refsect2>
<refsect2><title>BinDirectory Section</title>
<refsect2><title><literal>BinDirectory</literal> Section</title>
<para>
The <literal>bindirectory</literal> section defines a binary directory tree
with no special structure. The scope tag specifies the location of


+ 4
- 5
doc/apt-mark.8.xml View File

@@ -109,12 +109,11 @@
<variablelist>
<varlistentry>
<term><option>-f=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
<term><option>--file=<filename><replaceable>&synopsis-filename;</replaceable></filename></option></term>
<term><option>-f=&synopsis-param-filename;</option></term>
<term><option>--file=&synopsis-param-filename;</option></term>
<listitem><para>
Read/Write package stats from the filename given with the parameter
<filename><replaceable>&synopsis-filename;</replaceable></filename>
instead of from the default location, which
&synopsis-param-filename; instead of from the default location, which
is <filename>extended_status</filename> in the directory defined
by the Configuration Item: <literal>Dir::State</literal>.</para></listitem>
</varlistentry>
@@ -130,7 +129,7 @@
</refsect1>

<refsect1><title>See Also</title>
<para>&apt-get;,&aptitude;,&apt-conf;</para>
<para><phrase>&apt-get;,&aptitude;,&apt-conf;</phrase></para>
</refsect1>

<refsect1><title>Diagnostics</title>


+ 12
- 0
doc/apt-verbatim.ent View File

@@ -154,6 +154,18 @@
</citerefentry>"
>

<!ENTITY apt-transport-debtorrent "<citerefentry>
<refentrytitle><package>apt-transport-debtorrent</package></refentrytitle>
<manvolnum>1</manvolnum>
</citerefentry>"
>

<!ENTITY regex "<citerefentry>
<refentrytitle><abbrev>regex</abbrev></refentrytitle>
<manvolnum>7</manvolnum>
</citerefentry>"
>

<!-- Boiler plate docinfo section -->
<!ENTITY apt-email "
<address>


+ 2
- 2
doc/apt.ent View File

@@ -103,7 +103,7 @@

<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
<listitem><para>Storage area for package files in transit.
Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended). </para></listitem>
Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
</varlistentry>
">

@@ -144,7 +144,7 @@

<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
<listitem><para>Storage area for state information in transit.
Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended).</para></listitem>
Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>
</varlistentry>
">



+ 2
- 2
doc/makefile View File

@@ -84,12 +84,12 @@ doc: po4a

update-po:
po4a --previous --no-backups --force --no-translations \
--package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf

po4a:
po4a --previous --no-backups \
--package-name='$(PACKAGE)' --package-version='$(PACKAGE_VERSION)' \
--package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \
--msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf
endif



+ 141
- 249
doc/po/apt-doc.pot
File diff suppressed because it is too large
View File


+ 194
- 308
doc/po/de.po
File diff suppressed because it is too large
View File


+ 5
- 4
doc/po4a.conf View File

@@ -4,10 +4,11 @@
# Entities need to be present, even if not translated
[po4a_alias:entity] text opt:"-k 0"
[po4a_alias:manpage] docbook opt:"\
-o untranslated='<term><option> <refname> <refentrytitle> <date> <refentryinfo>' \
-o break='<term><option>' \
-o nodefault='<option> <refname> <refentrytitle> <date> <refentryinfo>' \
-o inline='<para><option> <refentrytitle>'"
-o untranslated='<term><option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <term><command>' \
-o break='<term><option> <term><command>' \
-o nodefault='<option> <refname> <refentrytitle> <date> <refentryinfo> <phrase> <variablelist> <command>' \
-o inline='<para><option> <refentrytitle> <para><command> <programlisting><command> <refentrytitle><command>' \
-o translated='<para><command> <programlisting><command> <refentrytitle><command>'"

# define source file and translated file (one file per line)
[type: man] apt.8 $lang:$lang/apt.$lang.8


+ 11
- 14
doc/sources.list.5.xml View File

@@ -140,24 +140,23 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free

<refsect1><title>URI specification</title>

<para>The currently recognized URI types are cdrom, file, http, ftp, copy,
ssh, rsh.
<para>The currently recognized URI types are:
<variablelist>
<varlistentry><term>file</term>
<varlistentry><term><command>file</command></term>
<listitem><para>
The file scheme allows an arbitrary directory in the file system to be
considered an archive. This is useful for NFS mounts and local mirrors or
archives.</para></listitem>
</varlistentry>
<varlistentry><term>cdrom</term>
<varlistentry><term><command>cdrom</command></term>
<listitem><para>
The cdrom scheme allows APT to use a local CDROM drive with media
swapping. Use the &apt-cdrom; program to create cdrom entries in the
source list.</para></listitem>
</varlistentry>

<varlistentry><term>http</term>
<varlistentry><term><command>http</command></term>
<listitem><para>
The http scheme specifies an HTTP server for the archive. If an environment
variable <envar>http_proxy</envar> is set with the format
@@ -168,7 +167,7 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
Note that this is an insecure method of authentication.</para></listitem>
</varlistentry>

<varlistentry><term>ftp</term>
<varlistentry><term><command>ftp</command></term>
<listitem><para>
The ftp scheme specifies an FTP server for the archive. APT's FTP behavior
is highly configurable; for more information see the
@@ -179,14 +178,14 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
the configuration file will be ignored.</para></listitem>
</varlistentry>

<varlistentry><term>copy</term>
<varlistentry><term><command>copy</command></term>
<listitem><para>
The copy scheme is identical to the file scheme except that packages are
copied into the cache directory instead of used directly at their location.
This is useful for people using a zip disk to copy files around with APT.</para></listitem>
</varlistentry>
<varlistentry><term>rsh</term><term>ssh</term>
<varlistentry><term><command>rsh</command></term><term><command>ssh</command></term>
<listitem><para>
The rsh/ssh method invokes rsh/ssh to connect to a remote host
as a given user and access the files. It is a good idea to do prior
@@ -196,15 +195,13 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
commands to perform the file transfers from the remote.</para></listitem>
</varlistentry>

<varlistentry><term>more recognizable URI types</term>
<varlistentry><term>adding more recognizable URI types</term>
<listitem><para>
APT can be extended with more methods shipped in other optional packages which should
follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which
follow the nameing scheme <package>apt-transport-<replaceable>method</replaceable></package>.
The APT team e.g. maintains also the <package>apt-transport-https</package> package which
provides access methods for https-URIs with features similar to the http method, but other
methods for using e.g. debtorrent are also available, see <citerefentry>
<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
<manvolnum>1</manvolnum></citerefentry>.
methods for using e.g. debtorrent are also available, see &apt-transport-debtorrent;.
</para></listitem>
</varlistentry>
</variablelist>


Loading…
Cancel
Save