public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jon TURNEY <jturney@sourceware.org>
To: cygwin-apps-cvs@sourceware.org
Subject: [xorg-doc - Cygwin X.Org documentation] branch master, updated. e803fa9e1674124f5da3b42804c1afe880e04ed5
Date: Mon, 10 Jan 2022 18:21:00 +0000 (GMT)	[thread overview]
Message-ID: <20220110182100.248893858C60@sourceware.org> (raw)




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=e803fa9e1674124f5da3b42804c1afe880e04ed5

commit e803fa9e1674124f5da3b42804c1afe880e04ed5
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Dec 24 23:26:43 2021 +0000

    Drop mention of x86 installer
    
    Drop mention of x86 installer, since x86 is going to be dropped.
    
    Polish text discussing default root directory with that in mind.
    Also switch to https URLs

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/xorg-doc.git;h=b8fae4f8f568f253b159e0b73a2b85a919c44109

commit b8fae4f8f568f253b159e0b73a2b85a919c44109
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Dec 22 15:40:00 2021 +0000

    Add somehow omitted LXQT to list of DEs
    
    Also xref WM/DM list from installation instructions


Diff:
---
 common/entities.xml |  2 +-
 ug/setup.xml        | 35 +++++++++++++++--------------------
 ug/using.xml        |  3 +++
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/common/entities.xml b/common/entities.xml
index 5127736..8a60c23 100644
--- a/common/entities.xml
+++ b/common/entities.xml
@@ -87,7 +87,7 @@
 <!ENTITY cygnus-menu "Cygwin">
 <!ENTITY cygwin-menu-bash "Cygwin Bash Shell">
 <!ENTITY cygwin "Cygwin">
-<!ENTITY cygwin-home "http://cygwin.com/">
+<!ENTITY cygwin-home "https://cygwin.com/">
 <!ENTITY cygwin-ml "cygwin@cygwin.com">
 <!ENTITY cygwin-url-mirrors "&cygwin-home;mirrors.html">
 <!ENTITY cygwin-url-lists "&cygwin-home;lists.html">
diff --git a/ug/setup.xml b/ug/setup.xml
index fd99a44..5af15bb 100644
--- a/ug/setup.xml
+++ b/ug/setup.xml
@@ -11,21 +11,16 @@ the necessary &cygwin; packages for you.</para>
 <orderedlist numeration="arabic">
 
 <listitem>
-<para>Open the &cygwin;, <ulink
-url="&cygwin-home;">&cygwin-home;</ulink> page in your web
-browser</para>
+<para>
+Open the <ulink url="&cygwin-home;">&cygwin; home page</ulink> in your web
+browser.
+</para>
 </listitem>
 
-
 <listitem>
-<para>Click on the
-<ulink url="http://cygwin.com/setup-x86_64.exe"><quote>setup-x86_64.exe</quote></ulink> (64-bit installation) or
-<ulink url="http://cygwin.com/setup-x86.exe"><quote>setup-x86.exe</quote></ulink> (32-bit installation) link
-to download the appropriate setup program from the primary &cygwin; server.
-Save it to the directory that you would like to store the downloaded packages in
-(e.g. <filename class="directory">c:\download</filename>).  Do not
-save to <filename class="directory">c:\cygwin</filename>, as that is the default
-directory for the extraction and installation of the downloaded packages.
+<para>Click on the <ulink
+url="https://cygwin.com/setup-x86_64.exe"><filename>setup-x86_64.exe</filename></ulink>
+link to download the setup program.
 </para>
 </listitem>
 
@@ -81,11 +76,9 @@ screen.</para>
 
 
 <listitem>
-<para>The default <guilabel>Install Root</guilabel> is <filename
-class="directory">c:\cygwin</filename> which should be fine for most
-installations.  Leave <guilabel>Default Text File Type</guilabel> as
-<acronym>UNIX</acronym>. Leave <guilabel>Install For</guilabel> set 
-to <guilabel>All </guilabel> unless you lack local administrative privileges.
+<para>The default <guilabel>Root Directory</guilabel> should be fine for most
+installations. Leave <guilabel>Install For</guilabel> set to <guilabel>All Users
+</guilabel> unless you lack local administrative privileges.
 </para>
 
 <mediaobject>
@@ -211,8 +204,10 @@ on the Start Menu to run it), <command>startxdmcp.bat</command> )</para>
 </listitem>
 
 <listitem>
-<para>You may also select any X client programs you want
-to use, and any fonts you would like to have available.
+<para>You may also select any X client programs you want to use, any X Window
+Manager or Desktop Environment you want to use (see <xref
+linkend="using-starting-session"></xref>), and any fonts you would like to have
+available.
 </para>
 </listitem>
 
@@ -318,7 +313,7 @@ format="PNG"></imagedata>
 <listitem>
   <para>
     (optional but recommended) Install the cygserver service.  See the
-    instructions in <xref linkend="using-shared-memory"></xref>).
+    instructions in <xref linkend="using-shared-memory"></xref>.
   </para>
 </listitem>
 
diff --git a/ug/using.xml b/ug/using.xml
index 9eb1967..3d33566 100644
--- a/ug/using.xml
+++ b/ug/using.xml
@@ -124,6 +124,9 @@ Full documentation for <command>startxwin</command> can be read with
     <listitem>
       <para>LXDE Desktop Environment: install the <filename>lxde-common</filename> package</para>
     </listitem>
+    <listitem>
+      <para>LXQT Desktop Environment: install the <filename>lxqt-session</filename> package</para>
+    </listitem>
     <listitem>
       <para>MATE Desktop Environment: install the <filename>mate-session-manager</filename> package</para>
     </listitem>



                 reply	other threads:[~2022-01-10 18:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220110182100.248893858C60@sourceware.org \
    --to=jturney@sourceware.org \
    --cc=cygwin-apps-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).