merged AutomatedTests.md

basics/intro.md

@@ -56,7 +56,7 @@ Using a separate physical computer for sensitive activities can certainly be mor
 Pros:
 
 -   Physical separation doesn't rely on a hypervisor. (It's very unlikely that an attacker will break out of Qubes' hypervisor, but if she were to manage to do so, she could potentially gain control over the entire system.)
--   Physical seaparation can be a natural complement to physical security. (For example, you might find it natural to lock your secure laptop in a safe when you take your unsecure laptop out with you.)
+-   Physical separation can be a natural complement to physical security. (For example, you might find it natural to lock your secure laptop in a safe when you take your unsecure laptop out with you.)
 
 Cons:
 

developers/VersionScheme.md

@@ -64,7 +64,7 @@ The next RC is released five weeks after the former. All packets are published
 in `current` repository and the cycle starts over. There should be no less than
 1 and no more than 3 release candidates before final release.
 
-<table>
+<table border>
     <thead>
         <tr><th>stage</th><th>time</th></tr>
     </thead>
@@ -81,6 +81,8 @@ should be another RC. If, based on remaining issues, the Committee decides to
 release final, then the Committee agrees upon the release date, which should be
 no later than a week after.
 
+!["Release cycle"](/attachment/wiki/VersionScheme/release-cycle.svg)
+
 Bug priorities
 --------------
 

developers/debugging/AutomatedTests.md

@@ -7,7 +7,7 @@ permalink: /doc/AutomatedTests/
 Automatic tests
 ===============
 
-Starting with Qubes R3 we use [python unittest](TODO) to perform automatic
+Starting with Qubes R3 we use [python unittest][unittest] to perform automatic
 tests of Qubes OS. Regardless of the name, we use it for both [unit
 tests](https://en.wikipedia.org/wiki/Unit_tests) and [integration
 tests](https://en.wikipedia.org/wiki/Integration_tests). The main purpose is of
@@ -95,6 +95,9 @@ For example to run only tests for fedora-21 template, you can use `-l` option, t
     vm_qrexec_gui/TC_20_DispVM_fedora-21/test_030_edit_file
     [user@dom0 ~]$ python -m qubes.tests.run -v `python -m qubes.tests.run -l | grep fedora-21`
 
+Example test run:
+
+![snapshot-tests2.png](/attachment/wiki/developers/snapshot-tests2.png)
 
 ## Adding a new test to core-admin
 After you added a new unit test to [core-admin/tests](https://github.com/QubesOS/qubes-core-admin/tree/master/tests) 
@@ -126,4 +129,10 @@ Add at the bottom of the file in the method `def load_tests` to the variable
             'qubes.tests.regressions',
             'qubes.tests.example', # This is our newly added test
             ):
+<<<<<<< HEAD
 ~~~
+=======
+```
+
+[unittest]: https://docs.python.org/2/library/unittest.html
+>>>>>>> upstream/master

releases/3.0/release-notes.md

@@ -7,16 +7,23 @@ permalink: /doc/releases/3.0/release-notes/
 Qubes R3.0 release notes
 ========================
 
-*this page is a draft for yet unreleased version*
+This Qubes OS release is dedicated to the memory of Caspar Bowden.
 
 New features since 2.0
 ----------------------
 
-* Xen 4.4
+* HAL (Hypervisor Abstraction Layer) - based on libvirt, opens a whole new
-* Qrexec 3
+  possibilities of using different hypervisors. Currently Qubes OS uses Xen.
-* Debian templates
+* Xen 4.4 - many new features, but for us the most important is much more
+  mature libxl toolstack.
+* Qrexec 3 - greatly improved performance by using direct VM-VM connections and
+  bigger buffers.
+* Debian templates gets official support.
 * Whonix templates
-* Build system improvements
+* Build system improvements - especially support for distribution-specific
+  plugins (makes supporting multiple distributions much easier) and building
+  templates using DispVM.
+* Automated tests - makes much easier to find bugs, before its even shipped to users
 
 Known issues
 ------------
@@ -29,7 +36,7 @@ Known issues
 
 * If your GPU is not correctly supported by the Dom0 kernel (e.g. the 3D desktop effects do not run smoothly) then you might experience "heaviness" with Windows 7-based AppVMs. In that case, please solve the problem with your GPU support in Dom0 in the first place (by using a different kernel), or install Qubes OS on a different system.
 
-* For other known issues take a look at [our tickets](https://github.com/QubesOS/qubes-issues/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Release+3%22+label%3Abug)
+* For other known issues take a look at [our tickets](https://github.com/QubesOS/qubes-issues/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Release+3.0%22+label%3Abug)
 
 It is advised to install updates just after system installation to apply bug fixes for (some of) the above problems.
 
@@ -46,9 +53,9 @@ See [Installation Guide](/doc/InstallationGuide/).
 Upgrading
 ---------
 
-### From from R3.0rc1
+### From R3.0 release candidate
 
-If you are using Qubes R3.0rc1, just install system updates, there is no special steps required.
+If you are using Qubes R3.0rc1, R3.0rc2 or R3.0rc3, just install system updates, there is no special steps required.
 
 ### From R2.0 or earlier
 

releases/todo.md

@@ -30,6 +30,7 @@ On final release
 ----------------
 * push packages to `current`
 * finish release notes
+* update InstallationInstructions
 * build ISO and push to mirrors
 * write blog post
 * announce on Twitter