From bb5fb465271f5058c7d9f1b3e995525e71e226f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Thu, 8 Oct 2015 02:43:20 +0200
Subject: [PATCH] Some more code blocks fixes
---
customization/XFCE.md | 2 +-
.../building/InstallationIsoBuilding.md | 24 +++++++++----------
developers/debugging/AutomatedTests.md | 5 +---
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/customization/XFCE.md b/customization/XFCE.md
index 6668025c..540314f9 100644
--- a/customization/XFCE.md
+++ b/customization/XFCE.md
@@ -33,7 +33,7 @@ Things needs/recommended to be done:
- remove some useless entries from menu and panel, especially file manager, web browser
- create own favorites menu (currently standard XFCE menu isn't modified to use per-VM subsections, which makes it very inconvenient):
- 1. create \~/.config/menus/favorites.menu, example content:
+ 1. create `~/.config/menus/favorites.menu`, example content:
~~~
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
diff --git a/developers/building/InstallationIsoBuilding.md b/developers/building/InstallationIsoBuilding.md
index 7a6a62a8..766e73a7 100644
--- a/developers/building/InstallationIsoBuilding.md
+++ b/developers/building/InstallationIsoBuilding.md
@@ -39,32 +39,32 @@ Review configuration files
All configuration files for Qubes Revisor are kept in the ~~~conf/~~~ directory:
-- ~~~conf/qubes-install.conf~~~ - Main Revisor configuration file. This configures Revisor to build Qubes Installation image based on Fedora 13. All other configuration files and working directories are pointed here.
+- `conf/qubes-install.conf` - Main Revisor configuration file. This configures Revisor to build Qubes Installation image based on Fedora 13. All other configuration files and working directories are pointed here.
-- ~~~conf/qubes-x86_64.conf~~~ - This file describes all repositories needed to build Qubes for x86\_64 architecture.
+- `conf/qubes-x86_64.conf` - This file describes all repositories needed to build Qubes for x86\_64 architecture.
-- ~~~conf/qubes-kickstart.cfg~~~ - Fedora Kickstart formatted file describing which packages should land in the ISO `/Packages` repository. This describes basically what will be available for installation. The packages list built using this file will be further filtered by the comps file.
+- `conf/qubes-kickstart.cfg` - Fedora Kickstart formatted file describing which packages should land in the ISO `/Packages` repository. This describes basically what will be available for installation. The packages list built using this file will be further filtered by the comps file.
-- ~~~conf/comps-qubes.xml~~~ - Repository Comps file for ISO `/Packages` repository, describing packages and package groups of the installer repository. Package groups are used to select which of the packages are mandatory to install, which are optional and which are to be just available on the ISO but not installed by default (not used on Qubes).
+- `conf/comps-qubes.xml` - Repository Comps file for ISO `/Packages` repository, describing packages and package groups of the installer repository. Package groups are used to select which of the packages are mandatory to install, which are optional and which are to be just available on the ISO but not installed by default (not used on Qubes).
Create/Update local repository
------------------------------
Revisor fetches all RPM packages from YUM repositories. We currently use 5 repositories:
-- ~~~yum/installer~~~ (installer-related rpms)
-- ~~~yum/qubes-dom0~~~ (all the Qubes stuff)
-- ~~~yum/dom0-updates~~~ (for select 3rd party packages, e.g. Xorg)
-- ~~~yum/fedora13-repo~~~ (local fedora 13 repo, copy from DVD)
+- `yum/installer` (installer-related rpms)
+- `yum/qubes-dom0` (all the Qubes stuff)
+- `yum/dom0-updates` (for select 3rd party packages, e.g. Xorg)
+- `yum/fedora13-repo` (local fedora 13 repo, copy from DVD)
- remote fedora repo for extra packages (usually deps for qubes-dom0)
-You need to manually copy the Fedora 13 installation DVD contents (~~~Packages/~~~ and ~~~repodata/~~~ directories) into ~~~build/fedora13-repo~~~.
+You need to manually copy the Fedora 13 installation DVD contents (`Packages/` and `repodata/` directories) into `build/fedora13-repo`.
-Also, you need to copy all the qubes dom0 rpms into ~~~build/yum/qubes-dom0/rpm~~~ and run the ~~~yum/update_repo.sh~~~ script afterwards.
+Also, you need to copy all the qubes dom0 rpms into `build/yum/qubes-dom0/rpm` and run the `yum/update_repo.sh` script afterwards.
-In order to fill the ~~~build/yum/installer~~~ repo one can just use ~~~make update-repo~~~.
+In order to fill the `build/yum/installer` repo one can just use `make update-repo`.
-The ~~~build/yum/dom0-updates~~~ is to be used for select rpms that should also be used instead of those from the fedora (loacal and remote) repos.
+The `build/yum/dom0-updates` is to be used for select rpms that should also be used instead of those from the fedora (loacal and remote) repos.
Update your local repos:
diff --git a/developers/debugging/AutomatedTests.md b/developers/debugging/AutomatedTests.md
index 60177281..6897c214 100644
--- a/developers/debugging/AutomatedTests.md
+++ b/developers/debugging/AutomatedTests.md
@@ -118,6 +118,7 @@ compiled version to the right directory in the RPM file. I.e. adding `example.py
### Editing \_\_init\_\_.py
Add at the bottom of the file in the method `def load_tests` to the variable
`modname` your test. I.e adding `example.py`.
+
~~~python
for modname in (
'qubes.tests.basic',
@@ -129,10 +130,6 @@ 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