Changes in f08ccc5: edits on faq-remote-X11-beta, not tested for rendering, etc.

				faq-remote-X11-beta.md
			
          @@ -1,21 +1,15 @@

           # Persistent Remote X11 connections

           [X2GO](x2go.org) and [XPRA](xpra.org) can be used to run (and interact with) GUI applications on remote hosts.

          +For all systems off of the sbgrid network it will be easiest if you use the [cmcd-vpn](faq-connecting-to-cmcd-vpn).

           Please [contact us](mailto:help@sbgrid.org) if your SBGrid-supported remote host lacks pre-requisite server-side software, such as the `xpra` program.

           ## x2go

          -### download

          -

          -x2go can be downloaded from this page.

          -

          -* <https://wiki.x2go.org/doku.php/download:start>

          -

          -#### Additional Steps

          +[Download](https://wiki.x2go.org/doku.php/download:start) and install the X2GO client.

           You will need to open System Preferences - Security - General - Temporarily 'Allow from anywhere' open the application, make sure you can reopen it. Then change your security setting back to 'App Store and Identified Developers'

          -For all systems off of the sbgrid network it will be easiest if you use the [cmcd-vpn](faq-connecting-to-cmcd-vpn).

           x2go requires XQuartz - see [faq-using-sbgrid-programs](faq-using-sbgrid-programs) if you do not already have it installed.

          @@ -28,7 +22,7 @@ Make sure you fill out the following -

             3. port - 22

             4. Session type - Mate

          -You can adjust the resolution after the session has started.

          +You can adjust the desktop size after the session has started.

           ## Xpra

          @@ -37,7 +31,7 @@ You can adjust the resolution after the session has started.

           ### On remote workstation

          -On remote system - copy xpra-launch.sh to your home folder and ./xpra-launch.sh or useone of the lines below.

          +Copy `xpra-launch.sh` to your home folder and `./xpra-launch.sh`, or use one of the commands below.

           #### Full desktop

          @@ -54,9 +48,10 @@ Launch the XPRA gui. Select mode ssh - enter username, host and password info. I

           To end the session on the remote system either tmux a and Ctrl-c or 'xpra stop'

           ### xpra cli - keep it simple (for more experienced XPRA users)

          +This subsection includes support staff notes is not needed for basic remote work with GUI applications. You need to modify these commands according to your circumstances, *should* you decide to use these commands.

          -On your local Mac OSX system open a terminal window and run

          -`xpra start ssh/oconnor@sch-boltzmann/42 --start-child=xterm`

          +On the local Mac OSX system one can open a terminal window and run something like

          +`xpra start ssh/<username>@<remotehost>/42 --start-child=xterm`

           With this one command you should have a remote xterm window come up. From there you can launch whatever application you need to run on the other system, including applications that need GLX extensions such as coot.

...	...	@@ -1,21 +1,15 @@
1	1	# Persistent Remote X11 connections
2	2
3	3	[X2GO](x2go.org) and [XPRA](xpra.org) can be used to run (and interact with) GUI applications on remote hosts.
	4	+For all systems off of the sbgrid network it will be easiest if you use the [cmcd-vpn](faq-connecting-to-cmcd-vpn).
4	5	Please [contact us](mailto:help@sbgrid.org) if your SBGrid-supported remote host lacks pre-requisite server-side software, such as the `xpra` program.
5	6
6	7	## x2go
7	8
8		-### download
9		-
10		-x2go can be downloaded from this page.
11		-
12		-* <https://wiki.x2go.org/doku.php/download:start>
13		-
14		-#### Additional Steps
	9	+[Download](https://wiki.x2go.org/doku.php/download:start) and install the X2GO client.
15	10
16	11	You will need to open System Preferences - Security - General - Temporarily 'Allow from anywhere' open the application, make sure you can reopen it. Then change your security setting back to 'App Store and Identified Developers'
17	12
18		-For all systems off of the sbgrid network it will be easiest if you use the [cmcd-vpn](faq-connecting-to-cmcd-vpn).
19	13
20	14	x2go requires XQuartz - see [faq-using-sbgrid-programs](faq-using-sbgrid-programs) if you do not already have it installed.
21	15
...	...	@@ -28,7 +22,7 @@ Make sure you fill out the following -
28	22	3. port - 22
29	23	4. Session type - Mate
30	24
31		-You can adjust the resolution after the session has started.
	25	+You can adjust the desktop size after the session has started.
32	26
33	27	## Xpra
34	28
...	...	@@ -37,7 +31,7 @@ You can adjust the resolution after the session has started.
37	31
38	32	### On remote workstation
39	33
40		-On remote system - copy xpra-launch.sh to your home folder and ./xpra-launch.sh or useone of the lines below.
	34	+Copy `xpra-launch.sh` to your home folder and `./xpra-launch.sh`, or use one of the commands below.
41	35
42	36	#### Full desktop
43	37
...	...	@@ -54,9 +48,10 @@ Launch the XPRA gui. Select mode ssh - enter username, host and password info. I
54	48	To end the session on the remote system either tmux a and Ctrl-c or 'xpra stop'
55	49
56	50	### xpra cli - keep it simple (for more experienced XPRA users)
	51	+This subsection includes support staff notes is not needed for basic remote work with GUI applications. You need to modify these commands according to your circumstances, should you decide to use these commands.
57	52
58		-On your local Mac OSX system open a terminal window and run
59		-`xpra start ssh/oconnor@sch-boltzmann/42 --start-child=xterm`
	53	+On the local Mac OSX system one can open a terminal window and run something like
	54	+`xpra start ssh/<username>@<remotehost>/42 --start-child=xterm`
60	55
61	56	With this one command you should have a remote xterm window come up. From there you can launch whatever application you need to run on the other system, including applications that need GLX extensions such as coot.
62	57