[TRANSLATION] Change and Additions in x11.en.xml

Update of /cvsroot/fink/web/xml/x11
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15958

Modified Files:
	x11.en.xml
Log Message:
Change in x11.en.xml

Index: x11.en.xml
===================================================================
RCS file: /cvsroot/fink/web/xml/x11/x11.en.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- x11.en.xml	13 May 2004 22:06:26 -0000	1.8
+++ x11.en.xml	16 May 2004 00:11:35 -0000	1.9
@@ -1293,18 +1293,28 @@
  the environment variable "DISPLAY".
  This variable tells the applications where to find the X11 window
  server.
-In the default setup - XDarwin runs on the same machine, your shell is
-tcsh - you can set the variable as follows:
+In the default setup - XDarwin runs on the same machine -, you can set 
the variable as follows:
  </p>
+<ul>
+<li><p>For tcsh users:</p>
        <codeblock>setenv DISPLAY :0.0</codeblock>
+</li>
+<li><p>For bash users:</p>
+<codeblock>export DISPLAY=":0.0"</codeblock>
+</li>
+</ul>
        <p>
  A nice setup is to have XDarwin.app started when you log in (settable
-in the Login panel of the System Preferences) and add the following to
-your .cshrc:
+in the Login panel of the System Preferences on Mac OS 10.2, in the 
Accounts panel, Startup items on Mac OS 10.3):
  </p>
+<ul><li><p>For tcsh users, add the following to your .cshrc file:</p>
        <codeblock>if (! $?DISPLAY) then
    setenv DISPLAY :0.0
  endif</codeblock>
+</li>
+<li><p>For bash users, add the following to your .zshrc file:</p>
+<codeblock>[[ -z $DISPLAY ]] &amp;&amp; export 
DISPLAY=":0.0"</codeblock>
+</li></ul>
        <p>
  This sets DISPLAY automatically in every shell.
  It doesn't override the current value when DISPLAY is already set,
@@ -1362,11 +1372,10 @@
        <p>
  (Make sure it's <em>before</em> the line that exec's the window
  manager and never returns! Don't just add it at the end, it won't
-be executed.)
+be executed.) And remember that it is no more necessary for Apple's 
X11 (see <xref chapter="inst-xfree86" section="apple-binary" >Some 
notes on using Apple's X11</xref>).
  </p>
-      <p>If you are using Apple's X11, then you can use Command-C or 
Edit->Copy, as
-usual for Mac apps, to copy text to the clipboard.  However, pasting
-from the clipboard to Apple X11 via Command-V doesn't work yet.</p>
+      <p>If you are using Apple's X11, then you can use Command-C or 
Edit->Copy, as usual for Mac apps, to copy text to the clipboard, and 
the middle-mouse button or Command-V to paste from the clipboard to 
Apple X11.</p>
+<p>In any case, if you encounter problems copying or pasting from Aqua 
to X11 and vice-versa, you may first try to do the pasting part twice 
(it may happen that the copy does not occur at once), then use 
intermediate applications, e.g. TextEdit or Terminal.app on the Aqua 
side, nedit or an xterm on the X11 side. In my experience, there is 
always a solution.</p>
      </section>
    </chapter>
  </document>


Michèle
<http://micmacfr.homeunix.org>