On Sat, Feb 08, 2014 at 04:44:14PM +0900, Nobuhiko Tanibata wrote: > Add 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>
Thank you, patch applied. I amended the commit to remove the 0001-Improvement-of-weston.ini.man.patch file that snug in there. Kristian > --- > 0001-Improvement-of-weston.ini.man.patch | 50 > ++++++++++++++++++++++++++++++++ > man/weston.ini.man | 17 +++++++++-- > 2 files changed, 64 insertions(+), 3 deletions(-) > create mode 100644 0001-Improvement-of-weston.ini.man.patch > > diff --git a/0001-Improvement-of-weston.ini.man.patch > b/0001-Improvement-of-weston.ini.man.patch > new file mode 100644 > index 0000000..bcaad57 > --- /dev/null > +++ b/0001-Improvement-of-weston.ini.man.patch > @@ -0,0 +1,50 @@ > +From 619cd4c17aa1f856522aad7d6f68f504e0007257 Mon Sep 17 00:00:00 2001 > +From: Nobuhiko Tanibata <nobuhiko_tanib...@xddp.denso.co.jp> > +Date: Fri, 7 Feb 2014 14:18:48 +0900 > +Subject: [PATCH weston.ini.man] Improvement of weston.ini.man Add 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> > +--- > + man/weston.ini.man | 17 ++++++++++++++--- > + 1 file changed, 14 insertions(+), 3 deletions(-) > + > +diff --git a/man/weston.ini.man b/man/weston.ini.man > +index ce3f928..7b9ce0a 100644 > +--- a/man/weston.ini.man > ++++ b/man/weston.ini.man > +@@ -92,16 +92,27 @@ 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 the shell to load (string). 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 > + > diff --git a/man/weston.ini.man b/man/weston.ini.man > index ce3f928..7b9ce0a 100644 > --- a/man/weston.ini.man > +++ b/man/weston.ini.man > @@ -92,16 +92,27 @@ 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 the shell to load (string). 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