@ -759,13 +759,6 @@ build</link> of a module directly from the command line, when you only need
to update part of a module.
to update part of a module.
</para></listitem>
</para></listitem>
<listitem><para>
&kdesvn-build; will automatically download and create the required <filename class="directory">/admin</filename>
directory for a module if it is not downloaded from &subversion; the first time for
some reason. This only applies to &kde; 3 modules, as /admin is not required
for qt-copy or &kde; 4 modules.
</para></listitem>
<listitem><para>
<listitem><para>
&kdesvn-build; will show the <link linkend="build-progress">progress of your
&kdesvn-build; will show the <link linkend="build-progress">progress of your
build</link> when using &cmake;, and will always time the build
build</link> when using &cmake;, and will always time the build
@ -1081,8 +1074,8 @@ may use the tilde (~) for any paths you add using this option.</para>
<entry>Overrides global</entry>
<entry>Overrides global</entry>
<entry><para>Set this option to checkout from a branch of &kde; instead of the
<entry><para>Set this option to checkout from a branch of &kde; instead of the
default of <replaceable>trunk</replaceable>, where &kde; development occurs.
default of <replaceable>trunk</replaceable>, where &kde; development occurs.
For instance, to checkout &kde; 4.4 branch, you would set this option to
For instance, to checkout &kde; 4.5 branch, you would set this option to
<replaceable>4.4 </replaceable>.</para>
<replaceable>4.5 </replaceable>.</para>
<para>If &kdesvn-build; fails to properly download a branch with this option, you
<para>If &kdesvn-build; fails to properly download a branch with this option, you
may have to manually specify the &url; to download from using the <link
may have to manually specify the &url; to download from using the <link
linkend="conf-module-base-path">module-base-path</link> or <link
linkend="conf-module-base-path">module-base-path</link> or <link
@ -2263,7 +2256,7 @@ option for a module, which will specify a list of directories to download.
<tip><para>
<tip><para>
If you do not already know what to download from a module, it may be a good idea
If you do not already know what to download from a module, it may be a good idea
to browse the &subversion; layout for a module first, using
to browse the &subversion; layout for a module first, using
<ulink url="http://websvn.kde.org/branches/KDE/4.4 /">WebSVN</ulink>.
<ulink url="http://websvn.kde.org/branches/KDE/4.5 /">WebSVN</ulink>.
</para></tip>
</para></tip>
<informalexample>
<informalexample>
@ -2378,21 +2371,21 @@ and &kdesvn-build; will try to determine the appropriate location within the
well.</para>
well.</para>
<informalexample>
<informalexample>
<para>To download kdelibs from &kde; 4.4 (which is simply known as the 4.4 branch):
<para>To download kdelibs from &kde; 4.5 (which is simply known as the 4.5 branch):
</para>
</para>
<screen>
<screen>
module kdelibs
module kdelibs
branch <replaceable>4.4 </replaceable>
branch <replaceable>4.5 </replaceable>
# other options...
# other options...
end module
end module
</screen>
</screen>
<para>Or, to download kdemultimedia as it was released with &kde; 4.4.3 :</para>
<para>Or, to download kdemultimedia as it was released with &kde; 4.5.1 :</para>
<screen>
<screen>
module kdemultimedia
module kdemultimedia
tag <replaceable>4.4.3 </replaceable>
tag <replaceable>4.5.1 </replaceable>
# other options...
# other options...
end module
end module
</screen>
</screen>
@ -2422,32 +2415,31 @@ can figure out the appropriate middle part by itself. When it cannot, you can us
<informalexample>
<informalexample>
<screen>
<screen>
module qt-copy
module kdesupport
# branch does not work here yet
# kdesupport supports various tags to easily organize the required
module-base-path branches/qt/4.4
# software for a given KDE Platform release.
module-base-path tags/kdesupport-for-4.5
end module
end module
</screen>
</screen>
<para>This would cause &kdesvn-build; to download qt-copy from (in this example),
<para>This would cause &kdesvn-build; to download kdesupport from (in this example),
<filename>svn://anonsvn.kde.org/home/kde/<replaceable>branches/qt/4.4</replaceable>/qt-copy </filename>.
<filename>svn://anonsvn.kde.org/home/kde/<replaceable>tags/kdesupport-for-4.5</replaceable> </filename>.
</para>
</para>
</informalexample>
</informalexample>
<tip><para>In previous versions of &kdesvn-build;, the &module-base-path; was
handled differently. If you encounter trouble using an old module-base-path
definition perhaps you should verify that the actual path is as &kdesvn-build;
expects by using the <link linkend="cmdline-pretend">--pretend</link> option.
</para></tip>
</listitem>
</listitem>
<listitem><para>The &override-url; option, on the other hand, requires you to
<listitem><para>The &override-url; option, on the other hand, requires you to
specify the exact path to download from. However, this allows you to pull from
specify the exact path to download from. However, this allows you to pull from
paths that &kdesvn-build; would have no hope of downloading from.
paths that previous versions of &kdesvn-build; would have no hope of downloading from.
Currently, the &module-base-path; option should be sufficient for any Subversion
source URL.
</para>
</para>
<informalexample>
<screen>
module qt-copy
# Specify exact path to grab.
override-url svn://anonsvn.kde.org/home/kde/branches/qt/4.4/qt-copy
end module
</screen>
</informalexample>
<important><para>
<important><para>
&kdesvn-build; will not touch or correct the value you specify for &override-url;
&kdesvn-build; will not touch or correct the value you specify for &override-url;
at all, so if you change your &svn-server; setting, you may need to update this
at all, so if you change your &svn-server; setting, you may need to update this