java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 11 +++----- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 13 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 8318f7ac448672c9a2e80070d3bafc1cc98dd426 Author: Tomas Lestach tlestach@redhat.com Date: Fri Mar 16 10:46:09 2012 +0100
726114 - update createOrUpradePath api documentation
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java index 85f1025..957b6be 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java @@ -380,9 +380,9 @@ public class ConfigChannelHandler extends BaseHandler { * #struct("path info") * #prop_desc("string","contents", * "Contents of the file (text or base64 encoded if binary). - * (ignored for directories)") + * (only for non-directories)") * #prop_desc("boolean","contents_enc64", "Identifies base64 encoded content - * (default: disabled).") + * (default: disabled, only for non-directories)") * #prop_desc("string", "owner", "Owner of the file/directory.") * #prop_desc("string", "group", "Group name of the file/directory.") * #prop_desc("string", "permissions", @@ -390,13 +390,12 @@ public class ConfigChannelHandler extends BaseHandler { * #prop_desc("string", "selinux_ctx", "SELinux Security context (optional)") * #prop_desc("string", "macro-start-delimiter", * "Config file macro start delimiter. Use null or empty - * string to accept the default. (ignored if working with a - * directory)") + * string to accept the default. (only for non-directories)") * #prop_desc("string", "macro-end-delimiter", * "Config file macro end delimiter. Use null or - * empty string to accept the default. (ignored if working with a directory)") + * empty string to accept the default. (only for non-directories)") * #prop_desc("int", "revision", "next revision number, auto increment for null") - * #prop_desc("boolean", "binary", "mark the binary content") + * #prop_desc("boolean", "binary", "mark the binary content, (only for non-directories)") * * #struct_end() * @xmlrpc.returntype diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java index e9b004d..78f9f37 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java @@ -130,24 +130,25 @@ public class ServerConfigHandler extends BaseHandler { * @xmlrpc.param * #struct("path info") * #prop_desc("string","contents", - * "Contents of the file (text or base64 encoded if binary). - * (ignored for directories)") + * "Contents of the file (text or base64 encoded if binary) + * ((only for non-directories)") * #prop_desc("boolean","contents_enc64", "Identifies base64 encoded content - * (default: disabled).") + * (default: disabled, only for non-directories).") * #prop_desc("string","owner", "Owner of the file/directory.") * #prop_desc("string","group", "Group name of the file/directory.") * #prop_desc("string","permissions", * "Octal file/directory permissions (eg: 644)") * #prop_desc("string","macro-start-delimiter", * "Config file macro end delimiter. Use null or empty string - * to accept the default. (ignored if working with a directory)") + * to accept the default. (only for non-directories)") * #prop_desc("string","macro-end-delimiter", * "Config file macro end delimiter. Use null or empty string - * to accept the default. (ignored if working with a directory)") + * to accept the default. (only for non-directories)") * #prop_desc("string","selinux_ctx", * "SeLinux context (optional)") * #prop_desc("int", "revision", "next revision number, auto increment for null") - * #prop_desc("boolean", "binary", "mark the binary content") + * #prop_desc("boolean", "binary", "mark the binary content, + * (only for non-directories)") * #struct_end() * @xmlrpc.param #param("int","commitToLocal") * #options()
spacewalk-commits@lists.fedorahosted.org