[Freeipa-devel] [PATCH] 116 Improve man pages structure

Martin Kosek mkosek at redhat.com
Tue Sep 6 06:51:05 UTC 2011


On Mon, 2011-09-05 at 19:16 +0300, Alexander Bokovoy wrote:
> Hi Martin,
> 
> On 05.09.2011 12:29, Martin Kosek wrote:
> > There are too many options in ipa-*-install scripts which makes it
> > difficult to read. This patch adds subsections to install script
> > online help and man pages to improve readability. No option has
> > been changed.
> > 
> > To further improve man pages:
> > 
> > 1) All man pages were changed to have the same header and top-center
> >    title to provide united look.
> > 
> > 2) Few typos in man pages have been fixed
> > 
> > https://fedorahosted.org/freeipa/ticket/1687
> I'm checking these (116-119) patches against ipa-2-1 tree and there are
> few conflicts:
> 
> PATCH freeipa-mkosek-116-improve-man-pages-structure.patch
> ....
> patching file install/tools/man/ipa-server-install.1
> Hunk #1 FAILED at 16.
> 1 out of 4 hunks FAILED -- saving rejects to file
> install/tools/man/ipa-server-install.1.rej
> 
> 
> PATCH freeipa-mkosek-118-fix-permissions-in-installers.patch
> patching file install/tools/ipa-server-install
> Hunk #1 succeeded at 820 (offset 14 lines).
> patching file ipa-client/ipa-install/ipa-client-install
> Hunk #1 succeeded at 345 (offset 15 lines).
> Hunk #2 succeeded at 521 (offset 15 lines).
> patching file ipaserver/install/dsinstance.py
> patching file ipaserver/install/httpinstance.py
> patching file ipaserver/install/krbinstance.py
> Hunk #1 succeeded at 316 with fuzz 2 (offset 34 lines).
> Hunk #2 FAILED at 303.
> 1 out of 2 hunks FAILED -- saving rejects to file
> ipaserver/install/krbinstance.py.rej
> 
> 
> Could you please re-base these two?
> 

Sending also an ipa-2-1 patch.

I usually develop patches for master branch only when there are only
slight differences so that I can rebase for ipa-2-1 just once - after
the patch is acked.

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: freeipa-mkosek-116-ipa-2-1.patch
Type: text/x-patch
Size: 49289 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20110906/77fcf552/attachment.bin>


More information about the Freeipa-devel mailing list