Attachment 5661 Details for Bug 33483

[patch] Updates v2

33483_docbook-320-update.xml (text/plain), 7.11 KB, created by Philipp Hahn on 2013-11-20 13:07 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2013-11-20 13:07 CET

Size: 7.11 KB

patch

obsolete

>diff --git a/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-de.ent b/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-de.ent
>index 9d2fa66..cf1ccca 100644
>--- a/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-de.ent
>+++ b/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-de.ent
>@@ -24,6 +24,6 @@
> 
>   <!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  ucsbug                 "https://forge.univention.org/bugzilla/show_bug.cgi?id=" >
>diff --git a/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-en.ent b/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-en.ent
>index 956b928..3bac8ac 100644
>--- a/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-en.ent
>+++ b/branches/ucs-3.2/doc-common/docbook/stylesheets/macros-en.ent
>@@ -24,6 +24,6 @@
> 
>   <!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  ucsbug                 "https://forge.univention.org/bugzilla/show_bug.cgi?id=" >
>diff --git a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/apps/app.xml b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/apps/app.xml
>index 2127736..4a30568 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/apps/app.xml
>+++ b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/apps/app.xml
>@@ -141,7 +141,7 @@
> 			application! To workaround this issue, the vendor has to do the
> 			following: In a first step he has to grab the packages from the
> 			unmaintained repository (see for example <ulink
>-				url="http://apt.software-univention.de/3.1/unmaintained/" />) and
>+				url="http://apt.software-univention.de/3.2/unmaintained/" />) and
> 			bundle it with his own packages so that they are put into the app's own
> 			repository. In a second step he should inform Univention about these
> 			packages. We will probably move them into maintained so that this
>diff --git a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/packaging/packaging.xml b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/packaging/packaging.xml
>index d85ba44..41b8936 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/packaging/packaging.xml
>+++ b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/packaging/packaging.xml
>@@ -67,7 +67,7 @@ cd work/
> 						<para>Checkout example package from Univention Subversion</para>
> 						<programlisting><![CDATA[
> 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/
> 							]]></programlisting>
> 					</step>
>@@ -395,7 +395,7 @@ install -m644 -t "$WWW_BASE/$TESTCOMP" *.deb
> 		<para>
> 			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>:
> 		</para>
>-		<programlisting>deb http://repository.server/repository/3.1/maintained/component testcomp/all/</programlisting>
>+		<programlisting>deb http://repository.server/repository/3.2/maintained/component testcomp/all/</programlisting>
> 		<note>
> 			<para>
> 				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.
>diff --git a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/udm/udm.xml b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/udm/udm.xml
>index 77cb5d8..ef2e38f 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/udm/udm.xml
>+++ b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/udm/udm.xml
>@@ -157,7 +157,7 @@ udm container/ou delete --dn "cn=xxx,$ldap_base"
> 		</para>
> 		<para>
> 			The module <literal>settings/extended_attribute</literal> requires many parameters.
>-			They are described in <olink targetdoc="manual-3.1-1" targetptr="central:extendedattrs"/>.
>+			They are described in <olink targetdoc="ucs-3.2-0" targetptr="central:extendedattrs"/>.
> 		</para>
> 		<variablelist>
> 			<varlistentry><term><literal>name</literal> (required)</term>
>@@ -906,7 +906,7 @@ udm settings/extended_attribute modify \
> 			</para>
> 			<para>
> 				Since UCR variables only affect the local system, the variables must be set on all systems were <acronym>UDM</acronym> is used.
>-				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.
>+				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.
> 			</para>
> 		</section>
> 
>diff --git a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/umc.xml b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/umc.xml
>index 2419256..fa60a96 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/umc.xml
>+++ b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/umc.xml
>@@ -100,7 +100,7 @@ Icons: umc/icons
> 			</para>
> 			<programlisting><![CDATA[
> <?xml version="1.0" encoding="UTF-8"?>
>-
>+
> <umc version="2.0">
> 	<module id="udm" icon="udm-MODULE" version="1.0" translationId="MODULE">
> 		<name>...</name>
>diff --git a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/updater.xml b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/updater.xml
>index 38f6046..eaa8afb 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/updater.xml
>+++ b/branches/ucs-3.2/ucs-3.2-0/doc/developer-reference/updater.xml
>@@ -34,7 +34,7 @@
> 			Only at the end of a successful update are the &ucsUCRV;s updated.
> 		</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.
> 		</para>
> 	</section>

Actions: View | Diff

Attachments on bug 33483: 5660 | 5661