Re: [Tails-dev] merge doc-rework soon?

El 14/05/11 19:56, sajolida escribió:
> El 14/05/11 11:45, intrigeri escribió:
>> Hi!
>>
>> For various reasons I'd like to avoid the doc-rework branch diverging
>> too much from the currently online website. I'm happy to see the
>> rework process was conducted in an incremental way. I think the
>> current state of doc-rework is not far from being mergeable.
>>
>> A plan could be:
>>
>> 1. Get it fixed wrt. my last pile of comments [? weeks].
>
> I'll do that this week.

I'm done processing the pile of comments I received. The work on the
About and Overview page was the last thing I really wanted to do before
the merge.

>> 2. Have doc-rework reviewed by a few of us [1 week].
>> (Optional: 2.1. Give translators some time to translate doc-rework;
>> technically, this will need to be done using Git + PO editor only
>> as we have no ikiwiki setup built from doc-rework. I wonder if we
>> want to insert this step at all actually. Thoughts?)
>> 3. Merge doc-rework into master.
>> 4. Move on to shiny new doc reworking!
>>
>> sajolida, others: how does this sound to you ear?
>
> Sounds good to me. It would be nice to have this first round,
> corresponding to "What is Tails" + "Getting Tails" + general structure,
> merged by the beginning of June.
>
> Regarding the translations they could as well be started after the
> merge. That would avoid forcing them to use Git and to deal with too
> many last-minute commits.

From my side I'm ready for the merge. The original the plan included
"reviews by a few of us [1 week]". This didn't happen but I'd still move on.

--
sajolida