doc/cephfs: add python binding doc

and restructure cephfs/api to move the javadoc for cephfs to this
directory

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/admin/build-doc b/admin/build-doc
index 289a2a68871143c710ad31cb7a22444cf3344a7a..23e92e7efcc1e25918cc59ecff7f27a049bdb22a 100755 (executable)
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -157,7 +157,7 @@ rm -rf $JAVADIR/doc
 ant -buildfile $JAVADIR/build.xml docs
 
 # Create clean target directory
-JAVA_OUTDIR=$TOPDIR/build-doc/output/html/api/libcephfs-java/javadoc
+JAVA_OUTDIR=$TOPDIR/build-doc/output/html/cephfs/api/libcephfs-java/javadoc
 rm -rf $JAVA_OUTDIR
 mkdir $JAVA_OUTDIR
 

diff --git a/doc/api/index.rst b/doc/api/index.rst
index afeefc50befda80708c97fa4886e1df9f5855ef4..9b9283139fa455adf40e70ec9cac77494ac2c909 100644 (file)
--- a/doc/api/index.rst
+++ b/doc/api/index.rst
@@ -14,10 +14,9 @@ See `Ceph Storage Cluster APIs`_.
 Ceph File System APIs
 =====================
 
-See `libcephfs (javadoc)`_.
-
-.. _libcephfs (javadoc): libcephfs-java
+See `libcephfs`_
 
+.. _libcephfs: ../cephfs/api
 
 Ceph Block Device APIs
 ======================

diff --git a/doc/api/libcephfs-java.rst b/doc/api/libcephfs-java.rst
deleted file mode 100644 (file)
index 83b5a66..0000000
--- a/doc/api/libcephfs-java.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-===================
-Libcephfs (JavaDoc)
-===================
-
-.. warning::
-
-    CephFS Java bindings are no longer tested by CI. They may not work properly
-    or corrupt data.
-
-    Developers interested in reviving these bindings by fixing and writing tests
-    are encouraged to contribute!
-
-..
-    The admin/build-docs script runs Ant to build the JavaDoc files, and
-    copies them to api/libcephfs-java/javadoc/.
-
-
-View the auto-generated `JavaDoc pages for the CephFS Java bindings <javadoc/>`_.

diff --git a/doc/cephfs/api/index.rst b/doc/cephfs/api/index.rst
new file mode 100644 (file)
index 0000000..2247610
--- /dev/null
+++ b/doc/cephfs/api/index.rst
@@ -0,0 +1,9 @@
+============
+ CephFS APIs
+============
+
+.. toctree::
+   :maxdepth: 2
+
+   libcephfs (Java) <libcephfs-java>
+   libcephfs (Python) <libcephfs-py>

diff --git a/doc/cephfs/api/libcephfs-java.rst b/doc/cephfs/api/libcephfs-java.rst
new file mode 100644 (file)
index 0000000..83b5a66
--- /dev/null
+++ b/doc/cephfs/api/libcephfs-java.rst
@@ -0,0 +1,18 @@
+===================
+Libcephfs (JavaDoc)
+===================
+
+.. warning::
+
+    CephFS Java bindings are no longer tested by CI. They may not work properly
+    or corrupt data.
+
+    Developers interested in reviving these bindings by fixing and writing tests
+    are encouraged to contribute!
+
+..
+    The admin/build-docs script runs Ant to build the JavaDoc files, and
+    copies them to api/libcephfs-java/javadoc/.
+
+
+View the auto-generated `JavaDoc pages for the CephFS Java bindings <javadoc/>`_.

diff --git a/doc/cephfs/api/libcephfs-py.rst b/doc/cephfs/api/libcephfs-py.rst
new file mode 100644 (file)
index 0000000..039401f
--- /dev/null
+++ b/doc/cephfs/api/libcephfs-py.rst
@@ -0,0 +1,13 @@
+===================
+ LibCephFS (Python)
+===================
+
+.. highlight:: python
+
+The `cephfs` python module provides access to CephFS service.
+
+API calls
+=========
+
+.. automodule:: cephfs
+    :members: DirEntry, DirResult, LibCephFS

diff --git a/doc/cephfs/index.rst b/doc/cephfs/index.rst
index 4031e10320315497cfaa044791601c539365b421..1a304f899f302af26d0130aef4bb5ec9e4ef04be 100644 (file)
--- a/doc/cephfs/index.rst
+++ b/doc/cephfs/index.rst
@@ -184,7 +184,7 @@ Developer Guides
 
     Journaler Configuration <journaler>
     Client's Capabilities <capabilities>
-    libcephfs for Java <../../api/libcephfs-java/>
+    Java and Python bindings <api/index>
     Mantle <mantle>