summaryrefslogtreecommitdiff
path: root/addons/document_ftp/ftpserver
diff options
context:
space:
mode:
authorhusen <husen@husen-laptop>2010-12-30 15:28:09 +0530
committerhusen <husen@husen-laptop>2010-12-30 15:28:09 +0530
commitf433b959c2a72122dfddff8f06f4ecde37627ddd (patch)
treeb465b4da741804bf7ee31741bca6138a9e4fd84a /addons/document_ftp/ftpserver
parentab401b3788b35a548a947086885a27f68dcbb78c (diff)
parenta8e1beba5ecc831b423f8f54e9dd5bc70b0480b2 (diff)
merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
Diffstat (limited to 'addons/document_ftp/ftpserver')
-rwxr-xr-x[-rw-r--r--]addons/document_ftp/ftpserver/__init__.py0
-rwxr-xr-x[-rw-r--r--]addons/document_ftp/ftpserver/abstracted_fs.py2
-rwxr-xr-x[-rw-r--r--]addons/document_ftp/ftpserver/authorizer.py0
-rwxr-xr-x[-rw-r--r--]addons/document_ftp/ftpserver/ftpserver.py0
4 files changed, 1 insertions, 1 deletions
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index d110267f175..d110267f175 100644..100755
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 65b17a52c51..7580a8831cf 100644..100755
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -386,7 +386,7 @@ class abstracted_fs(object):
def rename(self, src, datacr):
""" Renaming operation, the effect depends on the src:
* A file: read, create and remove
- * A directory: change the parent and reassign childs to ressource
+ * A directory: change the parent and reassign children to ressource
"""
cr = datacr[0]
try:
diff --git a/addons/document_ftp/ftpserver/authorizer.py b/addons/document_ftp/ftpserver/authorizer.py
index 5a64ca8f7a0..5a64ca8f7a0 100644..100755
--- a/addons/document_ftp/ftpserver/authorizer.py
+++ b/addons/document_ftp/ftpserver/authorizer.py
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index bd727427541..bd727427541 100644..100755
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py