|
Size: 1285
Comment:
|
Size: 1273
Comment: converted to 1.6 markup
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 13: | Line 13: |
| '''[wiki:ResearchProjects Research Projects]''' These are the active projects we are working on. | '''[[ResearchProjects|Research Projects]]''' These are the active projects we are working on. |
| Line 16: | Line 16: |
| '''[wiki:Labguide Laboratory Guidelines]''' Some general information for working in the lab. '''[wiki:OptoMechanics Optical and Mechanical Instruments]''' |
'''[[Labguide|Laboratory Guidelines]]''' Some general information for working in the lab. |
| Line 21: | Line 19: |
| '''[wiki:Electronics Electronics]''' | '''[[ResearchTools|Research Tools and Documentation]]''' Information and reference data for electronic, optical, mechanical, and vacuum equipment and procedures we have developed and use. |
| Line 24: | Line 22: |
| '''[wiki:vacuum Vacuum Preparation]''' | '''[[Equipment_inventory|Research Equipment]]''' Inventory of commercial research equipment and manuals. |
| Line 26: | Line 24: |
| '''[wiki:EDB Computing Information]''' Detailed information about lab computers and software. '''[wiki:Equipment_inventory Research Equipment]''' Inventory of commercial research equipment and manuals. |
'''[[EDB|Computing Information]]''' Lab computers and software. |
| Line 31: | Line 27: |
'''[wiki:Purchasing Purchasing]''' Information about purchasing procedures and lists of vendors. |
'''[[Purchasing|Purchasing]]''' Purchasing procedures and lists of vendors. |
| Line 39: | Line 34: |
| In order to gain access to the contents of this wiki you will need an [wiki:UserPreferences account]. It is recommended to use your Madison netID as your user name when registering. | In order to gain access to the contents of this wiki you will need an [[UserPreferences|account]]. It is recommended to use your Madison netID as your user name when registering. |
| Line 41: | Line 36: |
| Then email Mark at msaffman@wisc.edu to have him enable your access. | Then email [[mailto:msaffman@wisc.edu|Mark]] to have him enable your access. |
Welcome to the Saffman research group Wiki
Research Projects These are the active projects we are working on.
Laboratory Guidelines Some general information for working in the lab.
Research Tools and Documentation Information and reference data for electronic, optical, mechanical, and vacuum equipment and procedures we have developed and use.
Research Equipment Inventory of commercial research equipment and manuals.
Computing Information Lab computers and software.
Purchasing Purchasing procedures and lists of vendors.
In order to gain access to the contents of this wiki you will need an account. It is recommended to use your Madison netID as your user name when registering.
Then email Mark to have him enable your access.