Attachment #5661 for bug #33483

View | Details | Raw Unified | Return to bug 33483
Collapse All | Expand All

(-)a/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-de.ent (-1 / +1 lines)

Lines 24-29	Link Here

  <!ENTITY  ar                     "-&gt;" >

  <!ENTITY  ar                     "-&gt;" >

  <!ENTITY  websvn                 "http://forge.univention.org/svn/dev/branches/ucs-3.1/ucs-3.1-2/" >

  <!ENTITY  websvn                 "http://forge.univention.org/svn/dev/branches/ucs-3.2/ucs-3.2-0/" >

  <!ENTITY  webdoc                 "http://docs.univention.de/" >

  <!ENTITY  webdoc                 "http://docs.univention.de/" >

  <!ENTITY  ucsbug                 "https://forge.univention.org/bugzilla/show_bug.cgi?id=" >

  <!ENTITY  ucsbug                 "https://forge.univention.org/bugzilla/show_bug.cgi?id=" >

(-)a/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-en.ent (-1 / +1 lines)

Lines 24-29	Link Here

  <!ENTITY  ar                     "-&gt;" >

  <!ENTITY  ar                     "-&gt;" >

  <!ENTITY  websvn                 "http://forge.univention.org/svn/dev/branches/ucs-3.1/ucs-3.1-2/" >

  <!ENTITY  websvn                 "http://forge.univention.org/svn/dev/branches/ucs-3.2/ucs-3.2-0/" >

  <!ENTITY  webdoc                 "http://docs.univention.de/" >

  <!ENTITY  webdoc                 "http://docs.univention.de/" >

  <!ENTITY  ucsbug                 "https://forge.univention.org/bugzilla/show_bug.cgi?id=" >

  <!ENTITY  ucsbug                 "https://forge.univention.org/bugzilla/show_bug.cgi?id=" >

(-)a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/apps/app.xml (-1 / +1 lines)

Lines 141-147	Link Here

141

			application! To workaround this issue, the vendor has to do the

141

			application! To workaround this issue, the vendor has to do the

142

			following: In a first step he has to grab the packages from the

142

			following: In a first step he has to grab the packages from the

143

			unmaintained repository (see for example <ulink

143

			unmaintained repository (see for example <ulink

144

				url="http://apt.software-univention.de/3.1/unmaintained/" />) and

144

				url="http://apt.software-univention.de/3.2/unmaintained/" />) and

145

			bundle it with his own packages so that they are put into the app's own

145

			bundle it with his own packages so that they are put into the app's own

146

			repository. In a second step he should inform Univention about these

146

			repository. In a second step he should inform Univention about these

147

			packages. We will probably move them into maintained so that this

147

			packages. We will probably move them into maintained so that this

(-)a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/packaging/packaging.xml (-2 / +2 lines)

Lines 67-73 cd work/	Link Here

						<para>Checkout example package from Univention Subversion</para>

						<para>Checkout example package from Univention Subversion</para>

						<programlisting><![CDATA[

						<programlisting><![CDATA[

SERVER=http://forge.univention.org

SERVER=http://forge.univention.org

svn co $SERVER/svn/dev/branches/ucs-3.1/ucs-3.1-2/base/univention-ssh

svn co $SERVER/svn/dev/branches/ucs-3.2/ucs-3.2-0/base/univention-ssh

cd univention-ssh/

cd univention-ssh/

							]]></programlisting>

							]]></programlisting>

					</step>

					</step>

Lines 395-401 install -m644 -t "$WWW_BASE/$TESTCOMP" *.deb	Link Here

395

		<para>

395

		<para>

396

			This repository can be included on any UCS system by appending the following line to <filename>/etc/apt/sources.list</filename>, assuming the <acronym>FQDN</acronym> of the host providing the repository is named <replaceable>repository.server</replaceable>:

396

			This repository can be included on any UCS system by appending the following line to <filename>/etc/apt/sources.list</filename>, assuming the <acronym>FQDN</acronym> of the host providing the repository is named <replaceable>repository.server</replaceable>:

397

		</para>

397

		</para>

398

		<programlisting>deb http://repository.server/repository/3.1/maintained/component testcomp/all/</programlisting>

