From 78c97a70cdccf45a95cff74414ae82b0089f836c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jir=C3=A1sek?= <pavel.jirasek@vsb.cz>
Date: Wed, 25 Jan 2017 13:59:45 +0100
Subject: [PATCH] Merged X11 and Using Cygwin

---
 .../cygwin-and-x11-forwarding.md              | 27 ------------------
 .../x-window-system.md                        | 28 ++++++++++++++++++-
 mkdocs.yml                                    |  1 -
 3 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md

diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md
deleted file mode 100644
index e98bf9f04..000000000
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Cygwin and X11 forwarding
-=========================
-
-**If no able to forward X11 using PuTTY to CygwinX**
-
-```bash
-[usename@login1.anselm ~]$ gnome-session &
-[1] 23691
-[usename@login1.anselm ~]$ PuTTY X11 proxy: unable to connect to forwarded X server: Network error: Connection refused
-PuTTY X11 proxy: unable to connect to forwarded X server: Network error: Connection refused
-
-  (gnome-session:23691): WARNING **: Cannot open display:**
-```
-
-1. Locate and modify Cygwin shortcut that uses [startxwin](http://x.cygwin.com/docs/man1/startxwin.1.html)
-    locate
-    C:cygwin64binXWin.exe
-    change it
-    to
-    C:*cygwin64binXWin.exe -listen tcp*
-
-![XWin-listen-tcp.png](../../../img/XWinlistentcp.png "XWin-listen-tcp.png")
-
-2. Check Putty settings:
-     Enable X11 forwarding
-
-    ![](../../../img/cygwinX11forwarding.png)
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
index 3c6b877ca..e4a3c023c 100644
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
+++ b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
@@ -52,7 +52,7 @@ There are variety of X servers available for Windows environment. The commercial
 
  |How to use Xwin |How to use Xming |
  | --- | --- |
- |[Install Cygwin](http://x.cygwin.com/) Find and execute XWin.exeto start the X server on Windows desktop computer.[If no able to forward X11 using PuTTY to CygwinX](cygwin-and-x11-forwarding/) |<p>Use Xlaunch to configure the Xming.<p>Run Xmingto start the X server on Windows desktop computer.|
+ |[Install Cygwin](http://x.cygwin.com/) Find and execute XWin.exeto start the X server on Windows desktop computer.[If no able to forward X11 using PuTTY to CygwinX](#if-no-able-to-forward-x11-using-putty-to-cygwinx) |<p>Use Xlaunch to configure the Xming.<p>Run Xmingto start the X server on Windows desktop computer.|
 
 Read more on [http://www.math.umn.edu/systems_guide/putty_xwin32.html](http://www.math.umn.edu/systems_guide/putty_xwin32.shtml)
 
@@ -140,3 +140,29 @@ $ gnome-session &
 In this way, we run remote gnome session on the cluster, displaying it in the local X server
 
 Use System-&gt;Log Out to close the gnome-session
+
+
+### If no able to forward X11 using PuTTY to CygwinX
+
+```bash
+[usename@login1.anselm ~]$ gnome-session &
+[1] 23691
+[usename@login1.anselm ~]$ PuTTY X11 proxy: unable to connect to forwarded X server: Network error: Connection refused
+PuTTY X11 proxy: unable to connect to forwarded X server: Network error: Connection refused
+
+  (gnome-session:23691): WARNING **: Cannot open display:**
+```
+
+1. Locate and modify Cygwin shortcut that uses [startxwin](http://x.cygwin.com/docs/man1/startxwin.1.html)
+    locate
+    C:cygwin64binXWin.exe
+    change it
+    to
+    C:*cygwin64binXWin.exe -listen tcp*
+
+![XWin-listen-tcp.png](../../../img/XWinlistentcp.png "XWin-listen-tcp.png")
+
+2. Check Putty settings:
+     Enable X11 forwarding
+
+    ![](../../../img/cygwinX11forwarding.png)
diff --git a/mkdocs.yml b/mkdocs.yml
index 2339be1ee..cef21c611 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,7 +25,6 @@ pages:
       - OpenSSH Keys (UN*X): get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
       - PuTTY (Windows): get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
       - X Window System: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
-      - X Window System Using Cygwin: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md
       - VNC: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md
       - VPN Access: get-started-with-it4innovations/accessing-the-clusters/vpn-access.md
 #    - VPN-Connection-Fail-in-Win-8.1: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
-- 
GitLab