aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Zobel-Helas <zobel>2011-02-04 18:53:12 +0000
committerMartin Zobel-Helas <zobel>2011-02-04 18:53:12 +0000
commit0a1fecd715f620775b0f1d559fd61cfe78201000 (patch)
treebd580c6e5bf8a9acc4f73bfd6d3d45f12b2b825e
parentcfd36dd4e88dd28fa0cb3e488eab55d87d8d4f5b (diff)
fix my mess
CVS version numbers english/support.wml: 1.64 -> 1.65 english/devel/debian-installer/svn.wml: 1.21 -> 1.22
-rw-r--r--english/devel/debian-installer/svn.wml12
-rw-r--r--english/support.wml1
2 files changed, 2 insertions, 11 deletions
diff --git a/english/devel/debian-installer/svn.wml b/english/devel/debian-installer/svn.wml
index c1cf5626e46..ce0c90a54e0 100644
--- a/english/devel/debian-installer/svn.wml
+++ b/english/devel/debian-installer/svn.wml
@@ -2,16 +2,6 @@
#use wml::debian::recent_list
<p>
-<<<<<<< svn.wml
-The information that used to be here has moved to the Debian Wiki.
-To check out the source code for Debian-Installer, see
-<a href="http://wiki.debian.org/DebianInstaller/CheckOut">here</a>;
-for general contributor information, see
-<a href="http://wiki.debian.org/DebianInstaller/Contrib">here</a>;
-for information on building the installer yourself, see
-<a href="http://wiki.debian.org/DebianInstaller/Build">here</a>.
-
-=======
The information that used to be here has moved to the Debian wiki:
<a href="http://wiki.debian.org/DebianInstaller/CheckOut">checking
out the source code for Debian-Installer</a>,
@@ -20,4 +10,4 @@ contributor information</a>, and
<a href="http://wiki.debian.org/DebianInstaller/Build">building
the installer yourself</a>.
</p>
->>>>>>> 1.20
+
diff --git a/english/support.wml b/english/support.wml
index 53e0370b12a..138717c3880 100644
--- a/english/support.wml
+++ b/english/support.wml
@@ -5,6 +5,7 @@
<h2>%body</h2>
</define-tag>
+<toc-display />
<toc-add-entry name="doc" href="doc/">Documentation</toc-add-entry>
<p>Before searching for support from someone else, it's usually good to try

© 2014-2024 Faster IT GmbH | imprint | privacy policy