diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Doxyfile.in | 10 | ||||
| -rw-r--r-- | doc/apt-get.8.xml | 13 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 1 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 9 | ||||
| -rw-r--r-- | doc/po/pl.po | 2 |
5 files changed, 27 insertions, 8 deletions
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 306bab1dc..ffd7c88b9 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -40,7 +40,7 @@ PROJECT_NUMBER = @PACKAGE_VERSION@ # for a project that appears at the top of each page and should give viewer # a quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = +PROJECT_BRIEF = "commandline package manager" # With the PROJECT_LOGO tag one can specify an logo or icon that is # included in the documentation. The maximum height of the logo should not @@ -197,7 +197,7 @@ TAB_SIZE = 8 # will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = "TODO=\todo" # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding @@ -601,7 +601,7 @@ CITE_BIB_FILES = # The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. -QUIET = NO +QUIET = YES # The WARNINGS tag can be used to turn on/off the warning messages that are # generated by doxygen. Possible values are YES and NO. If left blank @@ -748,7 +748,7 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. -INPUT_FILTER = +INPUT_FILTER = "sed -e 's#//[ ]*FIXME:\?#/// \\todo#'" # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. @@ -1287,7 +1287,7 @@ EXTRA_SEARCH_MAPPINGS = # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. -GENERATE_LATEX = YES +GENERATE_LATEX = NO # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 595ea875d..1ed08904e 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -371,7 +371,18 @@ by <command>apt-get source --compile</command> and how cross-builddependencies are satisfied. By default is it not set which means that the host architecture is the same as the build architecture (which is defined by <literal>APT::Architecture</literal>). - Configuration Item: <literal>APT::Get::Host-Architecture</literal> + Configuration Item: <literal>APT::Get::Host-Architecture</literal>. + </para></listitem> + </varlistentry> + + <varlistentry><term><option>-P</option></term> + <term><option>--build-profiles</option></term> + <listitem><para>This option controls the activated build profiles for which + a source package is built by <command>apt-get source --compile</command> and + how build dependencies are satisfied. By default no build profile is active. + More than one build profile can be activated at a time by concatenating them + with a comma. + Configuration Item: <literal>APT::Build-Profiles</literal>. </para></listitem> </varlistentry> diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 6ff45e228..75aa02c8f 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -226,7 +226,6 @@ <!ENTITY stable-codename "wheezy"> <!ENTITY testing-codename "jessie"> <!ENTITY stable-version "7"> -<!ENTITY tanglu-codename "bartholomea"> <!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index bfc43ba29..78f6a27a2 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -177,6 +177,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </para></listitem> </varlistentry> + <varlistentry><term><option>Build-Profiles</option></term> + <listitem><para> + List of all build profiles enabled for build-dependency resolution, + without the "<literal>profile.</literal>" namespace prefix. + By default this list is empty. The <envar>DEB_BUILD_PROFILES</envar> + as used by &dpkg-buildpackage; overrides the list notation. + </para></listitem> + </varlistentry> + <varlistentry><term><option>Default-Release</option></term> <listitem><para>Default release to install packages from if more than one version is available. Contains release name, codename or release version. Examples: 'stable', 'testing', diff --git a/doc/po/pl.po b/doc/po/pl.po index a5e2a7fa8..981dc676c 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -1162,7 +1162,7 @@ msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" -"Nie bierze pod uwagę sugerowanych pakietów jako zależności do instalacji. " +"Uznaje sugerowane pakiety za zależności do instalacji. " "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Suggests</literal>." # |