Browse Source

Merge pull request #232 from infosiftr/ubuntu

Add a better long description for Ubuntu
yosifkit 10 years ago
parent
commit
3f3ed94a73
1 changed files with 15 additions and 3 deletions
  1. 15 3
      ubuntu/content.md

+ 15 - 3
ubuntu/content.md

@@ -1,6 +1,18 @@
-# Ubuntu
+# What is Ubuntu?
 
-## sources.list
+Ubuntu is a Debian-based Linux operating system, with Unity as its default desktop environment. It is based on free software and named after the Southern African philosophy of ubuntu (literally, "human-ness"), which often is translated as "humanity towards others" or "the belief in a universal bond of sharing that connects all humanity".
+
+Development of Ubuntu is led by UK-based Canonical Ltd., a company owned by South African entrepreneur Mark Shuttleworth. Canonical generates revenue through the sale of technical support and other services related to Ubuntu. The Ubuntu project is publicly committed to the principles of open-source software development; people are encouraged to use free software, study how it works, improve upon it, and distribute it.
+
+> [wikipedia.org/wiki/Ubuntu_(operating_system)](https://en.wikipedia.org/wiki/Ubuntu_%28operating_system%29)
+
+%%LOGO%%
+
+# What's in this image?
+
+## `/etc/apt/sources.list`
+
+### `ubuntu:14.04`
 
 	$ docker run ubuntu:14.04 grep -v '^#' /etc/apt/sources.list
 	
@@ -21,7 +33,7 @@
 	deb http://archive.ubuntu.com/ubuntu/ trusty-security universe
 	deb-src http://archive.ubuntu.com/ubuntu/ trusty-security universe
 
-\-
+### `ubuntu:12.04`
 
 	$ docker run ubuntu:12.04 cat /etc/apt/sources.list