On Mon, Feb 10, 2014 at 12:15:11PM +0900, Nobuhiko Tanibata wrote: > Add description of key:shell to CORE SECTION and move a example of > desktop-shell from key:modules to key:shell. > Add cms-colord.so to key:modules of CORE SECTION. > > Signed-off-by: Nobuhiko Tanibata <nobuhiko_tanib...@xddp.denso.co.jp>
I backed out the v1 of this patch that I mentioned above and applied this one. Btw, it's always good to write a quick comment about what changed between v1 and v2 of a patch so everybody knows why the new version was sent out. > --- Here, below the --- that git inserts is a good place to put the comment about what changes - for example: v2: Remove 0001-weston.ini.man.patch from v1 of this patch Kristian > man/weston.ini.man | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/man/weston.ini.man b/man/weston.ini.man > index ce3f928..dfb00c6 100644 > --- a/man/weston.ini.man > +++ b/man/weston.ini.man > @@ -92,16 +92,29 @@ The > .B core > section is used to select the startup compositor modules. > .TP 7 > -.BI "modules=" desktop-shell.so,xwayland.so > -specifies the modules to load (string). Available modules in the > +.BI "shell=" desktop-shell.so > +specifies a shell to load (string). This can be used to load your own > +implemented shell or one with Weston as default. Available shells > +in the > .IR "__weston_modules_dir__" > directory are: > .PP > .RS 10 > .nf > .BR desktop-shell.so > -.BR tablet-shell.so > +.fi > +.RE > +.TP 7 > +.TP 7 > +.BI "modules=" xwayland.so,cms-colord.so > +specifies the modules to load (string). Available modules in the > +.IR "__weston_modules_dir__" > +directory are: > +.PP > +.RS 10 > +.nf > .BR xwayland.so > +.BR cms-colord.so > .fi > .RE > .TP 7 > -- > 1.8.3.1 > > _______________________________________________ > wayland-devel mailing list > wayland-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel