Inderdiff:
diff --git a/roles/ganeti-doc/files/srv/docs-src/index.rst
b/roles/ganeti-doc/files/srv/docs-src/index.rst
index 9f3b51e..61d64b0 100644
--- a/roles/ganeti-doc/files/srv/docs-src/index.rst
+++ b/roles/ganeti-doc/files/srv/docs-src/index.rst
@@ -26,10 +26,10 @@ Select the link pointing to the resource you'd like to
view.
| | 2.7 | :doc:`doc <2.7>` | :hapi:`Haskell
<2.7>`, :papi:`Python <2.7>` | :man:`man <2.7>` |
|
+-------------+---------------------+----------------------------------------------------+---------------------+
| | 2.6 | :doc:`doc <2.6>` | :hapi:`Haskell
<2.6>`, :papi:`Python <2.6>` | :man:`man <2.6>` |
-+-------------------+-------------+---------------------+----------------------------------------------------+---------------------+
-| Unmaintained | 2.5 | :doc:`doc <2.5>` | :hapi:`Haskell
<2.5>`, :papi:`Python <2.5>` | :man:`man <2.5>` |
|
+-------------+---------------------+----------------------------------------------------+---------------------+
-| | 2.4 | :doc:`doc <2.4>` |
:api:`Python <2.4>` | :man:`man <2.4>` |
+| | 2.5 | :doc:`doc <2.5>` | :hapi:`Haskell
<2.5>`, :papi:`Python <2.5>` | :man:`man <2.5>` |
++-------------------+-------------+---------------------+----------------------------------------------------+---------------------+
+| Unmaintained | 2.4 | :doc:`doc <2.4>` |
:api:`Python <2.4>` | :man:`man <2.4>` |
|
+-------------+---------------------+----------------------------------------------------+---------------------+
| | 2.3 | :doc:`doc <2.3>` |
:api:`Python <2.3>` | :man:`man <2.3>` |
|
+-------------+---------------------+----------------------------------------------------+---------------------+
On Thu, Feb 20, 2014 at 3:43 PM, Michele Tartara <[email protected]>wrote:
> On Thu, Feb 20, 2014 at 2:43 PM, Michele Tartara <[email protected]>
> wrote:
> > On Thu, Feb 20, 2014 at 2:21 PM, Thomas Thrainer <[email protected]>
> wrote:
> >> Signed-off-by: Thomas Thrainer <[email protected]>
> >> ---
> >> roles/ganeti-doc/files/srv/docs-src/index.rst | 14 +++++++-------
> >> 1 file changed, 7 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/roles/ganeti-doc/files/srv/docs-src/index.rst
> b/roles/ganeti-doc/files/srv/docs-src/index.rst
> >> index de0a9c5..9f3b51e 100644
> >> --- a/roles/ganeti-doc/files/srv/docs-src/index.rst
> >> +++ b/roles/ganeti-doc/files/srv/docs-src/index.rst
> >> @@ -17,19 +17,19 @@ Select the link pointing to the resource you'd like
> to view.
> >>
>
> +-------------------+-------------+---------------------+----------------------------------------------------+---------------------+
> >> | Alpha | 2.11 | :doc:`doc <2.11>` |
> :hapi:`Haskell <2.11>`, :papi:`Python <2.11>` | :man:`man <2.11>` |
> >>
>
> +-------------------+-------------+---------------------+----------------------------------------------------+---------------------+
> >> -| RC | 2.10 | :doc:`doc <2.10>` |
> :hapi:`Haskell <2.10>`, :papi:`Python <2.10>` | :man:`man <2.10>` |
> >> +| :green:`Stable` | **2.10** | :doc:`doc <2.10>` |
> :hapi:`Haskell <2.10>`, :papi:`Python <2.10>` | :man:`man <2.10>` |
> >>
>
> +-------------------+-------------+---------------------+----------------------------------------------------+---------------------+
> >> -| :green:`Stable` | **2.9** | :doc:`doc <2.9>` |
> :hapi:`Haskell <2.9>`, :papi:`Python <2.9>` | :man:`man <2.9>` |
> >>
> -+-------------------+-------------+---------------------+----------------------------------------------------+---------------------+
> >> -| Bug fixes | 2.8 | :doc:`doc <2.8>` |
> :hapi:`Haskell <2.8>`, :papi:`Python <2.8>` | :man:`man <2.8>` |
> >> +| Bug fixes | 2.9 | :doc:`doc <2.9>` |
> :hapi:`Haskell <2.9>`, :papi:`Python <2.9>` | :man:`man <2.9>` |
> >> | only
>
> +-------------+---------------------+----------------------------------------------------+---------------------+
> >> +| | 2.8 | :doc:`doc <2.8>` |
> :hapi:`Haskell <2.8>`, :papi:`Python <2.8>` | :man:`man <2.8>` |
> >> +|
> +-------------+---------------------+----------------------------------------------------+---------------------+
> >> | | 2.7 | :doc:`doc <2.7>` |
> :hapi:`Haskell <2.7>`, :papi:`Python <2.7>` | :man:`man <2.7>` |
> >> |
> +-------------+---------------------+----------------------------------------------------+---------------------+
> >> | | 2.6 | :doc:`doc <2.6>` |
> :hapi:`Haskell <2.6>`, :papi:`Python <2.6>` | :man:`man <2.6>` |
> >> -|
> +-------------+---------------------+----------------------------------------------------+---------------------+
> >> -| | 2.5 | :doc:`doc <2.5>` |
> :hapi:`Haskell <2.5>`, :papi:`Python <2.5>` | :man:`man <2.5>` |
> >>
>
> +-------------------+-------------+---------------------+----------------------------------------------------+---------------------+
> >> -| Unmaintained | 2.4 | :doc:`doc <2.4>` |
> :api:`Python <2.4>` | :man:`man <2.4>` |
> >> +| Unmaintained | 2.5 | :doc:`doc <2.5>` |
> :hapi:`Haskell <2.5>`, :papi:`Python <2.5>` | :man:`man <2.5>` |
> >> +|
> +-------------+---------------------+----------------------------------------------------+---------------------+
> >> +| | 2.4 | :doc:`doc <2.4>` |
> :api:`Python <2.4>` | :man:`man <2.4>` |
> >> |
> +-------------+---------------------+----------------------------------------------------+---------------------+
> >> | | 2.3 | :doc:`doc <2.3>` |
> :api:`Python <2.3>` | :man:`man <2.3>` |
> >> |
> +-------------+---------------------+----------------------------------------------------+---------------------+
> >> --
> >> 1.9.0.rc1.175.g0b1dcb5
> >>
> >
> > LGTM, thanks.
> > Michele
>
> Actually, NACK. The change of 2.9 from stable to "Bug fix only" is ok,
> but moving 2.5 to unmaintained is not.
> It's the version that is in Debian Stable, so we want to keep supporting
> it.
>
> Please, send an up to date version of this change.
>
> Thanks,
> Michele
>
> --
> Google Germany GmbH
> Dienerstr. 12
> 80331 München
>
> Registergericht und -nummer: Hamburg, HRB 86891
> Sitz der Gesellschaft: Hamburg
> Geschäftsführer: Graham Law, Christine Elizabeth Flores
>
--
Thomas Thrainer | Software Engineer | [email protected] |
Google Germany GmbH
Dienerstr. 12
80331 München
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores
