Update some links & formatting
This commit is contained in:
		
							parent
							
								
									04140376fa
								
							
						
					
					
						commit
						63f8cfb22a
					
				
					 3 changed files with 15 additions and 1 deletions
				
			
		|  | @ -7,6 +7,12 @@ It consists of docs for [Developers](/development/index.md), as well as [end-use | |||
| 
 | ||||
| If you would like to use the operating system, or help with development, this is where to get your information! | ||||
| 
 | ||||
| ## What is Mercury? | ||||
| **Mercury**, or the **Mercury Project**, refers to the collection of `libraries`, `crates`, and other code under this organization. | ||||
| "Organization" is a loose term, and really it's anyone who contributes and follows the [Code of Conduct](code-of-conduct.md). | ||||
| 
 | ||||
| **Mercury OS** refers specifically to the full Operating System built off of the `ferrite` [kernel](/development/design/kernel.md) and all the other binaries. | ||||
| 
 | ||||
| ## Status | ||||
| Right now, **Mercury** is mainly in the planning stage. | ||||
| We're still setting things up, learning, and planning out how we're going to do this. | ||||
|  |  | |||
|  | @ -2,15 +2,18 @@ | |||
| 
 | ||||
| [Introduction](README.md) | ||||
| 
 | ||||
| # Developer Guide | ||||
| - [Development](development/README.md) | ||||
|     - [Understanding the Design Goals](development/design/README.md) | ||||
|         - [Actor System]() | ||||
|         - [Security Features]() | ||||
|         - [Microkernel]() | ||||
|         - [Microkernel](development/design/kernel.md) | ||||
|         - [GUI]() | ||||
|         - [Filesystem](development/design/filesystem.md) | ||||
|     - [Configuring a Build Environment](development/environment.md) | ||||
|     - [Development Workflow](development/workflow.md) | ||||
| 
 | ||||
| # User Guide | ||||
| - [Using the OS](user/README.md) | ||||
|     - [Running in a Virtual Machine]() | ||||
|     - [Running on Baremetal]() | ||||
|  | @ -19,3 +22,7 @@ | |||
|         - [Navigating the GUI]() | ||||
|         - [Configuring the System]() | ||||
|         - [Working with Actors]() | ||||
| 
 | ||||
| ----------- | ||||
| 
 | ||||
| [Code of Conduct]() | ||||
|  |  | |||
							
								
								
									
										1
									
								
								src/code-of-conduct.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								src/code-of-conduct.md
									
									
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1 @@ | |||
| # Code of Conduct | ||||
		Loading…
	
		Reference in a new issue