diff --git a/computer.md b/computer.md index a477914..739dba6 100644 --- a/computer.md +++ b/computer.md @@ -57,6 +57,7 @@ Here is a list of notable computers. | [Commodore 64](c64.md) | 1982 | 64K RAM, 20K ROM, CPU 1MHz 8bit | very popular TV-connected home computer | | [ZX Spectrum](zx_spectrum.md) | 1982 | 128K RAM, CPU 3.5MHz 8bit | successful UK TV-connected home comp. by Sinclair | | [NES](nes.md)/Famicom | 1983 | 2K RAM, 2K VRAM, CPU 1.7MHz 8bit, PPU | TV-connected Nintendo game console | +| [Macintosh](macintosh.md) | 1984 | 128K RAM, CPU 7MHz 32bit, floppy, 512x342 | very popular personal computer by Apple | | [Amiga](amiga.md) | 1985 | 256K RAM, 256K ROM, CPU 7MHz 16bit, AmigaOS | personal compuer by Commodore, ahead of its time | | [SNES](snes.md) | 1990 | 128K RAM, 64K VRAM, CPU 21MHz 16bit | game console, NES successor | | [PlayStation](playstation.md) | 1994 | 2M RAM, 1M VRAM, CPU 33MHz 32bit, CD-ROM | popular TV-connected game console by Sony | @@ -67,7 +68,7 @@ Here is a list of notable computers. | [GameBoy Advance](gba.md) | 2001 | ~256K RAM, 96K VRAM, CPU 16MHz 32bit ARM, 240x160 | successor to GBC | | [Xbox](xbox.md) | 2001 | 64M RAM, CPU 733MHz Pentium III | TV-connected game console by Micro$oft | | [Nintendo DS](nds.md) | 2004 | 4M RAM, 256K ROM, CPU ARM 67MHz, touchscreen | famous handheld game console by Nintendo | -| [iPhone](iphone.md) (aka spyphone) | 2007 | 128M RAM, CPU ARM 620MHz, GPU, cam., Wifi, 480x320| first of the harmful Apple "smartphones" | +| [iPhone](iphone.md) (aka spyphone) | 2007 | 128M RAM, CPU ARM 620MHz, GPU, cam., Wifi, 480x320| 1st of the harmful Apple "smartphones" | | [ThinkPad](thinkpad.md) X200 | 2008 | 8G RAM, CPU 2.6GHz, Wifi | legendary laptop, great constr., freedom friendly | | [ThinkPad](thinkpad.md) T400 | 2008 | 8G RAM, CPU 2.8GHz, Wifi | legendary laptop, great constr., freedom friendly | | [Raspberry Pi 3](rpi.md) | 2016 | 1G RAM, CPU 1.4GHz ARM, Wifi | very popular tiny inexpensive SBC | @@ -79,4 +80,4 @@ Here is a list of notable computers. |[PD computer](public_domain_computer.md) | | | planned LRS computer | |[Turing machine](turing_machine.md) | | | important theoretical computer by Alan Turing | -TODO: mnt reform 2, ti-89, quantum?, wii? +TODO: mnt reform 2, pinephone, NeXT, ti-89, quantum?, wii? diff --git a/free_universe.md b/free_universe.md index b70971f..8fd13e1 100644 --- a/free_universe.md +++ b/free_universe.md @@ -4,7 +4,7 @@ Free universe (also "open" universe) is a [free culture ](free_culture.md) ("fre But if anyone is allowed to do anything with the universe and so possibly incompatible works may be created, then **what is canon?!** Well, anything you want -- it's the same as with proprietary universes, regardless of official canon there may be different groups of fans that disagree about what is canon and there may be works that contradict someone's canon, there is no issue here. -**Existing free universes**: existence of a serious project aiming purely for the creation of a free universe is unknown to us, however free universes may be spawned as a byproduct of other free works -- for example old public domain [books](book.md) of fiction, such as [Flatland](flatland.md), or [libre games](libre_game.md) such as [FLARE](flare.md), [Anarch](anarch.md) or [FreeDink](freedink.md) create a free universe. If you want to start a free universe project, go for it, it would be highly valued! +**Existing free universes**: existence of a serious project aiming for the creation of a free universe as its main goal is unknown to us, however free universes may be spawned as a byproduct of other free works -- for example old public domain [books](book.md) of fiction, such as [Flatland](flatland.md), or [libre games](libre_game.md) such as [FLARE](flare.md), [Anarch](anarch.md) or [FreeDink](freedink.md) create a free universe. The [MMORPG](mmorpg.md) game [Ryzom](ryzom.md) releases its lore and content under a free license, spawning a huge, rich and high quality fantasy universe (though the game's server isn't libre and hence the game as such isn't altogether free). Libre comics such as Pepper and Carrot (https://www.peppercarrot.com/en/wiki), Wuffle Comics (https://web.archive.org/web/20200117033753/http://www.wufflecomics.com/) and Phil from GCHQ (https://phillfromgchq.co.uk/) also give life to their own free universes. If you want to start a free universe project, go for it, it would be highly valued! ## See Also diff --git a/jokes.md b/jokes.md index 962bbfe..d0c286e 100644 --- a/jokes.md +++ b/jokes.md @@ -26,6 +26,7 @@ Please do NOT post lame "big-bang-theory"/[9gag](9gag.md) jokes like *sudo make - Difference between a beginner and pro programmer? Pro programmer fails in a much more sophisticated manner. - What's a [computer](computer.md)? A device that can make a hundred million mistakes per second. - Cool statistics: 9 out of 10 people enjoy a gang [rape](rape.md). +- `int randomInt(void) { int x; return x; }` - Boss: "We're going to need to store additional information about gender of all 1600 people in our database." Me: "OK that's only 200 extra bytes.". Diversity department: "You're fired." - the [downto](downto.md) operator