398

		<programlisting>deb http://repository.server/repository/3.2/maintained/component testcomp/all/</programlisting>

399

		<note>

399

		<note>

400

			<para>

400

			<para>

401

				It is important that the directory, from were the <command>apt-ftparchive</command> command is invoked, matches the first string given in the <filename>sources.list</filename> file after the <literal>deb</literal> prefix.

401

				It is important that the directory, from were the <command>apt-ftparchive</command> command is invoked, matches the first string given in the <filename>sources.list</filename> file after the <literal>deb</literal> prefix.

(-)a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/udm/udm.xml (-2 / +2 lines)

Lines 157-163 udm container/ou delete --dn "cn=xxx,$ldap_base"	Link Here

157

		</para>

157

		</para>

158

		<para>

158

		<para>

159

			The module <literal>settings/extended_attribute</literal> requires many parameters.

159

			The module <literal>settings/extended_attribute</literal> requires many parameters.

160

			They are described in <olink targetdoc="manual-3.1-1" targetptr="central:extendedattrs"/>.

160

			They are described in <olink targetdoc="ucs-3.2-0" targetptr="central:extendedattrs"/>.

161

		</para>

161

		</para>

162

		<variablelist>

162

		<variablelist>

163

			<varlistentry><term><literal>name</literal> (required)</term>

163

			<varlistentry><term><literal>name</literal> (required)</term>

Lines 906-912 udm settings/extended_attribute modify \	Link Here

906

			</para>

906

			</para>

907

			<para>

907

			<para>

908

				Since UCR variables only affect the local system, the variables must be set on all systems were <acronym>UDM</acronym> is used.

908

				Since UCR variables only affect the local system, the variables must be set on all systems were <acronym>UDM</acronym> is used.

909

				This can be either done through a &ucsUCR; policy (see <olink targetdoc="manual-3.1-1" targetptr="central:policies"/>) or by setting the variable in the <filename>.postinst</filename> script of some package, which is installed on all hosts.

909

				This can be either done through a &ucsUCR; policy (see <olink targetdoc="ucs-3.2-0" targetptr="central:policies"/>) or by setting the variable in the <filename>.postinst</filename> script of some package, which is installed on all hosts.

910

			</para>

910

			</para>

911

		</section>

911

		</section>

912

(-)a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/umc.xml (-1 / +1 lines)

Lines 100-106 Icons: umc/icons	Link Here

100

			</para>

100

			</para>

101

			<programlisting><![CDATA[

101

			<programlisting><![CDATA[

102

<?xml version="1.0" encoding="UTF-8"?>

102

<?xml version="1.0" encoding="UTF-8"?>

103

<!--DOCTYPE umc SYSTEM "branches/ucs-3.1/ucs/management/univention-management-console/doc/module.dtd"-->

103

<!--DOCTYPE umc SYSTEM "branches/ucs-3.2/ucs/management/univention-management-console/doc/module.dtd"-->

104

<umc version="2.0">

104

<umc version="2.0">

105

	<module id="udm" icon="udm-MODULE" version="1.0" translationId="MODULE">

105

	<module id="udm" icon="udm-MODULE" version="1.0" translationId="MODULE">

106

		<name>...</name>

106

		<name>...</name>

(-)a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/updater.xml (-1 / +1 lines)

Lines 34-40	Link Here

			Only at the end of a successful update are the &ucsUCRV;s updated.

			Only at the end of a successful update are the &ucsUCRV;s updated.

		</para>

		</para>

		<para>

		<para>

			Additional components can be added as separate repositories using &ucsUCRV;s <envar>repository/online/component/…</envar>, which are described in <olink targetdoc="manual-3.1-1" targetptr="computers::softwaremanagement::repoadd"/> manual.

			Additional components can be added as separate repositories using &ucsUCRV;s <envar>repository/online/component/…</envar>, which are described in <olink targetdoc="ucs-3.2-0" targetptr="computers::softwaremanagement::repoadd"/> manual.

			Setting the variable <envar>…/version=current</envar> can be used to mark a component as required, which blocks an upgrade until the component is available for the new release.

			Setting the variable <envar>…/version=current</envar> can be used to mark a component as required, which blocks an upgrade until the component is available for the new release.

		</para>

		</para>

	</section>

	</section>

Return to bug 33483