Changes in 84c3ab4: Misc edits and clean-up.

				SBGrid-Wiki.md
			
          @@ -1 +1,4 @@

          -This is a starting page. 

          \ No newline at end of file

          +# Welcome to the SBGrid Consortium Wiki

          +

          +This site provides information on how to install, use, and get help with your SBGrid software collection.

          +We also include some information about SBGrid services. Please let us know if you have questions.

				mirrors.md
			
          @@ -1,6 +1,3 @@

           # SBGrid Mirrors

           For the benefit of the local SBGrid community, we recommend the following to access frequently-used open source software. If you would like for us to add a mirror, please  [contact us](help@sbgrid.org).

          -

          -\\

          -

				operatingsystems.md
			
          @@ -8,29 +8,25 @@ We build and test software under 64-bit Red Hat 6.  The majority of our Linux us

           We officially support the two most recent releases of Red Hat/CentOS/Scientific Linux (currently 6 and 7) and the two most recent releases of Fedora Linux. At this time, only 64-bit versions of linux are fully supported. As of January 2015, we are no longer updating the 32-bit software branch, though we will work to resolve reported problems.

           Currently Supported:

          -

               * Red Hat Enterprise Linux 6.x and 7.x and the community supported versions: CentOS and Scientific Linux.

               * Fedora releases actively supported by the Fedora community. Check https://fedoraproject.org/wiki/Releases for the current list.

               * We are no longer building software for RHEL 5.x, but compatible applications will remain in the software tree. We will respond to support requests for these and we will resolve problems where possible. RHEL5 users may not receive the latest versions of software, but RHEL5 systems will continue to be functional and supported.

           ## OS X Intel

           We build and test the programs under the most four most recent OS X releases.

          -Currently Supported:

          -

          -    * OS X Intel 10.7 - 10.10

          +Currently Supported:

          +    * OS X Intel 10.9 - 10.11

          +    * As above with earlier versions of linux, there are many software applications that are fully functional on earlier versions of MacOSX in the SBGrid tree. We work to maintain an environment compatible with these OS versions, though they may not receive the latest applications available.

           ## OS X PowerPC

           The OS X PowerPC branch is currently frozen.  The applications are stable and work well on our PowerPC hardware, but they are not being updated.

           Currently Supported:

          -

               * OS X PowerPC 10.4 - 10.5

          -

           ## IRIX

           The IRIX programs branch is currently frozen.  The applications are stable and work well on our SGI hardware, but they are not being updated.

           Currently Supported:

          -

                * IRIX 6.5.26 + bugfix releases

				overrides.md
			
          @@ -51,7 +51,7 @@ The override file is named .sbgrid.conf and should be placed in your $HOME direc

           APPLICATION_X is the name of the application followed by an underscore and the shorthand initial for the architecture. The last field on the line is the software version number you want to use. The initials for each software branch are:

            | Software Directory | Shorthand Initial |

          - | ------------------ | ----------------- |

          + | :----------------- | :---------------- |

            | i386-linux         | _L                |

            | x86_64-linux       | _X                |

            | i386-mac           | _M                |

				recommended.md
			
          @@ -1,8 +1,7 @@

           # Recommended Hardware

           ## Linux Workstations

          -SBGrid's preferred hardware vendor is [ThinkMate](http://thinkmate.com) and we have some [recommended configurations](http://www.thinkmate.com/sbgrid) for structural biology computing.

          +SBGrid's preferred hardware vendor is [ThinkMate](http://thinkmate.com) and we have some [recommended configurations](http://www.thinkmate.com/sbgrid) for structural biology computing. Please feel free to contact us at help@sbgrid.org regarding upcoming hardware purchases if you have questions - we'd be happy to advise.

           ## Apple Workstations

          -

           Any Apple machine can be a capable computer for structural biology.  The basic Apple educational discount is available through their online web store, and your institution may have negotiated an even better deal with their Apple representative.  SBGrid has several labs that run exclusively on Macs and OS X.

