xserver: Branch 'master' - 2 commits

[Daniel Stone]

 hw/xfree86/doc/man/xorg.conf.man.pre |   16 ++++++++--------
 hw/xfree86/loader/loadmod.c          |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 94f412cb7e954fe872fed979057cbdfbef953c6f
Author: Julien Goodwin <julien at studio442.com.au>
Date:   Sun Jan 27 12:30:16 2008 +1100

    Loader: Fix verbosity confusion
    
    'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
    This means that gdm's log would just be full of bare 'module already
    built-in' messages.

diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 584cabf..45e9cb3 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -864,7 +864,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
     for (cim = compiled_in_modules; *cim; cim++)
 	if (!strcmp (module, *cim))
 	{
-	    xf86MsgVerb(X_INFO, 0, "Module \"%s\" already built-in\n", module);
+	    xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", module);
 	    return (ModuleDescPtr) 1;
 	}
 
commit 442838fcb3bf07ac57553ae5600d9e6c59a559bb
Author: Julien Goodwin <julien at studio442.com.au>
Date:   Sun Jan 27 12:27:26 2008 +1100

    xorg.conf.man: Fix monitor/output confusion in monitor positioning
    
    On the Intel driver at least, LeftOf/RightOf/Above/Below in xorg.conf refers
    to output names, not monitor names.  Fix nomenclature in xorg.conf.man.

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 1369a16..608ba37 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1432,24 +1432,24 @@ This optional entry specifies the position of the monitor within the X
 screen.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qLeftOf\*q  " \*qmonitor\*q
+.BI "Option " "\*qLeftOf\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned to the
-left of the monitor of the given name.
+left of the output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qRightOf\*q  " \*qmonitor\*q
+.BI "Option " "\*qRightOf\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned to the
-right of the monitor of the given name.
+right of the output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qAbove\*q  " \*qmonitor\*q
+.BI "Option " "\*qAbove\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned above the
-monitor of the given name.
+output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qBelow\*q  " \*qmonitor\*q
+.BI "Option " "\*qBelow\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned below the
-monitor of the given name.
+output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
 .BI "Option " "\*qEnable\*q  " \*qbool\*q