summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2015-12-27 18:26:05 +0100
committerGuido Günther <agx@sigxcpu.org>2015-12-27 18:28:02 +0100
commit8e1020d51f5b7064a34b2e22831da466965aab3f (patch)
tree27d5a20c96d35f975fa1dc9862abb62e777db6a3
parent96df9e3c6194c1482da21e9567ec1258d5d79743 (diff)
docs: Move all debian packaging branches into the debian/ namespace
to be consistent with DEP-14
-rw-r--r--docs/chapters/import.sgml23
1 files changed, 2 insertions, 21 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 610e35ec..ca2f927f 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -309,7 +309,8 @@ upstream-tag = v%(version)s
<listitem>
<para>
the &debian; packaging for a release <emphasis>jessie</emphasis>,
- <emphasis>wheezy</emphasis>, <emphasis>sid</emphasis> or <emphasis>experimental</emphasis>.
+ <emphasis>stretch</emphasis>, <emphasis>sid</emphasis>, <emphasis>jessie</emphasis>, <emphasis>jessie-backports</emphasis>, <emphasis>jessie-security</emphasis>
+ or <emphasis>experimental</emphasis>.
</para>
</listitem>
</varlistentry>
@@ -325,26 +326,6 @@ upstream-tag = v%(version)s
</varlistentry>
<varlistentry>
<term>
- security/&lt;release&gt;
- </term>
- <listitem>
- <para>
- security updates for a certain release
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
- backports/&lt;release&gt;
- </term>
- <listitem>
- <para>
- backports to a certain release
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
dfsg/&lt;release&gt;
</term>
<listitem>