From 14c34da71874702a28f604b635271fc98481156b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tino=20V=C3=A1zquez?= <tinova@fdi.ucm.es>
Date: Tue, 17 May 2011 12:26:52 +0200
Subject: [PATCH] Feature #370: Manpages now uncompressed in the source and
 moved to section 1

---
 SConstruct                               |   1 +
 install.sh                               |  40 ++--
 share/man/SConstruct                     |  21 ++
 share/man/econe-describe-images.1        |   0
 share/man/econe-describe-images.8.gz     | Bin 597 -> 0 bytes
 share/man/econe-describe-instances.1     |   0
 share/man/econe-describe-instances.8.gz  | Bin 566 -> 0 bytes
 share/man/econe-register.1               |   0
 share/man/econe-register.8.gz            | Bin 629 -> 0 bytes
 share/man/econe-run-instances.1          |   0
 share/man/econe-run-instances.8.gz       | Bin 717 -> 0 bytes
 share/man/econe-terminate-instances.1    |   0
 share/man/econe-terminate-instances.8.gz | Bin 608 -> 0 bytes
 share/man/econe-upload.1                 |   0
 share/man/econe-upload.8.gz              | Bin 662 -> 0 bytes
 share/man/occi-compute.1                 |   0
 share/man/occi-compute.8.gz              | Bin 769 -> 0 bytes
 share/man/occi-network.1                 |   0
 share/man/occi-network.8.gz              | Bin 783 -> 0 bytes
 share/man/occi-storage.1                 |   0
 share/man/occi-storage.8.gz              | Bin 783 -> 0 bytes
 share/man/oneauth.1                      |   0
 share/man/oneauth.8.gz                   | Bin 585 -> 0 bytes
 share/man/onecluster.1                   |  76 ++++++++
 share/man/onecluster.8.gz                | Bin 928 -> 0 bytes
 share/man/onedb.1                        |  97 ++++++++++
 share/man/onehost.1                      | 112 +++++++++++
 share/man/onehost.8.gz                   | Bin 1161 -> 0 bytes
 share/man/oneimage.1                     | 133 +++++++++++++
 share/man/oneimage.8.gz                  | Bin 1242 -> 0 bytes
 share/man/onetemplate.1                  | 117 +++++++++++
 share/man/oneuser.1                      |  90 +++++++++
 share/man/oneuser.8.gz                   | Bin 1039 -> 0 bytes
 share/man/onevm.1                        | 235 +++++++++++++++++++++++
 share/man/onevm.8.gz                     | Bin 1860 -> 0 bytes
 share/man/onevnet.1                      | 117 +++++++++++
 share/man/onevnet.8.gz                   | Bin 1198 -> 0 bytes
 src/authm/SConstruct                     |   2 +-
 38 files changed, 1020 insertions(+), 21 deletions(-)
 create mode 100644 share/man/SConstruct
 create mode 100644 share/man/econe-describe-images.1
 delete mode 100644 share/man/econe-describe-images.8.gz
 create mode 100644 share/man/econe-describe-instances.1
 delete mode 100644 share/man/econe-describe-instances.8.gz
 create mode 100644 share/man/econe-register.1
 delete mode 100644 share/man/econe-register.8.gz
 create mode 100644 share/man/econe-run-instances.1
 delete mode 100644 share/man/econe-run-instances.8.gz
 create mode 100644 share/man/econe-terminate-instances.1
 delete mode 100644 share/man/econe-terminate-instances.8.gz
 create mode 100644 share/man/econe-upload.1
 delete mode 100644 share/man/econe-upload.8.gz
 create mode 100644 share/man/occi-compute.1
 delete mode 100644 share/man/occi-compute.8.gz
 create mode 100644 share/man/occi-network.1
 delete mode 100644 share/man/occi-network.8.gz
 create mode 100644 share/man/occi-storage.1
 delete mode 100644 share/man/occi-storage.8.gz
 create mode 100644 share/man/oneauth.1
 delete mode 100644 share/man/oneauth.8.gz
 create mode 100644 share/man/onecluster.1
 delete mode 100644 share/man/onecluster.8.gz
 create mode 100644 share/man/onedb.1
 create mode 100644 share/man/onehost.1
 delete mode 100644 share/man/onehost.8.gz
 create mode 100644 share/man/oneimage.1
 delete mode 100644 share/man/oneimage.8.gz
 create mode 100644 share/man/onetemplate.1
 create mode 100644 share/man/oneuser.1
 delete mode 100644 share/man/oneuser.8.gz
 create mode 100644 share/man/onevm.1
 delete mode 100644 share/man/onevm.8.gz
 create mode 100644 share/man/onevnet.1
 delete mode 100644 share/man/onevnet.8.gz

diff --git a/SConstruct b/SConstruct
index 3bf25cec2b..818ee83cfa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -205,6 +205,7 @@ build_scripts=[
     'src/um/SConstruct',
     'src/authm/SConstruct',
     'src/xml/SConstruct',
+    'share/man/SConstruct'
 ]
 
 # Testing
diff --git a/install.sh b/install.sh
index 96fdeb4baa..7e48aaa9d7 100755
--- a/install.sh
+++ b/install.sh
@@ -98,7 +98,7 @@ if [ -z "$ROOT" ] ; then
     LOCK_LOCATION="/var/lock/one"
     INCLUDE_LOCATION="/usr/include"
     SHARE_LOCATION="/usr/share/one"
-    MAN_LOCATION="/usr/share/man/man8"
+    MAN_LOCATION="/usr/share/man/man1"
 
     if [ "$CLIENT" = "yes" ]; then
         MAKE_DIRS="$BIN_LOCATION $LIB_LOCATION"
@@ -133,7 +133,7 @@ else
     IMAGES_LOCATION="$VAR_LOCATION/images"
     INCLUDE_LOCATION="$ROOT/include"
     SHARE_LOCATION="$ROOT/share"
-    MAN_LOCATION="$ROOT/share/man/man8"
+    MAN_LOCATION="$ROOT/share/man/man1"
 
     if [ "$CLIENT" = "yes" ]; then
         MAKE_DIRS="$BIN_LOCATION $LIB_LOCATION"
@@ -835,24 +835,24 @@ SUNSTONE_RUBY_LIB_FILES="src/mad/ruby/CommandManager.rb \
 # MAN files
 #-----------------------------------------------------------------------------
 
-MAN_FILES="share/man/oneauth.8.gz \
-        share/man/onecluster.8.gz \
-        share/man/onehost.8.gz \
-        share/man/oneimage.8.gz \
-        share/man/oneuser.8.gz \
-        share/man/onevm.8.gz \
-        share/man/onevnet.8.gz \
-        share/man/onetemplate.8.gz \
-        share/man/onedb.8.gz \
-        share/man/econe-describe-images.8.gz \
-        share/man/econe-describe-instances.8.gz \
-        share/man/econe-register.8.gz \
-        share/man/econe-run-instances.8.gz \
-        share/man/econe-terminate-instances.8.gz \
-        share/man/econe-upload.8.gz \
-        share/man/occi-compute.8.gz \
-        share/man/occi-network.8.gz \
-        share/man/occi-storage.8.gz"
+MAN_FILES="share/man/oneauth.1.gz \
+        share/man/onecluster.1.gz \
+        share/man/onehost.1.gz \
+        share/man/oneimage.1.gz \
+        share/man/oneuser.1.gz \
+        share/man/onevm.1.gz \
+        share/man/onevnet.1.gz \
+        share/man/onetemplate.1.gz \
+        share/man/onedb.1.gz \
+        share/man/econe-describe-images.1.gz \
+        share/man/econe-describe-instances.1.gz \
+        share/man/econe-register.1.gz \
+        share/man/econe-run-instances.1.gz \
+        share/man/econe-terminate-instances.1.gz \
+        share/man/econe-upload.1.gz \
+        share/man/occi-compute.1.gz \
+        share/man/occi-network.1.gz \
+        share/man/occi-storage.1.gz"
 
 #-----------------------------------------------------------------------------
 #-----------------------------------------------------------------------------
