summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/ts/en_US.ts2
-rw-r--r--docker/README.rst6
-rw-r--r--docs/dev/environment.rst4
-rw-r--r--docs/dev/tests.rst2
-rw-r--r--docs/pkg/debian.rst2
-rw-r--r--src/leap/bitmask/platform_init/initializers.py2
6 files changed, 9 insertions, 9 deletions
diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts
index b6fcc5da..b7cd6d26 100644
--- a/data/ts/en_US.ts
+++ b/data/ts/en_US.ts
@@ -1622,7 +1622,7 @@ Export canceled.</source>
</message>
<message>
<location filename="../src/leap/bitmask/platform_init/initializers.py" line="440"/>
- <source>Reinstall your debian packages, or make sure you place them by hand.</source>
+ <source>Reinstall your Debian packages, or make sure you place them by hand.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/docker/README.rst b/docker/README.rst
index dcad0ac6..70d44809 100644
--- a/docker/README.rst
+++ b/docker/README.rst
@@ -21,10 +21,10 @@ will be used to run bitmask.
python dependencies, running bitmask, etc.
-debian/
+Debian/
-------
-``apt-bitmask.sh`` script that installs bitmask from the debian packages.
+``apt-bitmask.sh`` script that installs bitmask from the Debian packages.
``bitmask-on-docker.sh`` installs bitmask and runs it in a dummy X server,
waits a little and takes a screenshot.
@@ -32,7 +32,7 @@ waits a little and takes a screenshot.
``leap-experimental.key`` is needed by ``apt-bitmask.sh`` to ``apt-key add``
and verify apt sources.
-``run-docker-for-bitmask.sh`` is a helper script that runs an ubuntu/debian
+``run-docker-for-bitmask.sh`` is a helper script that runs an Ubuntu/Debian
container ready to run the ``apt-bitmask.sh`` command, it does (among other
stuff) X11 forwarding to display Bitmask UI on the host linux.
diff --git a/docs/dev/environment.rst b/docs/dev/environment.rst
index a3184b01..99600ec8 100644
--- a/docs/dev/environment.rst
+++ b/docs/dev/environment.rst
@@ -34,7 +34,7 @@ Bitmask depends on these base libraries:
Debian
^^^^^^
-In debian-based systems, you can get everything you need:
+In Debian-based systems, you can get everything you need:
.. include:: quickstart.rst
:start-after: begin-debian-deps
@@ -82,7 +82,7 @@ Avoid compiling PySide inside a virtualenv
If you attempt to install PySide inside a virtualenv as part of the rest of the dependencies using pip, basically it will take ages to compile.
-As a workaround, you can run the following script after creating your virtualenv. It will symlink to your global PySide installation (*this is the recommended way if you are running a debian-based system*)::
+As a workaround, you can run the following script after creating your virtualenv. It will symlink to your global PySide installation (*this is the recommended way if you are running a Debian-based system*)::
(bitmask)$ pkg/postmkvenv.sh
diff --git a/docs/dev/tests.rst b/docs/dev/tests.rst
index d55c206a..bdefcfdc 100644
--- a/docs/dev/tests.rst
+++ b/docs/dev/tests.rst
@@ -16,7 +16,7 @@ Testing dependencies
have a look at ``pkg/test-requirements.pip``
The ``./run_tests.sh`` command should install all of them in your virtualenv for you.
-If you prefer to install them system wide, this should do in a debian system::
+If you prefer to install them system wide, this should do in a Debian system::
$ apt-get install python-nose python-mock python-coverage
diff --git a/docs/pkg/debian.rst b/docs/pkg/debian.rst
index 204d4073..13976e2b 100644
--- a/docs/pkg/debian.rst
+++ b/docs/pkg/debian.rst
@@ -3,7 +3,7 @@
Debian
======
-This section documents all related to the debian package.
+This section documents all related to the Debian package.
Dependencies
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index eb892cce..82a229ae 100644
--- a/src/leap/bitmask/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
@@ -126,7 +126,7 @@ def check_missing():
if alert_missing and not flags.STANDALONE:
# We refuse to install missing stuff if not running with standalone
# flag. Right now we rely on the flag alone, but we can disable this
- # by overwriting some constant from within the debian package.
+ # by overwriting some constant from within the Debian package.
alert_missing = False
complain_missing = True