Re: [Freeipa-devel] [MAN] [PATCH] 0004 Fix phrasing in man page for stageuser.py

2016-03-10 Thread Tomas Babej


On 07/07/2015 08:44 AM, Tomas Babej wrote:
> 
> 
> On 07/04/2015 02:03 PM, Jérôme Fenal wrote:
>> Hi all,
>>
>> A quick patch to the man page part of stageuser to avoid ambiguity in
>> the phrasing, spotted while translating the page.
>>
>> Regards,
>>
>> J.
>>
>>
>>
> 
> Thanks, ACK.
> 
> I will not push this patch to master until we branch off 4.2 development
> branch as it would disrupt already translated strings in the other
> languages.
> 
> Tomas
> 

One could say the condition has been fulfilled, so let's follow up on
that promise:

Pushed to master: 0e4e5cbddd349300340fd4a2fb19e8505f57b47d

Tomas

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code


Re: [Freeipa-devel] [MAN] [PATCH] 0004 Fix phrasing in man page for stageuser.py

2015-07-06 Thread Tomas Babej


On 07/04/2015 02:03 PM, Jérôme Fenal wrote:
> Hi all,
> 
> A quick patch to the man page part of stageuser to avoid ambiguity in
> the phrasing, spotted while translating the page.
> 
> Regards,
> 
> J.
> 
> 
> 

Thanks, ACK.

I will not push this patch to master until we branch off 4.2 development
branch as it would disrupt already translated strings in the other
languages.

Tomas

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code


[Freeipa-devel] [MAN] [PATCH] 0004 Fix phrasing in man page for stageuser.py

2015-07-04 Thread Jérôme Fenal
Hi all,

A quick patch to the man page part of stageuser to avoid ambiguity in
the phrasing, spotted while translating the page.

Regards,

J.
-- 
Jérôme Fenal
From f43c8358afceb4c8c35cbb800553dd3247905095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Fenal?= 
Date: Sat, 4 Jul 2015 13:56:24 +0200
Subject: [PATCH] Fix the man page part for shorter sentences, to avoid dual understanding, and
 punctuation, all spotted while translating to French.

---
 ipalib/plugins/stageuser.py |   26 +-
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py
index 35e636ded4474b00ad635c60340aaf66e6b41752..0b42eae437bc1e85a5d3880dd071fd83c6bde3fe 100644
--- a/ipalib/plugins/stageuser.py
+++ b/ipalib/plugins/stageuser.py
@@ -50,24 +50,24 @@ Manage stage user entries.
 
 Stage user entries are directly under the container: "cn=stage users,
 cn=accounts, cn=provisioning, SUFFIX".
-User can not authenticate with those entries (even if the entries
-contain credentials) and are candidate to become Active entries.
+Users can not authenticate with those entries (even if the entries
+contain credentials). Those entries are only candidate to become Active entries.
 
 Active user entries are Posix users directly under the container: "cn=accounts, SUFFIX".
-User can authenticate with Active entries, at the condition they have
-credentials
+Users can authenticate with Active entries, at the condition they have
+credentials.
 
-Delete user enties are Posix users directly under the container: "cn=deleted users,
+Deleted user entries are Posix users directly under the container: "cn=deleted users,
 cn=accounts, cn=provisioning, SUFFIX".
-User can not authenticate with those entries (even if the entries contain credentials)
+Users can not authenticate with those entries, even if the entries contain credentials.
 
-The stage user container contains entries
-- created by 'stageuser-add' commands that are Posix users
-- created by external provisioning system
+The stage user container contains entries:
+- created by 'stageuser-add' commands that are Posix users,
+- created by external provisioning system.
 
-A valid stage user entry MUST:
-- entry RDN is 'uid'
-- ipaUniqueID is 'autogenerate'
+A valid stage user entry MUST have:
+- entry RDN is 'uid',
+- ipaUniqueID is 'autogenerate'.
 
 IPA supports a wide range of username formats, but you need to be aware of any
 restrictions that may apply to your particular environment. For example,
@@ -81,7 +81,7 @@ EXAMPLES:
  Add a new stageuser:
ipa stageuser-add --first=Tim --last=User --password tuser1
 
- Add a stageuser from the Delete container
+ Add a stageuser from the deleted users container:
ipa stageuser-add  --first=Tim --last=User --from-delete tuser1
 
 """)
-- 
1.7.1

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code