...	...	@@ -51,7 +51,7 @@ The override file is named .sbgrid.conf and should be placed in your $HOME direc
51	51	APPLICATION_X is the name of the application followed by an underscore and the shorthand initial for the architecture. The last field on the line is the software version number you want to use. The initials for each software branch are:
52	52
53	53	\| Software Directory \| Shorthand Initial \|
54		- \| ------------------ \| ----------------- \|
	54	+ \| :----------------- \| :---------------- \|
55	55	\| i386-linux \| _L \|
56	56	\| x86_64-linux \| _X \|
57	57	\| i386-mac \| _M \|

...	...	@@ -1 +1,4 @@
1		-This is a starting page.
...	...	\ No newline at end of file
	0	+# Welcome to the SBGrid Consortium Wiki
	1	+
	2	+This site provides information on how to install, use, and get help with your SBGrid software collection.
	3	+We also include some information about SBGrid services. Please let us know if you have questions.

...	...	@@ -1,6 +1,3 @@
1	1	# SBGrid Mirrors
2	2
3	3	For the benefit of the local SBGrid community, we recommend the following to access frequently-used open source software. If you would like for us to add a mirror, please [contact us](help@sbgrid.org).
4		-
5		-\\
6		-

...	...	@@ -8,29 +8,25 @@ We build and test software under 64-bit Red Hat 6. The majority of our Linux us
8	8	We officially support the two most recent releases of Red Hat/CentOS/Scientific Linux (currently 6 and 7) and the two most recent releases of Fedora Linux. At this time, only 64-bit versions of linux are fully supported. As of January 2015, we are no longer updating the 32-bit software branch, though we will work to resolve reported problems.
9	9
10	10	Currently Supported:
11		-
12	11	* Red Hat Enterprise Linux 6.x and 7.x and the community supported versions: CentOS and Scientific Linux.
13	12	* Fedora releases actively supported by the Fedora community. Check https://fedoraproject.org/wiki/Releases for the current list.
14	13	* We are no longer building software for RHEL 5.x, but compatible applications will remain in the software tree. We will respond to support requests for these and we will resolve problems where possible. RHEL5 users may not receive the latest versions of software, but RHEL5 systems will continue to be functional and supported.
15	14
16	15	## OS X Intel
17	16	We build and test the programs under the most four most recent OS X releases.
18		-Currently Supported:
19		-
20		- * OS X Intel 10.7 - 10.10
21	17
	18	+Currently Supported:
	19	+ * OS X Intel 10.9 - 10.11
	20	+ * As above with earlier versions of linux, there are many software applications that are fully functional on earlier versions of MacOSX in the SBGrid tree. We work to maintain an environment compatible with these OS versions, though they may not receive the latest applications available.
22	21
23	22	## OS X PowerPC
24	23	The OS X PowerPC branch is currently frozen. The applications are stable and work well on our PowerPC hardware, but they are not being updated.
25	24
26	25	Currently Supported:
27		-
28	26	* OS X PowerPC 10.4 - 10.5
29	27
30		-
31	28	## IRIX
32	29	The IRIX programs branch is currently frozen. The applications are stable and work well on our SGI hardware, but they are not being updated.
33	30
34	31	Currently Supported:
35		-
36	32	* IRIX 6.5.26 + bugfix releases

...	...	@@ -1,8 +1,7 @@
1	1	# Recommended Hardware
2	2
3	3	## Linux Workstations
4		-SBGrid's preferred hardware vendor is [ThinkMate](http://thinkmate.com) and we have some [recommended configurations](http://www.thinkmate.com/sbgrid) for structural biology computing.
	4	+SBGrid's preferred hardware vendor is [ThinkMate](http://thinkmate.com) and we have some [recommended configurations](http://www.thinkmate.com/sbgrid) for structural biology computing. Please feel free to contact us at help@sbgrid.org regarding upcoming hardware purchases if you have questions - we'd be happy to advise.
5	5
6	6	## Apple Workstations
7		-
8	7	Any Apple machine can be a capable computer for structural biology. The basic Apple educational discount is available through their online web store, and your institution may have negotiated an even better deal with their Apple representative. SBGrid has several labs that run exclusively on Macs and OS X.