diff --git a/share/man/SConstruct b/share/man/SConstruct
new file mode 100644
index 0000000000..6b56e3b815
--- /dev/null
+++ b/share/man/SConstruct
@@ -0,0 +1,21 @@
+# SConstruct for share/man
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+import os
+
+os.system("gzip *.1 &>/dev/null")
diff --git a/share/man/econe-describe-images.1 b/share/man/econe-describe-images.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/econe-describe-images.8.gz b/share/man/econe-describe-images.8.gz
deleted file mode 100644
index c0aa5db454e7037c736a6bd605e52bf5ae09192c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 597
zcmV-b0;>HViwFQ555G(R19ehOZ<|06z3;D>`jkjv?YM_lZB@y!Nsa0N3Qi@f^svC#
zYzw=HT|)Wy9WegrA*W?#-h0fv86Hny6@VXX;VD>ok2~0|y$Bw?jr$J3v(O3y2UJ)K
ziy0&x<XBYmQYg6R??3Q+&iHl>LFoFv`|z?^z~tiuCP8X-f;G%%_p?5%Q2CfNg@8Gq
z@jexG#$pMJtdvR`OY%}Hc(JmOR-&0O9<9M&Jh|+O96N9oVX7568Je_~2|BVA2Q&jO
z+WA2kc@g6eZ=in0doKvLUf@UZ{`uFyTDj5k*&C8<V8v%zd{z%bwxNDOs0>b3sA_zb
zx-mruO;u=-kyS?m=sgH%40&NSB*^G9gI3y{6t0I^7P`s!(8t&p<Li*c`-j+xo!)fn
z^A3hMr%%SckVUy}hlN~YMVg{9vGWHz!oe4reI0q<Pw_zB<~TH_M2UTyc8ssJ45l^O
zix#~nvFMyQt5w37R@d2EYE4}XBzjLOFXzN@AhbXM(9!h*Eha!3uQJ6UO%{^o|HhEn
zwYhk+K6$f}rYb}SsV<sQ!3Z1-UIyXr+55KMvZb!NS{`ysmpYrrPJgd=*J}xD{TovY
z8=@Pyxm38W54Ynvq^SC>HY)4aOnomZk<v3(?%)Ugxj%0@ez@rYld&|p{S2LMpcEZb
z+V<0tfHbg|1p@v}v9cf)4N+Ew6pDNpZpU8KIqZ%Cpc5;kVuH|BciO>-0%0Myw)!-k
jwr$JB&|p8qv^WCHbmJ{uKXS<gK4bp?d;7J|7z6+SsVg6`

diff --git a/share/man/econe-describe-instances.1 b/share/man/econe-describe-instances.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/econe-describe-instances.8.gz b/share/man/econe-describe-instances.8.gz
deleted file mode 100644
index 143bb28a5ff8e551a03f141b22474f7d990cb18f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GX!iwFQ555G(R19ei%j+-zP-TNzUS<Og;^XQ^gTUE+~X;3qOLQ*LzT{v(P
z+=7j;Ddq2L9P*gOtn7Pz&bbdCnmDiwAqcnd5-$DcJ#1Hg4A1`Bdk5faXqkc&3apvN
z3=SRSSX9%J37F9LALxV<x?MpSc|qXKck3BAA02SQRLcX_Fda|EeORFg@X!<trgTjE
zRNN_zCCsvt3$C=0=Tg8<^MY%R${{pfK`?vq$Q?Ox;V!~d3Uo76Y0VGla-lR6DJn~i
z_dyuNeoW~6ZQ#%3=!enP4}&;4Zhl$f(u)@x-zJGACRb*1Un7dh+B6PKWN-mM-3Y<O
z310UylputzB9a{EiJQ3n8coe7uyJm#g!&PQbJ^Mz-(y*7lvLvW!Oq~|3(vj|yziIT
zlD9cRqp%jNM36_&Lwv8LFs)JFw9I)Ci?4~RTE&!VWu3jH*3^Y1ne(EuyC%*9p#~Fx
zu~9G3;sK1tU!I~(YuRhQUJT2yR=3@(F1uNBRTZp*R2EGsU;x?;FT!ZQ@xQIMWFf1r
z=BHd6?~SL4+dJ^--ZfDze`Bg)ZRiRfZZA~Ur^n%6QxwYBy%DB@?R!?S)EvXh6Z|lh
zd&3$#!$S{nh9~FoGjy_nl66E#-A`u(xPl`u5b$4$l{WS;LzGp)dyhcNb#99c5)}4l
z0gwmHxFF1+tM2j#0}7aiT<hx7Xw<eXWwyb7hEZ__sL|SActPx$CD1YX4^GHmH|hfb
E08q~otpET3

diff --git a/share/man/econe-register.1 b/share/man/econe-register.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/econe-register.8.gz b/share/man/econe-register.8.gz
deleted file mode 100644
index bc5e8b13f32c764af113a5cee2919438b607dd94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 629
zcmV-*0*d_~iwFQ655G(R19eluj+-zLz56SsoOY#!WYa^dZB;3oWH+b@ppdN;l^z^0
z!7bRxHcR>Y4i4GSN<CT6o_V}^^Y9V}mLUY;9=74qe>%W^?Z@!sZ&vRBd;=}jaAJZf
zYFGxx4hmM*vx*A1_uhZ-?mgn|*APalAXq)VZ06v6bifHyBackMY<fTKVa-Iqj!j8n
z=1sl+D(<vl70k1W3$6{)b1C4(@RA$Ov_rgj4Z(c7BBSQSg%M(@6wFoZg#Ap}hWHSK
zQS8UWd;ItLdy@NMwD-dxPV(IkK<IDh&nwqoBDUSjRlL~wwuad5WW*jtWH$hyP%HMz
zWuwaun!1!ULvwgVPYiOYpwSFkZVI4cEPqkTCiCp41|@`e>xd-zW8x-m?<`8W1B(l*
z%8y7~$kw_(uBB<pv`*Y#tiw9^%(E{;-`5Ma&HIA&YLuWA1DS&v@R&=pR55eq!t+8F
zzg@hs)l}<Ns_cJkjVf&uo)?yvw~O;Y%m4zwWc36sI|6dN@|4+YBYV!jjX{5vzIwC1
zc(dfXE@=m;ESpNeP-vHBmz&^rAE1|gUJlQgFg)k!Ic}%`CvTLn(I&l`VejXqB5#FJ
z&+N(;VRYE}&+9!|$huSfR2a<nbe6b%%J0U>jFkMzQUe>*qv7WI;z@P7wemJNuF&}1
zMxbPC#Jr{{9>dEWe8W+CmH5lRO<&*)PtNTp=wt&G?TC=Z#?2I5L(WT_;CISu16=g#
z>ylHE4rw%3b`K6`0+2^TxgZp)>+Z7Dp$e#h!kGGDGHKh^qgG%)!=yYH=*h-ktb!Pg
PMwR3ba@uhFP6Pk|pxZ}7

diff --git a/share/man/econe-run-instances.1 b/share/man/econe-run-instances.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/econe-run-instances.8.gz b/share/man/econe-run-instances.8.gz
deleted file mode 100644
index 22e1d8d65bf369ed8dd2385c7bc99f54214b0898..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 717
zcmV;;0y6y{iwFQ755G(R19ekPkDEXYz0a?3bJ~>_lHFEqwXG`UgWaGefI_xXRC*X-
z5~hU#F~d^+eLWLMsMMao9{c&(ezv0ttbFkNJ#77z`*eW)+702!-8gRmTm>zaaAJbh
zRIwD|4l<Tk4+Rx)Z@>Lu-`m9AufY!-&vO<pn>kEAPGI6Es*G6;53~E3HY+AP7B@MC
z2YY5~SJ+9#3Yez_7hEcY=cRxb#dEGWlM`ZxYw+e<hm4XV3q}@8O2MqU5f&FxQIRld
zvciMs2ca7hd-2bh@6plqgT3o}VRYR605sk0{MoVG71{=3<%G+fYhs9jh%`ntE))c0
z*9ZwXiNOoy5hzr&Ry;w1HSmI-m;vnT5n`_c5*-(j6<K<cSnv*votfHhK*FqS&6LNn
zG{K@WvVO4+<KQz-zw~)u2iqj?GX{-hwV;Keqk4OcC0SB4b;ZK(02W>x7qp5>*_L(s
zKeVRKO%i?wl$VR++z?ZM2B4BOK+9r4j8~2W({5F2%rT_uDrO+`&j6~f9)mg(0t%_h
zQJ=U7XfvK<z$L^~qF_~qzr%k1qKy<HE2WBFSCC#-P_cv`QHHQUl=tr<i;1L65pU~m
z9Ww&ZshWGtpr9!u^p*0Q#yQhY-RHlmW(-4Xc`dmfO0KxX9y&<MyeS0qfktLVoDr(?
z5%fZgsDP(TDCC%&4+m$9J8f!Vj+E&7y>6Q-FKLRn1s-i`#JKc>!_IwP@5!>Px|*Ld
zg_k;eh%9}tcjFri>hdQ`6l{=>gq!P&UDl^tLvMqN6nfT;K+2}|c|{Za^e=bt4O`JH
z@%Z6J2Tb~>$?YfT$_6Lc5m72V+4IVd90$pMC#+I>tH{2}xw)~HtIQPXA#6CD0icW(
z<$_R*uDU_4eH2gynNro`blSG9O$|Za!!$n!$mzyiI$nr_Mwa9cjw>tu7zF?T@J&{@

diff --git a/share/man/econe-terminate-instances.1 b/share/man/econe-terminate-instances.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/econe-terminate-instances.8.gz b/share/man/econe-terminate-instances.8.gz
deleted file mode 100644
index ba19ff45c77f9421e4986d83b0b4da5380f08d2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 608
zcmV-m0-yaKiwFQ755G(R19eitZrd;nz3VHuoLZoE((JII8wR9_yBJGtBX$P_^A3v5
z#M&I$kmPy!`%#MB=CYGOihS?!k$ygbRSZ#_!E?L{pLUR~!xWyvP4EsNG|+PmN0g|z
z!4mdosIYG5CobXMfB(V1_nDuqAx?rQ3LalJ3z&SIz$7kAvquH<+5OChEy@V@UCm+c
z&wQIo&)VP#7UfAup$)-{M#75`wJ-wpg!$<jqQ!H-u9|ZXt|BZNiJn145Two%QX4J{
z)UG$(MRAgbDf1tPN`*&aLdAaMhcHgEFpkpvu>A=XhEbX=qGjNPD@r+lRgf;Xp(|q!
zAb;b^ugQ{xW#b2!3PEFyg|$m{QVMy5vDo1b%#8W#gyo0F+{-;{D)HWdiz_D~Ojueq
zy)*o}mKVgTbMH5vsSZAi^2^ZoZH!%WMoK!3O7aszb8yORe2t~CP-xz;=pDh**TgGY
z%eC$sRsIjHQ?+ZNcSL!4O<V>-0~7!ql?CW=PiCn<qCl56jm311jtj|YBM)HNM-xGm
zD2+IX;&L;DMKg3ty8C1ncUTwMf3+wmniJh^>6WmJlifD_y3W|LY0pX=D?`URo9CWA
z*}LmAOH}iV)(IQrrG}fgAHPw@TPJoy14vE$oh<3<t%OC(3wnm1JNS-DTeWomaAON5
z!`I~Y6P%k4PW;SdW2^xLAT%6AO_TgBur)NhRo~Xa8PE$;Ig$awhusALn!VvdGEUX)
ud0f*_1>8VoO#3jM_I>YjC(zC?tuF<7x(Sy-l#=J9lKlg~G3+iI1ONcRPA16!

diff --git a/share/man/econe-upload.1 b/share/man/econe-upload.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/econe-upload.8.gz b/share/man/econe-upload.8.gz
deleted file mode 100644
index fb0704f66275b1a926e1d1d44be1fc176c168f74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmV;H0%`ppiwFQ855G(R19ekPkDD+Mz4I%kTy|GlNH#sR+E$ga+3W^20kn`xQR%^e
z6WoH0Y*Wg=@7N(9J@kT^@tfy)o@YOE;W>gZN?{W{2QNEFS3v?V!Fu@)Akfeg1qaHh
zB$}3x4^Yv%oi&8Rga7`6|KK}*x`HTPhT-yQyPkvl(FHduw8*K1+4Ny*!j|%o=3Px-
z=1+Z-N(QBA1M{+BoGFd;OmNt0Rx{10aveWeK{($movY%^gR6)Zf>W<+Ye7m2Pj+Dx
zCqd%)PycRy&-OtSr$H1Z+5YVZU>I!XuS+kUrz_0Z>gQ#$cnd7bvDMj`JC2>L{Z)X%
zSwjvK_Ci9ZDD+HMCVSP`q8450Ls~I4f>kBDx^!|1HQu8HNe?I*e{A)5+Bw-N#t)z?
zia6a#ju#&on&2pNRN^@PDt5B{Q|4u!nF<QI2OC#bQxH2zC3-utYb+@Ws#NCvq66aK
zGb_K0bze`hEl#lkR46%VD2Tmn$i&xNiWb=8g$vgcS#nOC*;=AhFJ$>YwocZz2-g$K
z_MA8hq8cy&bfqEaX%5Kon-$ciwJ@C5lucJ_))J{Nx3f9j&KAdaa{+j*Q2GXHmP;ZB
zU>t`*Y_E$><`ewX)(X}-nf1;i!~_S3$C_@Avo<|kJh_PC-COXwN}Yvh2gweV##b?&
zWuAE(_t&<GrT9q;4QpzQc6-_Jg*@EZqt_^uEA&IhOEii(bl#EzmvQGFzEP>nQ^JP^
zw+7&jTkhQ_7(@pR85}OOHLo@n-Lskk{Zr6Zqi85Z)7FgeV)VAYu=}t(5`f4xVca2z
wZimx2M-&hZmDcU!WYYJ&Pi%um!=yd})MOnjmSKXIh+R5=0TaAY0E7ep02>K7`Tzg`

diff --git a/share/man/occi-compute.1 b/share/man/occi-compute.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/occi-compute.8.gz b/share/man/occi-compute.8.gz
deleted file mode 100644
index 11842ea221eef2dceb3a3a4f2207a84ffa85451c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 769
zcmV+c1OEIUiwFQ355G(R1C5m5Z`v>r$KUf;+<0oGl2Z1tX{#zxNZUw|L?leB#vV*^
zfVW^rwnNH)KmSN5{jq6J$(`>$cRqh@f7ydc3{jlHES`jSkB~itDcptA-~&LYpdk`A
z$WRc41*{IR#j+ai2!kvC<0t>h_x$Vu;v|To;C3+`LGN=9dU3A!3Iz-YR|8{K$Rb?T
zC4r$o@Qo`yNQFBX6+6nPR2ok?gN33cRTO2<^V0{2Mzg>>NnZBh#Nv5Q`#IlLwL%-7
zK1OkphN<V@zFb_c!|QQ8n~kE$4J_C5AKDQoSr|vDwtj-KNAvr|EQm7evA9W)j_08b
z^9*j;@k}2x!pH_CbS{CC*CI!0Q(L&FE8i~r%f1<!=3aocxBA!f!^BIsys-oI{3PjO
zYl(u99qJ&sro~O0wCHS`nQaleK;Uaot$hlrh?ET%g-!g8hmMpS9Y<6b`ZrW9N}Hs=
z9c6xWxUHZ9ZGe`G0W`P*&Dhf%ty^)!JVh$HLtZOOk(hH<$PS&oaCUeJ1llB6b79MD
zm8$d+FowC&&ndsqBH298eA3N4U}RP5gWIE6aY@y|9$2dmEuG8~a)Da#whwdk@U$yo
zO-pp$xK+~-!{&_ypg@@mx^nl$v{?zhrv(<?8<?wB>KkBcS-3GYdQWI+I(<)JE=y|l
z*bcjhP8<T2ptwhO6!CZ*!uQ!!11ilxrrcd?kNP#<(~UAk*VMKD67CAuRq>DExK&sC
z|4KfG9Y^MMBYRuI^-y4mZ4a-v@0R5IrOfWu=81V{cUA|<<2<~7$h<MH4uWpBN<U(Q
z;j(X@vWwH_ClUOYmK{uy6cWy!S9~ru=T?eSEq^9;shSn&6g#R&u0QR{1$;vx&1m$y
z2xlgs*Dm$Wzrumnup<YLab>QL22g3o0Qi(+rGPTK!;%uF_tsFgwMANl504H2e5D9w
z9?{X&p*w~)3W&1z=*#70(=<M@4Vpb%mM%bEPQ!5!rGXxTKk)tlR&P|=GX?+v=R$Yt

diff --git a/share/man/occi-network.1 b/share/man/occi-network.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/occi-network.8.gz b/share/man/occi-network.8.gz
deleted file mode 100644
index 35e512a6fdea86560e5be01605bbf131b54b9c0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 783
zcmV+q1MvJGiwFQ455G(R19g;9Z`(Ey$KUlSZhmPC#Iln;Y*>Q=j;%HVY)P=}V!^xz
zN;=zIB~l<MtNQjkQc~h%*^A{n-u;eu{FDA+0;?FJcn6z!6@Gn!-D8--*Ki&D0uUN#
znT8VzRLo!jSqEn<>${2xxb=Vi&A;_MfA<J+5=2q(uwO4=^7{lPac*RW3hw5&b8FTp
zBFvhS!JR+%tt;)c!3q{d#Rb=f@LUSm8(wn5QBOQSeS~PS3B0T1!xXM8ndf{e(6mzh
zaN+4w6enqzdj7-f#ltbYU&fowB3gZc!*Tl;IpSm&#!*Vv-(c;<_S=3FL_6nkxK)rY
zx1kI3EbcJ!>^?S3uoG&yaAg`+!my-W=D_x-@WWwxnA({U_6D4NroWyaCSH1$t(&Lk
zC&?JwXjFn#NI`JVi!VdcezaZY?u;-7f;@s5>}ycXw5BZ;F7XF;BPn@yJfp_Y|3fvZ
zbV>9bDcfg9-wGNa14u0v&|(I}xbPgE+epj2MjBqBY>cC5%%v#wh~B+&j(80Wh9o#j
z<;t9mse!@-=2kw}{DL%cdYSoZoOvKvR@!qzl}XJ_cb!x<rQtPG<|T16Chj%DhnIk9
zEw%XoCC?O79dJQ%W^RDXMrAYlDV-Ds*^w4<g>;AD-bx96RwW#HiG6$hlI>7n`&Lp=
zpw1P~`s-)gu9dv-0t@dyENZ2s+vK434<Rp%m$v11luFUsO7MQHG|Ee%Q5-MWA7;E<
zhVbWR4GL?88inaE>mZglT#t4p3_tRIzpvR;vA`1T7~a<G{rWv5Sme>Z3-2J^jFYEr
z`0a7$EoI#)emWa^dFFSAseONLuHTGA$$v;Ju%^S(@bP8Em+JJ%ZE#JZ6`D#lqQG8f
zi<;&18CGuKJ1T7_K#v)Gv;mW0Y4Yhabh3epb)JyMik<*myYm73nPY88E2P<~E;$o)
zJz8$guE>D!;i(6J%nakgV-#I?<Ftn;V8*HckJ+qkTc5cN+8$<QAE0OJa2Z5tKtu57
N-oL6O+LP!7002Jhha&(0

diff --git a/share/man/occi-storage.1 b/share/man/occi-storage.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/occi-storage.8.gz b/share/man/occi-storage.8.gz
deleted file mode 100644
index 2cdb2424694a40b7ad7428cc8c47ed5e8b750c6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 783
zcmV+q1MvJGiwFQ455G(R19g;9Z`(Kw$KU-aczM|dG)~%kxM3>>q=~m0NNgichZUE5
zkZmT>&6W&Fj_YrKlx(-@x_e1Xiu_Te{*u3+z$%6)-oYkbg<l_GcORzkHCzXO0E7lw
zrs0SJ6*E{s*1-wO`lez6uKhp%@~?f*-`zu;1W^>+J**cn`8a_|oEw>;f}8pE+?q9t
z2(zYSaO2N?>q<Lqu!2QValy4AJeL9<3@^Fis3)GE-b1w51l~pRehL?s%yT}~Mk;nh
z7oI*wagv6q=ij|v+#kZ*WxUxeqSY7JAGUv!BTjZ<9HnIa1J+I!TdKATw$9~vs~}x&
zLl@^+-hKqyjck~pFAec>8N%pSsAZ$_emg@2kILWer~9d$9I>y!*(dt+{4nv-lWg5o
zJwHjt*hZrgtU?NcTV8w_k{(9eW$sQ0V<5-_n8CgT)lBPFs=_7y#BL-d&yHu*82W#x
zMwKp!{zuC8+0nOx2FL)?j0Loq0Wr=zN9Q)uGB1&aS123fC>nDq3O%BCubd-Z1A`$6
z4pO-?Cu3@$FoC%h(Ivkir5s;oz8Ys92$q#}cxP0Z)ZBEJNmWxCUNdE05;tSwgGPAw
z5-_c$Ht(S1nPRE~E=bhO4RG10Y(_t&lfocA(n79~ZW7#DJ;75|!hx6Ax7RP(4h6Pv
zBn1WPT=A^Gg|_cn$ulpo@ZP|vmy#}(quLK*o*6G~&u_Teg=;Iq+i`6am_nmCp0Php
zr}Q72HKo>+jl%Soc96@PJ3xCAh97vp<JWL1Szw8F62BJh{ra~|u*`#fA%4Sjb50(&
z;kWypx0H3K`0-@u4VvHVr}ibfx_mtnCI2PCz?u$B!~2&NU#jB=x5G6FS7<8Lhyr`9
zEozq2->`B8-%)8h1A5lry$zTQOOp?up_2_%tn-94R`>+q+8q(#Q;xMEy^wCJy5vky
zZ!I?`S7bo=@Yn-DW`=R$F^aCcao$4|Fyn5(r`fD+Tc5cN+8$<QAE0OJa2Z5tKtu57
N-hV*~0O|4t006&|d?Ek<

diff --git a/share/man/oneauth.1 b/share/man/oneauth.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/share/man/oneauth.8.gz b/share/man/oneauth.8.gz
deleted file mode 100644
index 95554bb729b2d52604334dde35fd85df63996d6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmV-P0=E4hiwFQ255G(R165K{Z`v>re)q4q<%vqIq3mJRhL9+vBN8N0lTJdV4<<Rl
zTViLiBbxpCokLLRi!I-M_uY5rk8eF#L=Z+PtfNKnw1IRPB=8ih{4W53g_AIFK!vri
zn8U7xBNo-T6bkP7*KhouGoCIXiv2M3A7558@E$zyqRi?Y)-WF3kKD6D72>Wb1dREJ
zyHL^^izUqRQYvXI(Mzr1#mYijiN<3*Swc8l`|PTCdk0sqS!0io>5|0c9X#2DQJe$`
z<By;f3d*zXKA7~FDQx%8uP#uDT9jz9Hd6|{b;S!mnLh_{8bl#u=~0>sHQmYzsSF4(
zXhH9xxyS^ofiU8L;JWEr{yPs+>bxnCcg*u>y`F^&l9k4!=kaf&t)RXg+kg%OT?qEN
zrXG#K`iAi!X8jC()}beorkG?^LuZMluG{H_wa^Et9P8lnU8d87%F664s;c#S`<c3{
zf{E*?XeCp4o#1;VYXmDx1j-qt`ExUUyEOWPZQq83SIw@F8BpvqF9j}mXPB;_s->b5
z_x=oak$zM0<~jJeOxavlZ7mN+OBNc9w|CA+x7VK^*ZMbR7FH;71A~tY*Y$zu<Cv{v
zhRTp@8<mq6X%#T5L`GMixrJY30k;`)B@7(E>r>v%4`_8mpW8B}t@{)rAXDsRfq?HB
zR@QBYJW>@>s0`sGX%zdx&S7&V0KIemVS><A>-=+t0%753ZS{RPJe^KlbOPNB!{Q7u
X!&NZ%!^Ed0@DckDalvuNu>$}A?=c^A

diff --git a/share/man/onecluster.1 b/share/man/onecluster.1
new file mode 100644
index 0000000000..6b8ee43ec0
--- /dev/null
+++ b/share/man/onecluster.1
@@ -0,0 +1,76 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula Cluster command
+.SH SYNOPSIS
+.B onecluster
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the OpenNebula administrator to manage clusters. The
+administrator can create, delete, as well as add and remove hosts from them.
+Any user can list available clusters.
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-list\fR x,y,z
+Selects columns to display with list
+command
+.TP
+\fB\-\-list\-columns\fR
+Information about the columns available
+to display, order or filter
+.TP
+\fB\-o\fR, \fB\-\-order\fR x,y,z
+Order by these columns, column starting
+with \- means decreasing order
+.TP
+\fB\-f\fR, \fB\-\-filter\fR x,y,z
+Filter data. An array is specified
+with column=value pairs.
+.TP
+\fB\-x\fR, \fB\-\-xml\fR
+Returns xml instead of human readable text
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.SH COMMANDS
+.TP
+\fBcreate\fR (Creates a new cluster)
+.IP
+onecluster create clustername
+.TP
+\fBdelete\fR (Removes a cluster)
+.IP
+onecluster delete <id>
+.TP
+\fBlist\fR (Lists all the clusters in the pool)
+.IP
+onecluster list
+.TP
+\fBaddhost\fR (Add a host to the cluster)
+.IP
+onecluster addhost <host_id> <cluster_id>
+.TP
+\fBremovehost\fR (Remove a host from the cluster)
+.IP
+onecluster removehost <host_id> <cluster_id>
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/onecluster.8.gz b/share/man/onecluster.8.gz
deleted file mode 100644
index 69544f59c96d6c958d99decfa82403a1c1a79414..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 928
zcmV;R17G|fiwFQ055G(R19eqRZ{s!)z4KR0eaZrk;<$${+BAUUIE?_uGAwU_pk6F!
zX=HIBkpfBiV}Jb)Dale1?8OqrnfGRf@6o|-1kVwyqAk2d&*95EY+u6|Uc%+#H-ON>
zi5obeM9nRxu)jc#MKvwCg!|z4KZ5&!1>0AM){E6@@$_XmgVE;^jH1M<J!+Uv?k8?p
zp<Lm<E;vksN#H)k7h|!6Sy~Dyj3s!XBz&==5LTcWu^@hh)$DD-2Fbfy7_8<+O&A&y
zRZ=~v&xqew(K-%e7CeEHm^2~mzg-qSsLFAe$6dDh3hqOj_(+S5kEpojB~n5Y<Po12
z@q81mw_&tmY?}+y@c~M{FVKL^aab1bTT&XV0t)5_gtitFz&1zr|EPrKnP{XLk0HeZ
z-IE4?!lH0bo~Ga!HJ0j#kSk*iWLlMuyA0S&UZ6JE;1q-k{K!S&%Ij%;H<53I#<N|s
zUG}uQEvV5k_*Ys`Dy`u>zKnmcm<ma(>$j*&X<RF*Fjc`Xa1u86MC>~J4zNYJZL<iD
zg)&pRY)+W(Rc-yqI@oKetS1<Q(kb;rqsc_!PVkDah6VemzT(Iykw^*OTp7mg3mD6_
z74pD*`6Q+iITeti8@-{8hPCI)hFnb{J=u$2L&_}=U`Cy3O_L#gm<kh-2}~QFhWzg%
zFKUE}3x5<H!+FSXF5PLc4cb~$U9<!t>F{_8DucXsuA@p*f36nKw#PXRagM0>%AmvA
zl7bABN+Ut_ry#QS2%5ulMb}A!#$<KTgXTj}=X-}3=j!A%PdV-r&CnQ<_fP=DZ-}Lj
zZa;VpC#t$=amekkAg|4N^!7GeJzvGy7{U$wX6|1}D<JXYrT&Qp;hOapZ|&2`U6PMG
zoW@WdXX6dzaN4*JFikK#i1e|`?_6=S6wY^?Jn4tm8jJey>q@EO1Dy9ri$gAU&h=0;
z=V)(aXR86+2ZS~Y9^CIYDhnRkt#5-Go15VZ-}KorbT`E>Ir{8h()jaPzi+~SUbk$1
zJ;Ui_GTq&}YkoYu1J_!8r@I4|q*enr{Z63tf#}z3wiF3UL;oqYbf$IX%_^SIqum+9
zzpZTOKLc)Dz^L6CefkS7s-~Ou!lbfJ5RD?qqX>9TuyXQp`mPGWWrEF(Wqb4h-Wvc=
zd&`An+$+-=Z4d?ALT+vK=iS}ubPBjH(DiUvGy&#r8O|50ctJx5ChRAhma=hA2LJ$Y
CIn2)h

diff --git a/share/man/onedb.1 b/share/man/onedb.1
new file mode 100644
index 0000000000..383a54437c
--- /dev/null
+++ b/share/man/onedb.1
@@ -0,0 +1,97 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula Database command
+.SH SYNOPSIS
+.B onedb
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the user to manage the OpenNebula database. It provides
+information about the DB version, means to upgrade it to the latest version, and
+backup tools.
+.SH OPTIONS
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-f\fR, \fB\-\-force\fR
+Forces the backup even if the DB exists
+.TP
+\fB\-\-backup\fR file
+Use this file to store/read SQL dump
+.TP
+\fB\-s\fR, \fB\-\-sqlite\fR file
+SQLite DB file
+.TP
+\fB\-\-server\fR host
+MySQL server hostname or IP. Defaults to localhost
+.TP
+\fB\-\-port\fR port
+MySQL server port. Defaults to 3306
+.TP
+\fB\-\-user\fR username
+MySQL username
+.TP
+\fB\-\-passwd\fR password
+MySQL password. Leave unset to be prompted for it
+.TP
+\fB\-\-dbname\fR name
+MySQL DB name for OpenNebula
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.PP
+DB Connection options:
+.PP
+By default, onedb reads the connection data from oned.conf
+If any of these options is set, oned.conf is ignored (i.e. if you set MySQL's
+port onedb won't look for the rest of the options in oned.conf)
+.SH COMMANDS
+.TP
+\fBupgrade\fR (Upgrades the DB to the latest version)
+.IP
+onedb upgrade [<version>]
+.IP
+where <version> : DB version (e.g. 1, 3) to upgrade. By default the DB is
+.IP
+upgraded to the latest version
+.TP
+\fBversion\fR (Prints the current DB version. Use \fB\-v\fR flag to see also OpenNebula version)
+.IP
+onedb version
+.TP
+\fBhistory\fR (Prints the upgrades history)
+.IP
+onedb history
+.TP
+\fBbackup\fR (Dumps the DB to a file)
+.IP
+onedb backup [<output_file>]
+.IP
+where <output_file> : Same as \fB\-\-backup\fR
+.TP
+\fBrestore\fR (Restores the DB from a backup file. Only restores backups generated
+.IP
+from the same backend (SQLite or MySQL))
+.IP
+onedb restore [<backup_file>]
+.IP
+where <backup_file> : Same as \fB\-\-backup\fR
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/onehost.1 b/share/man/onehost.1
new file mode 100644
index 0000000000..6682e22eeb
--- /dev/null
+++ b/share/man/onehost.1
@@ -0,0 +1,112 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula Host command
+.SH SYNOPSIS
+.B onehost
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the user to manage hosts in the Open Nebula server. It
+provides functionality to allocate, get information and delete a particular
+host or to list all the available hosts.
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-list\fR x,y,z
+Selects columns to display with list
+command
+.TP
+\fB\-\-list\-columns\fR
+Information about the columns available
+to display, order or filter
+.TP
+\fB\-o\fR, \fB\-\-order\fR x,y,z
+Order by these columns, column starting
+with \- means decreasing order
+.TP
+\fB\-f\fR, \fB\-\-filter\fR x,y,z
+Filter data. An array is specified
+with column=value pairs.
+.TP
+\fB\-d\fR, \fB\-\-delay\fR seconds
+Sets the delay in seconds for top
+command
+.TP
+\fB\-x\fR, \fB\-\-xml\fR
+Returns xml instead of human readable text
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.SH COMMANDS
+.TP
+\fBcreate\fR (Adds a new machine to the pool)
+.IP
+onehost create <hostname> <im_mad> <vmm_mad> <tm_mad>
+.TP
+\fBshow\fR (Gets info from a host)
+.IP
+onehost show <host_id>
+.TP
+\fBdelete\fR (Removes a machine from the pool)
+.IP
+onehost delete <host_id>
+.TP
+\fBlist\fR (Lists machines in the pool)
+.IP
+onehost list
+.TP
+\fBenable\fR (Enables host)
+.IP
+onehost enable <host_id>
+.TP
+\fBdisable\fR (Disables host)
+.IP
+onehost disable <host_id>
+.TP
+\fBtop\fR (Lists hosts continuously)
+.IP
+onehost top
+.TP
+\fBsync\fR (synchronizes probes with remote hosts)
+.IP
+onehost sync
+.PP
+Information Columns:
+.TP
+\fBHID\fR    Host ID
+.TP
+\fBNAME\fR   Host name
+.TP
+\fBRVM\fR    Number of running VMs
+.TP
+\fBTCPU\fR   Total CPU (percentage)
+.TP
+\fBFCPU\fR   Free CPU (percentage)
+.TP
+\fBACPU\fR   Available CPU (not allocated by VMs)
+.TP
+\fBTMEM\fR   Total memory
+.TP
+\fBFMEM\fR   Free memory
+.TP
+\fBSTAT\fR   Host status
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/onehost.8.gz b/share/man/onehost.8.gz
deleted file mode 100644
index fcecb4540efae2b28e7852c47000ebadbe6e67e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1161
zcmV;41a|u$iwFQ055G(R19ev0ZsRr(eb-k^{geQX;-n8PwrK#zcGd!XgRKMz>S94l
zRK!9O1(LF({rb+3k}NlAUP5YS&Y3&y?*}kl!)hJEay<>6-yoa^J9rKjvtIxL11F~8
zoflj&!(%wqkn*g&&shO?{;$9JcfRL`b69U?tJUo3Wif`q?*kaDBO?!7!TsoNMAwoR
zD}Jal2KWBRr%$_D8=k{B&P5@#L3kkxcrhXqMsPjw{M{T@<K@ij8SihPcbiLXAd)#c
z6I=D&+iJbp1v}4w0$K1B<=$WWBzTY|q3g$evi%$ALu2)bm#x((nPNFNTsb8RH=XS!
z+h7w0>y_t)sn9JM@PZvOuEC@nDvfa(2`FIi9EendD6EW}g~nS{J96b?PQ6meqlnQy
zsfvg^V;FQzAS}ydgqa><&JCg@Qspi)L>u!AT?7W`tq~ETDv$U;S`RYJBOzF7c4Q(W
zFP%rejc9Fy!Tf|9Z=XEvZ!!#a2=<5<w8uMq4C~=fZ--=&p_sEOFEkOvLYEn<;Ur9I
z*}N|MEntIk(^w&#7xbez$jVs%TG-A{?@TbnfMU!lhLwm6i*m-7eTS{q+2ge}!WKn*
z-7yTC18758E8acpKDJWM89EU2NO7i7;8@RGNuSF(awdDWcZiu`K8!Ikr7$ztBf8{~
zNCb}^k0bx{$g+xK-Gri2v<z{d0jtYuBG5dNMXa#`#<iH0P){`yNNmB&&*}f@1AgRG
zUT@1yr7%#uA_h(!i$NxkRy4#IdThJI@DFpwIred|Z4Xj&!U}noX~?DG7tJY>rl!sv
z%0d-IT<fID&Y)=@l-39#?oxT8DA9&KVNtZkIqG*5@@r%{Yd0V4OhmG*m3U7tro}e<
zWW8LDSJSTBsmz9=fU9wgNn}v)6OL_^ih@&nQwXJ$*|p~f8?RX);LPBGE(Pw0M|cqV
zkDTH1csS<m$+$zyrO{8z^qt#nkVr_B%#o8|E(u82!T%6v1UKszW6N`S<m7Pcti}4;
z-DXF8!fS{7Y9VMrHAvm2`V3^}yD@hA&YI7f)%Q6Lr}RZ6LU-0vcmB$}QTuF<jox$I
z?N=NF9OX(@I;$^XXe`<y)J0@1>5wW}h@Z%e%lCl)>~Jc~tZ6pne~N-8p1;{#Y_Eyi
zDBoIwc`zk>{IgF{Fl`0&ZaIk+P}{Vk?d!6!SyeebkvNK~Dhk>^uS?ykg_F&T(+j0x
z8Q>MJO0FVa7#xr5R`0pfdsdwPuiCg%8+Y%5)h(py9v%C<qYs@`xSTEfPUM&_Rd>{#
z)KXsxci}kfWdL`tsdO`zo40N7eI9y~ZglTQqx=00{a6_GANY-u|KJ-03tUnfuFeu)
zs`qPKo`t|rHM(9EwEU@+$0hbQhek4l*JfMbFAumPg+U`4T>k;JtZ)`;kMe*oxm!fI
z>pAd`h?lfgXswl*U`51T*O)W94{r_t<iRjec+4&&Dr!#)n1R%o^4sn0>2&g$b&z7X
b&76Y1T?CWaYB$3q_#^LM6ZwMql?ea<;VwE_

diff --git a/share/man/oneimage.1 b/share/man/oneimage.1
new file mode 100644
index 0000000000..937381616b
--- /dev/null
+++ b/share/man/oneimage.1
@@ -0,0 +1,133 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula Image command
+.SH SYNOPSIS
+.B oneimage
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the user to manage images.
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-list\fR x,y,z
+Selects columns to display with list
+command
+.TP
+\fB\-\-list\-columns\fR
+Information about the columns available
+to display, order or filter
+.TP
+\fB\-o\fR, \fB\-\-order\fR x,y,z
+Order by these columns, column starting
+with \- means decreasing order
+.TP
+\fB\-f\fR, \fB\-\-filter\fR x,y,z
+Filter data. An array is specified
+with column=value pairs.
+.TP
+\fB\-d\fR, \fB\-\-delay\fR seconds
+Sets the delay in seconds for top
+command
+.TP
+\fB\-x\fR, \fB\-\-xml\fR
+Returns xml instead of human readable text
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.SH COMMANDS
+.TP
+\fBregister\fR (Registers an image, copying it to the repository if it applies)
+.IP
+oneimage register <template>
+.IP
+template is a file name where the Image description is located
+.TP
+\fBaddattr\fR (Add a new image attribute)
+.IP
+oneimage addattr <image_id> <attribute_name> <attribute_value>
+.TP
+\fBupdate\fR (Modifies an image attribute)
+.IP
+oneimage update <image_id> <attribute_name> <attribute_value>
+.TP
+\fBrmattr\fR (Deletes an Image attribute)
+.IP
+oneimage rmattr <image_id> <attribute_name>
+.TP
+\fBenable\fR (Enabled an Image)
+.IP
+oneimage enable <image_id>
+.TP
+\fBdisable\fR (Disabled an Image)
+.IP
+oneimage disable <image_id>
+.TP
+\fBpublish\fR (Publish an Image)
+.IP
+oneimage publish <image_id>
+.TP
+\fBunpublish\fR (Unpublish an Image)
+.IP
+oneimage unpublish <image_id>
+.TP
+\fBpersistent\fR (Makes an Image persistent)
+.IP
+oneimage persistent <image_id>
+.TP
+\fBnonpersistent\fR (Makes an Image non persistent)
+.IP
+oneimage nonpersistent <image_id>
+.TP
+\fBlist\fR (Shows Images in the pool)
+.IP
+oneimage list <filter_flag>
+.IP
+where filter_flag can be
+.TP
+a, all
+\fB\-\-\fR> all the known Images
+.TP
+m, mine
+\fB\-\-\fR> the Images belonging to the user in ONE_AUTH
+.TP
+and all the
+Public Images
+.TP
+uid
+\fB\-\-\fR> Images of the user identified by this uid
+.TP
+user
+\fB\-\-\fR> Images of the user identified by the username
+.TP
+\fBtop\fR (Lists Images continuously)
+.IP
+oneimage top
+.TP
+\fBshow\fR (Gets information about an specific Image)
+.IP
+oneimage show <image_id>
+.TP
+\fBdelete\fR (Deletes an already deployed Image)
+.IP
+oneimage delete <image_id>
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/oneimage.8.gz b/share/man/oneimage.8.gz
deleted file mode 100644
index ea2abbb5fbd4ee657a96c125ba5b088791161fd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1242
zcmV<01SR_)iwFQ155G(R1D#geZsRr(eb-k^{gee9#YrE!Xwv{r>}&-12HPnR)I~r`
zl+7+h3L+K9{rb+3x+UubXrCmKGv~~WGYmI97|mfeU&C}hite9a{Sd9-KAMbw0*EXe
zn1LNvykM3musy<_%ls;13NFK+e+e(cAY4Ddd@-KQ#<!1?A@siXpf``L-tq#j2A2a`
z=3LGAwv-I6!a+z|tD~_zgJF^hC5%OQp%pw@A%zv(^n!5p0JGtA9CVa7=g?V28QXD)
zb%xd?PJZ<?n=e+;DhO{uD=tVN_;Zs+*E%PBbF)d8e*tY&YB#u8I*FVWEaR3JUdZ8%
z#;dz!v{*;;SrDxE!qjZQ728T~!0tJe20gVJ@PG_*tR{2-bEk{;tQWy1z1^Hk#O{Op
z#RWQ!Yk2J+`~L(hE_rN;LYA2_gqR4EOLl~VuzMispz*c_tWeG?ErbgqmFgn%0cBfV
zT4!Yq%U+m}WPH#P^g$O1I-v_lg~S-N__}MblWHxVJ0+|M#5WB?zxn}VSz(3R1<riT
zUB($2knp(R%;14%ZMo7emp7y(yLW3ym}Mah(X*n!$Y4rL&SQ}Zo_HQl{`(7)C5N1e
zf>Kd4BwdDtqw7Rqc&t@oFay?S)SZA(^$B1=F(3Jl;eYJ{zGjr(V99M+prg1%3@me&
zfKFjw(yc+)6N)}q{%TvCmoCl=FSgon!di1F4P?5&y6U7=q*YG6ITVF5j=3>uDO=Ee
z7nJTTA+GlNKwhE_ZDCT3p=;8qDC9TD(n?nwK$Rcs{8)(H-gXUg#eO%RPKUEmQ|$%c
zVQKmto-L~d7NGK1r0<}p41}d(Cx;52Ya^^Kj^rZlvpkpB4!#6ov<T`e4K*@cV-LXs
zw*1Bk)GI0rMy1R_;iZPdo?`%s!1s)Vo463U52XRAW9n|T-7LW(v)=4sk|2`e2X8ab
zf!LOozq6>)for#X7T8#>8`)<v;?0Ju&YPOB%u$&;zNt>AmfI+O$mo^+A0cI}a&UxQ
z$9lf#Q$DZr8DEX=d!s`iyWgZie~0NMJD4>D_N4}6<o`besbo)}<mDEd<KCex{QpNF
zmFNkOQgvY->(xg<jrb{h=o(?&D(iF2zIOxPp1!xOIXHo-wE7$t1wMv;qkRIso=|7L
z4>&|ajgjtBuC;uJNAhs(TlaG++0NfffB!n$5Tkut-*i|Xn3Q$zLAD!OJBIH{A1XhL
zlg;{o?*;xwxVhE_5v5i;YAIDeaibZ{ozKS4!^ic5C&VsRF$AtG;x0ugk~i=bv`#yK
z2}a9}96$W9g^-rh#`FKG?zia*)nUg`<Dx#na5hoLNrcn1)TNQfChRYnn@g3R!7Mq&
zZ#2oo5AOgBdNnQMlf_H=r*5O`5%1dtlQheY*i3V&kLb+F%jx9bV7f`Mcv?o^9@fEK
zGfl1rgR9LsJsA7lN8X~)f8(<VCdg&rtUU>Ju|u-OBAAGnD}x4<irym>&|%JE{8T4>
z_@f$N`1*u166jS&y)VDPQJ463I|fQy%7jm-8y@^M<~a>InzT5Gn2Nc7jM)}FgeMOG
zdTW_b0ds?`PI)DTeHHfB=D%KC91e$&IRnXu3+V;S#U#2L&sJj$LO2Ni1r4ly2AK;0
E027p3H2?qr

diff --git a/share/man/onetemplate.1 b/share/man/onetemplate.1
new file mode 100644
index 0000000000..52650a38b9
--- /dev/null
+++ b/share/man/onetemplate.1
@@ -0,0 +1,117 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula Template command
+.SH SYNOPSIS
+.B onetemplate
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the user to manage templates.
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-list\fR x,y,z
+Selects columns to display with list
+command
+.TP
+\fB\-\-list\-columns\fR
+Information about the columns available
+to display, order or filter
+.TP
+\fB\-o\fR, \fB\-\-order\fR x,y,z
+Order by these columns, column starting
+with \- means decreasing order
+.TP
+\fB\-f\fR, \fB\-\-filter\fR x,y,z
+Filter data. An array is specified
+with column=value pairs.
+.TP
+\fB\-d\fR, \fB\-\-delay\fR seconds
+Sets the delay in seconds for top
+command
+.TP
+\fB\-x\fR, \fB\-\-xml\fR
+Returns xml instead of human readable text
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.SH COMMANDS
+.TP
+\fBcreate\fR (Registers a Template from a template file)
+.IP
+onetemplate create <file>
+.IP
+file is a file name where the Template description is located
+.TP
+\fBaddattr\fR (Add a new Template attribute)
+.IP
+onetemplate addattr <template_id> <attribute_name> <attribute_value>
+.TP
+\fBupdate\fR (Modifies a Template attribute)
+.IP
+onetemplate update <template_id> <attribute_name> <attribute_value>
+.TP
+\fBrmattr\fR (Deletes a Template attribute)
+.IP
+onetemplate rmattr <template_id> <attribute_name>
+.TP
+\fBpublish\fR (Publish a Template)
+.IP
+onetemplate publish <template_id>
+.TP
+\fBunpublish\fR (Unpublish an Template)
+.IP
+onetemplate unpublish <template_id>
+.TP
+\fBlist\fR (Shows Templates in the pool)
+.IP
+onetemplate list <filter_flag>
+.IP
+where filter_flag can be
+.TP
+a, all
+\fB\-\-\fR> all the known Templates
+.TP
+m, mine
+\fB\-\-\fR> the Templates belonging to the user in ONE_AUTH
+.TP
+and all the
+Public Templates
+.TP
+uid
+\fB\-\-\fR> Templates of the user identified by this uid
+.TP
+user
+\fB\-\-\fR> Templates of the user identified by the username
+.TP
+\fBtop\fR (Lists Templates continuously)
+.IP
+onetemplate top
+.TP
+\fBshow\fR (Gets information about an specific Template)
+.IP
+onetemplate show <template_id>
+.TP
+\fBdelete\fR (Deletes a Template)
+.IP
+onetemplate delete <template_id>
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/oneuser.1 b/share/man/oneuser.1
new file mode 100644
index 0000000000..468f9bd04f
--- /dev/null
+++ b/share/man/oneuser.1
@@ -0,0 +1,90 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula User command
+.SH SYNOPSIS
+.B oneuser
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the OpenNebula administrator to manage users, adding,
+listing and deleting them.
+.PP
+The create and passwd commands accept the [\-r, \fB\-\-read\-file]\fR option. Use this
+option to store the contents of a file (without hashing it) as the password.
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-list\fR x,y,z
+Selects columns to display with list
+command
+.TP
+\fB\-\-list\-columns\fR
+Information about the columns available
+to display, order or filter
+.TP
+\fB\-o\fR, \fB\-\-order\fR x,y,z
+Order by these columns, column starting
+with \- means decreasing order
+.TP
+\fB\-f\fR, \fB\-\-filter\fR x,y,z
+Filter data. An array is specified
+with column=value pairs.
+.TP
+\fB\-x\fR, \fB\-\-xml\fR
+Returns xml instead of human readable text
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-n\fR, \fB\-\-no\-hash\fR
+Store plain password into the database
+.TP
+\fB\-r\fR, \fB\-\-read\-file\fR
+Read password from file
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.SH COMMANDS
+.TP
+\fBcreate\fR (Creates a new user)
+.IP
+oneuser create username password
+.TP
+\fBdelete\fR (Removes a user)
+.IP
+oneuser delete <id>
+.TP
+\fBlist\fR (Lists all the users in the pool)
+.IP
+oneuser list
+.TP
+\fBpasswd\fR (Changes the given user's password)
+.IP
+oneuser passwd <id> password
+.PP
+Information Columns:
+.TP
+\fBUID\fR       User ID
+.TP
+\fBNAME\fR      Name of the user
+.TP
+\fBPASSWORD\fR  SHA1 encrypted password
+.TP
+\fBENABLE\fR    Whether the user is enabled or not
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/oneuser.8.gz b/share/man/oneuser.8.gz
deleted file mode 100644
index 73e54fb803d75defc671c4bf7fef9f26e6092216..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1039
zcmV+q1n~PGiwFQ255G(R17%fFbK*7-e)q4~^3r4m9Fjh?bG;@*fHa;VHiJoTGRHj#
zTgK|xl1CD7^w)P+vazq_1<6`{yZi08t8h1hMFMfMg|}o8y?ns-HA>+nS}lJ9h%B6$
zfdiLZGs|<>U!dew^H4Jh_u((UhWB9*ZeJl;FXMRm{JxsO=(iD!lFX_-*YGgCpVGGB
zGUoeZ#o!^FhV&`D7|Uyz<+YH)ScDf!!n+lfu!5UW5T>sX&)$~7;PP$)gWbD951Fbl
znB1ACA91oyqcjMgK}mkZ^Wf{Qh(4=^(9Pqn*n9)}(B68)&Bj?YOtYF>uDy|iTP)N0
zCR%T!Bo2aYDNN@KxMcf^8?YrG2E_Vglm@E+joE<%1!Bf{oC|pv2Njy&0thMR6?Yqi
zs*%g}8a;8yG)KOjMZ=6a=bdW<EX#Ofo$If=i5|n#(-T_fyGbD`{tbMtA+du-!UX;U
zg<~)*?rvsES}v^tRR9CJ2sdY8OLeqRGE-7S!rlV&Il35>&O^sb;wV9ux9eb6JntqI
zQZ@#+#0_SLd-y)SjQ<Hz%rCRVTy?Cap(t`;nu=Y3`~g`9*BW+!Ey|?5g>XS63#DtX
z61Jx}eI6c`otUVoCPD9D3>Yyg1WSPlVrhGPH4NBU^${oT5(*vh&DF!WT_A@{Q^5ik
zJ_@qt3<JnHmCO)t4zKrB41M`PdS@?g4>_|egc)Y0H8O)rGY!u~A$acnc;|ndSaqao
z2yMdN!)fT@#PwboPLyqVRT-$M=3>B}C|c?~>E!H)nlh$1Rz0X3f=acUkSqu_bs|E7
zg}mwl@sW2zrA+qB@E%AHfqJ15)CPAwMxj;hq}bmrhj(f4xByCZHcr}Z7GVL5!7dxB
z2T3rPYH!_sa1E8I=Ay-+v_n>$u;<C!+bmvOmF>Hbs&zAWOB5PNes&Fg8-&q1Xva*~
zu(XyqNUm9RP_EBC)P~pU<e>f!<IUi+$RE3#T|eEdaDlg~$`S2m3TEK@Q>p4lAlFwd
zf}bEhjgrYjJGc(w#HGXe*<9oO5v83y6wV+coKeGWocj*>)VX_)7UawS+>DME-5Cw^
z>tRepsp6VWXSANB>6c{VQPS7hJ<i)qUmALV{>$q!o;|NR$S);FEPVx}M)IRNrzs$n
zZOgp=*hGK6ZiD$%3J=ri!)`*))p$73*INCJ^9xp}R0B8tNvQPU)={w%8J7k<9A)16
zo;57PzxHGdf3@nvw-0W}VALLsZhwc1I^sKV2{1Ye+6&uFWd7YvdaN<_YEua&Gw!FR
z?a@Q{@BpCp7JD*aPT(D{trakw>((}(?(WX#bI4qPl*3)+4b0stnlIyYi6n&6;9o_`
J)NL0C008#X044wc

diff --git a/share/man/onevm.1 b/share/man/onevm.1
new file mode 100644
index 0000000000..79206a655c
--- /dev/null
+++ b/share/man/onevm.1
@@ -0,0 +1,235 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula Virtual Machine command
+.SH SYNOPSIS
+.B onevm
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the user to manage virtual machines in OpenNebula.
+The user can allocate, deploy, migrate, suspend, resume and shutdown a virtual
+machine with the functionality present in onevm.
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-list\fR x,y,z
+Selects columns to display with list
+command
+.TP
+\fB\-\-list\-columns\fR
+Information about the columns available
+to display, order or filter
+.TP
+\fB\-o\fR, \fB\-\-order\fR x,y,z
+Order by these columns, column starting
+with \- means decreasing order
+.TP
+\fB\-f\fR, \fB\-\-filter\fR x,y,z
+Filter data. An array is specified
+with column=value pairs.
+.TP
+\fB\-d\fR, \fB\-\-delay\fR seconds
+Sets the delay in seconds for top
+command
+.TP
+\fB\-x\fR, \fB\-\-xml\fR
+Returns xml instead of human readable text
+.TP
+\fB\-t\fR, \fB\-\-type\fR type
+Image type
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.SH COMMANDS
+.TP
+\fBcreate\fR (Submits a new virtual machine, adding it to the ONE VM pool)
+.IP
+onevm create <template>
+.IP
+template is a file name where the VM description is located
+.TP
+\fBdeploy\fR (Starts an existing VM in an specific host)
+.IP
+onevm deploy <vm_id> <host_id>
+.IP
+States: PENDING
+.TP
+\fBshutdown\fR (Shuts down an already deployed VM)
+.IP
+onevm shutdown <vm_id>
+.IP
+States: RUNNING
+.TP
+\fBlivemigrate\fR (Migrates a running VM to another host without downtime)
+.IP
+onevm livemigrate <vm_id> <host_id>
+.IP
+States: RUNNING
+.TP
+\fBmigrate\fR (Saves a running VM and starts it again in the specified host)
+.IP
+onevm migrate <vm_id> <host_id>
+.IP
+States: RUNNING
+.TP
+\fBhold\fR (Sets a VM to hold state, scheduler will not deploy it)
+.IP
+onevm hold <vm_id>
+.IP
+States: PENDING
+.TP
+\fBrelease\fR (Releases a VM from hold state, setting it to pending)
+.IP
+onevm release <vm_id>
+.IP
+States: HOLD
+.TP
+\fBstop\fR (Stops a running VM)
+.IP
+onevm stop <vm_id>
+.IP
+States: RUNNING
+.TP
+\fBcancel\fR (Cancels a running VM)
+.IP
+onevm cancel <vm_id>
+.IP
+States: RUNNING
+.TP
+\fBsuspend\fR (Saves a running VM)
+.IP
+onevm suspend <vm_id>
+.IP
+States: RUNNING
+.TP
+\fBresume\fR (Resumes the execution of a saved VM)
+.IP
+onevm resume <vm_id>
+.IP
+States: STOPPED, SUSPENDED
+.TP
+\fBsaveas\fR (Set the specified vms disk to be saved in a new image (image_name)
+.IP
+when the vm shuts down)
+.IP
+onevm saveas <vm_id> <disk_id> <image_name>
+.IP
+(Set a different type for the new Image)
+.IP
+onevm saveas <vm_id> <disk_id> <image_name> \fB\-t\fR/\-\-type <type>
+.TP
+\fBdelete\fR (Deletes a VM from the pool)
+.IP
+onevm delete <vm_id>
+.IP
+States: ANY
+.TP
+\fBrestart\fR (Forces a re\-deployment of a VM in UNKNOWN or BOOT state)
+.IP
+onevm restart <vm_id>
+.IP
+States: UNKNOWN, BOOT
+.TP
+\fBresubmit\fR (Resubmits a VM to PENDING state)
+.IP
+onevm resubmit <vm_id>
+.IP
+States: ANY, except SUSPENDED or DONE
+.TP
+\fBlist\fR (Shows VMs in the pool)
+.IP
+onevm list <filter_flag>
+.IP
+where filter_flag can be
+.TP
+a, all
+\fB\-\-\fR> all the known VMs
+.TP
+m, mine
+\fB\-\-\fR> the VMs belonging to the user in ONE_AUTH
+.TP
+uid
+\fB\-\-\fR> VMs of the user identified by this uid
+.TP
+user
+\fB\-\-\fR> VMs of the user identified by the username
+.TP
+\fBshow\fR (Gets information about a specific VM)
+.IP
+onevm show <vm_id>
+.TP
+\fBtop\fR (Lists VMs continuously)
+.IP
+onevm top
+.TP
+\fBhistory\fR (Gets history from VMs)
+.IP
+onevm history [<vm_id> <vm_id> ...]
+.IP
+if no vm_id is provided it will list history for all known VMs
+.PP
+Information Columns:
+.TP
+\fBID\fR        ONE VM identifier
+.TP
+\fBUSER\fR      Username of the VM owner
+.TP
+\fBNAME\fR      Name of the VM
+.TP
+\fBSTAT\fR      Status of the VM
+.TP
+\fBCPU\fR       CPU percentage used by the VM
+.TP
+\fBMEM\fR       Memory used by the VM
+.TP
+\fBHOSTNAME\fR  Host where the VM is being or was run
+.TP
+\fBTIME\fR      Time since the submission of the VM (days hours:minutes:seconds)
+.PP
+VM States:
+.TP
+\fBpend\fR   pending
+.TP
+\fBhold\fR   VM on hold (not runnable)
+.TP
+\fBstop\fR   stopped
+.TP
+\fBsusp\fR   suspended
+.TP
+\fBdone\fR   finished
+.TP
+\fBprol\fR   prolog
+.TP
+\fBboot\fR   booting
+.TP
+\fBrunn\fR   running
+.TP
+\fBmigr\fR   migrating
+.TP
+\fBsave\fR   saving the VM to disk
+.TP
+\fBepil\fR   epilog
+.TP
+\fBshut\fR   shutting down
+.TP
+\fBfail\fR   failed
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/onevm.8.gz b/share/man/onevm.8.gz
deleted file mode 100644
index 80943fde9b2438e224e8079f6bdffe270f3e1f2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1860
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

diff --git a/share/man/onevnet.1 b/share/man/onevnet.1
new file mode 100644
index 0000000000..a78a343a01
--- /dev/null
+++ b/share/man/onevnet.1
@@ -0,0 +1,117 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.37.1.
+.TH OPENNEBULAPRO "1" "May 2011" "OpenNebulaPro 2.2.0" "User Commands"
+.SH NAME
+OpenNebulaPro \- OpenNebula Virtual Network command
+.SH SYNOPSIS
+.B onevnet
+[\fI<options>\fR] \fI<command> \fR[\fI<parameters>\fR]
+.SH DESCRIPTION
+
+This command enables the user to manage virtual networks in the OpenNebula
+server. It provides functionality to create, get information and delete a
+particular network or to list available and used IP's.
+.SH OPTIONS
+.TP
+\fB\-l\fR, \fB\-\-list\fR x,y,z
+Selects columns to display with list
+command
+.TP
+\fB\-\-list\-columns\fR
+Information about the columns available
+to display, order or filter
+.TP
+\fB\-o\fR, \fB\-\-order\fR x,y,z
+Order by these columns, column starting
+with \- means decreasing order
+.TP
+\fB\-f\fR, \fB\-\-filter\fR x,y,z
+Filter data. An array is specified
+with column=value pairs.
+.TP
+\fB\-x\fR, \fB\-\-xml\fR
+Returns xml instead of human readable text
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Tells more information if the command
+is successful
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Shows this help message
+.TP
+\fB\-\-version\fR
+Shows version and copyright information
+.SH COMMANDS
+.TP
+\fBcreate\fR (Creates a new virtual network)
+.IP
+onevnet create <template>
+.IP
+template is a filename where the virtual network is described
+.TP
+\fBshow\fR (Gets info from a virtual network)
+.IP
+onevnet show <network_id>
+.TP
+\fBpublish\fR (Publish a virtual network)
+.IP
+onevnet publish <network_id>
+.TP
+\fBunpublish\fR (Unpublish a virtual network)
+.IP
+onevnet unpublish <network_id>
+.TP
+\fBdelete\fR (Removes a virtual network)
+.IP
+onevnet delete <network_id>
+.TP
+\fBaddleases\fR (Adds a lease to the virtual network)
+.IP
+onevnet addleases <network_id> <IP> [<MAC>]
+.TP
+\fBrmleases\fR (Removes a lease fom the virtual network)
+.IP
+onevnet rmleases <network_id> <IP>
+.TP
+\fBlist\fR (Lists virtual networks in the pool)
+.IP
+onevnet list <filter_flag>
+.IP
+where filter_flag can be
+.TP
+a, all
+: all the known VNs
+.IP
+m, mine : the VNs belonging to the user in ONE_AUTH
+.IP
+and all the Public VNs
+.TP
+uid
+: VNs of the user identified by this uid
+.TP
+user
+: VNs of the user identified by the username
+.PP
+Information columns:
+.TP
+\fBNID\fR       Network ID
+.TP
+\fBNAME\fR      Name of the virtual network
+.TP
+\fBTYPE\fR      Type of virtual network (0=ranged, 1=fixed)
+.TP
+\fBBRIDGE\fR    Bridge associated to the virtual network
+.TP
+\fBLEASES\fR    Number of leases used from this virtual network
+.SH COPYRIGHT
+Copyright 2010\-2011, C12G Labs S.L.
+.PP
+Licensed under the C12G Commercial Open\-source License (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License as part
+of the software distribution.
+.PP
+Unless agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and
+limitations under the License.
diff --git a/share/man/onevnet.8.gz b/share/man/onevnet.8.gz
deleted file mode 100644
index 6d4825c0561065469c3006a6073eacb0b3eb17a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1198
zcmV;f1X24RiwFP~55G(R1C3T&PvbZge)q39+m{6?gu*_|iUp)X%MhugQB#o6c7@!;
zX}#mvQS9`xzkZLMqzNoDvpkg8KIc2%x!V460OJ{ivjsfO#=*lYEFOax9)juQ7l6RP
zj%rvl$x3Qi3abNbm?$oDD&fNa?Tdfm6MyjtvuF~Ale_2X2nN3oU@%LJTCox?hZjS;
zESL=0suC0~{h@ES;)6CUhf$hy$+bavt|UAgF1X=L4~QQ>LO6Pwke>4L40@{<UYd#u
z2$|Wb@*5;7M_#GZj9<f96bCW!??6emmCTSomsxPF3TsH;F0=VxU^g1ATU^YYL_tfM
zGsDVS$ia;#@%=oA7QrkeWU=A8H3m%5m0%johC!v#WupKO=$gT{;U{Z;8n|>~oeKmN
zwygARpo>y%d5TC`B@@e$Vk8b0E-4uX-@`N*gveBx*TJ&pQznoqP=c%tPY|<g?SXP+
z1V$I=mU3Z<Iwj<pLJ<9`edpZF`GuicL}Z!WEzbn{?ScEm1?uA(_TIt!hs0<vG1h%i
z<x*P%Dc6Od2iS45an{H&5iMYYa@J@e90~f4tW;%OXj<4KU(y-y(4iCqjBaIIV17D$
z)hFzvI>s}ngoTUv`e?yxK0q5AIJqW{J{DNcC=y7Sjk?Bz+G=Mj>)Wb{bjBXs8d7Sg
z4<q!fEHN@zF1la|&p1nKJGJqfEfp1mg7VU)qP4K^TiE9|8)VK*RU$83Vhv#H&=gb#
zo62?~GEH4_4cnUzXWPfYGFvIlEY^Yvp&?f#dsj|8Yf?}r&yuc^glU~sq66LZLG3KC
zi19}4Yzv@{-NG1ZjUCW00JN{sN+;cHxPnYnaVYtE^RB*KZQjqGo<`yLSe$h)*npqh
zyHBhYEco5WW;-Q*5Rs<yn+}3&oH$rXhTXc;c4hNJZB1b>=L~imhLN$M_<(8UutAfO
zuh_A;H9F(yd}T&E`jC|>N5CI4vTAVM9KG@Mw#6%|752);K}PlW&#)SmPvI)r2YhZ<
zKZ87~eF|C+9fvq)x!SrU{1C4hQ=fsg^W|iUANspPvrtOB$8>}3y6(WYOwe_m)jEB>
zZAh?1R&_B_52z62%KkdoZ&K|fyoB26<{sd6#Nf)E;V$Y4CD(Qg;2=8Ac;qw-CvT(Y
z#iP@+HQXY)q$M>ZTC8}A<}8%TdH^Yt#?6CzGGS#|L8pM{|3jnRwgpT4D0(+en-O=_
zMmP+{Ho)~?dsznK<1t>c$Mev3Kx6kqDq8u)Yt+dv4uzBd*eWN(o07^kOFg)_$@re7
zr>*|oJQ#m%5$;N!;#EntRta}cj3&<CF+QD);z`^nhgEJL8E9VMti~#I7n^H87t;S=
zxPcPA&V#Ry3vz!PI+w%Y<?_tFRlNTDA}ZD2c-g@e$E${u?!;H+`qYJe$`dB7(MsA|
z#u6VDG{Jw(i3cyuoWq9?oLGTDb2K>p0}iUf*TR8FWi0ucww*-4_6aNOJhTJ35S+?{
z)mN<P(0zEV0YI$`<&sc0O4|fBQa}xCj47_p&v(0>PaQ$)!?~yh^!YTnpM>!QgWwOz
MznzJMN)!qJ0JXwRg#Z8m

diff --git a/src/authm/SConstruct b/src/authm/SConstruct
index e157af4dc8..ea9531a972 100644
--- a/src/authm/SConstruct
+++ b/src/authm/SConstruct
@@ -1,4 +1,4 @@
-# SConstruct for src/vm
+# SConstruct for src/authm
 
 # -------------------------------------------------------------------------- #
 # Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #