Bug 40085 - UCS 4.0-3 manual changes not merged to UCS 4.1 manual
UCS 4.0-3 manual changes not merged to UCS 4.1 manual
Status: CLOSED FIXED
Product: UCS manual
Classification: Unclassified
Component: General
unspecified
Other Linux
: P5 normal (vote)
: UCS 4.1-0-errata
Assigned To: Philipp Hahn
Daniel Tröder
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2015-11-24 18:54 CET by Arvid Requate
Modified: 2016-01-16 21:40 CET (History)
1 user (show)

See Also:
What kind of report is it?: ---
What type of bug is this?: ---
Who will be affected by this bug?: ---
How will those affected feel about the bug?: ---
User Pain:
Enterprise Customer affected?:
School Customer affected?:
ISV affected?:
Waiting Support:
Flags outvoted (downgraded) after PO Review:
Ticket number:
Bug group (optional):
Max CVSS v3 score:


Attachments
Merge.log (3.80 KB, text/plain)
2015-12-14 11:06 CET, Philipp Hahn
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Arvid Requate univentionstaff 2015-11-24 18:54:39 CET
The UCS 4.1 manual doesn't contain a couple of commits at least from errata4.03:


r62168 print-services-de.xml Bug #33000 and Bug #38136 and Bug #37148
r62224 print-services-de.xml Small typos (Bug #37148)
r62250 print-services-de.xml Fix another typo Bug #37148
r62405 print-services-de.xml Bug #37148 doc: print service translation

See steps 11 and 12 in

http://docs.software-univention.de/handbuch-4.0.html#print-services:winclients

which are missing in

http://docs.software-univention.de/handbuch-4.1.html#print-services:winclients



Apparently there is more missing:

r62609 mail-de.xml  Bug #38846: explain auth and anvil limits, move 'High-performance mode' to UCS performance guide, small fixes
r62612 mail-de.xml  Bug #38846 QA: dovecot performance
r62886 mail-de.xml  Bug #38846 doc: Mail performance
Comment 1 Philipp Hahn univentionstaff 2015-12-14 11:04:31 CET
r66310 | Bug #38846 QA: dovecot performance
r66309 | Bug #33000 and Bug #38136 and Bug #37148
r66308 | Bug #39067 doc: univentionFreeAttribute[-0-]1
r66307 | Bug #39118 doc: packetfilter.d
r66306 | Bug #38080 DevDoc: Fix image
r66305 | Bug #38911 doc: EC2 grub config
r66304 | Bug #38193 doc: Fix moved/broken links
Comment 2 Philipp Hahn univentionstaff 2015-12-14 11:06:49 CET
Created attachment 7368 [details]
Merge.log
Comment 3 Arvid Requate univentionstaff 2016-01-13 16:15:48 CET
The english translations are missing:

http://docs.software-univention.de/manual-4.1.html#print-services:winclients

vs

http://docs.software-univention.de/manual-4.0.html#print-services:winclients



I guess this commit is missing:

r62405 | phahn | 2015-07-24 14:54:15 +0200 (Fr, 24. Jul 2015) | 1 Zeile

Bug #37148 doc: print service translation
Comment 4 Philipp Hahn univentionstaff 2016-01-13 21:39:44 CET
(In reply to Arvid Requate from comment #3)
> The english translations are missing:
> http://docs.software-univention.de/manual-4.1.html#print-services:winclients
> vs
> http://docs.software-univention.de/manual-4.0.html#print-services:winclients

This is known and expected, as this bug is not yet QAed and thus the merged manually is not yet available on <http://docs.software-univention.de/>, but only on <http://jenkins.knut.univention.de:8080/job/UCS-4.1/job/Check%20links/ws/webroot/>. 

> I guess this commit is missing:
> r62405 | phahn | 2015-07-24 14:54:15 +0200 (Fr, 24. Jul 2015) | 1 Zeile

See attachment 7368 [details]:
> r62405 1c791a1 Bug #37148 doc: print service translation
> 	MERGED → r66309
Comment 5 Arvid Requate univentionstaff 2016-01-13 23:43:22 CET
Ok

> This is known and expected, as this bug is not yet QAed and thus the merged

Well, it's certainly not known by the customers who read the documentation. I'd rather have it online rather sooner than later.
Comment 6 Daniel Tröder univentionstaff 2016-01-14 20:24:15 CET
r62609 was not completely merged. I merged the rest in r66806.

All other mentioned commits were merged to 4.1.
Comment 7 Arvid Requate univentionstaff 2016-01-14 23:00:05 CET
Ok, what's the procedure now? Janek publishes this as "erratum"?
Comment 8 Philipp Hahn univentionstaff 2016-01-16 08:41:03 CET
(In reply to Arvid Requate from comment #7)
> Ok, what's the procedure now? Janek publishes this as "erratum"?

The procedure is described here: <https://hutten.knut.univention.de/mediawiki/index.php/Hinweise_zur_UCS-Dokumentation>

I re-published all 4.1 documentations while several of them are not yet QA'ed - I'm waiting for that for weeks now - since its easy to re-publish them again easily and the current (non-final) documents are better than the currently published ones.