Skip to content

Commit

Permalink
Merge pull request #357 from binary-sequence-forks/fix-doc-errors
Browse files Browse the repository at this point in the history
Fix doc errors
  • Loading branch information
hennevogel authored Jul 4, 2024
2 parents aafb284 + 17fe30a commit 371508a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion xml/obs_best_practice_kiwi_editor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
<note>
<para>
The package groups shown in the editor are only those with type <emphasis>image</emphasis> and the packages will be added in this kind of package group.
If it did exist previously the &kiwi; Editor creates a package group with type <emphasis>image</emphasis> for you.
If it didn't exist previously, the &kiwi; Editor creates a package group with type <emphasis>image</emphasis> for you.
</para>
</note>
</sect2>
Expand Down
10 changes: 5 additions & 5 deletions xml/obs_best_practice_upstream.xml
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,12 @@
to include download code:
</para>
<screen>&lt;object type="text/html"
data="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;amp;package=osc&amp;amp;bcolor=004&amp;amp;acolor=ff0&amp;amp;fcolor=fff&amp;amp;hcolor=0ff"
data="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;package=osc&amp;bcolor=004&amp;acolor=ff0&amp;fcolor=fff&amp;hcolor=0ff"
width="100%" height="100%"&gt;
&lt;param name="src"
value="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;amp;package=osc&amp;amp;bcolor=004&amp;amp;acolor=ff0&amp;amp;fcolor=fff&amp;amp;hcolor=0ff" /&gt;
value="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;package=osc&amp;bcolor=004&amp;acolor=ff0&amp;fcolor=fff&amp;hcolor=0ff" /&gt;
Your browser doesn't support objects, please continue to the
&lt;a href="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;amp;package=osc&amp;amp;bcolor=004&amp;amp;acolor=ff0&amp;amp;fcolor=fff&amp;amp;hcolor=0ff"&gt;
&lt;a href="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;package=osc&amp;bcolor=004&amp;acolor=ff0&amp;fcolor=fff&amp;hcolor=0ff"&gt;
download page&lt;/a&gt;
&lt;/object&gt;</screen>
<para>
Expand All @@ -261,7 +261,7 @@
</para>
<screen>
&lt;?php
$url = "http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;amp;package=osc&amp;amp;bcolor=004&amp;amp;acolor=ff0&amp;amp;fcolor=fff&amp;amp;hcolor=0ff";
$url = "http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;package=osc&amp;bcolor=004&amp;acolor=ff0&amp;fcolor=fff&amp;hcolor=0ff";
echo '
&lt;object type="text/html"
data="' . $url . '"
Expand All @@ -280,7 +280,7 @@
:
</para>
<screen>
&lt;iframe src="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;amp;package=osc&amp;amp;bcolor=004&amp;amp;acolor=ff0&amp;amp;fcolor=fff&amp;amp;hcolor=0ff"/&gt;
&lt;iframe src="http://software.opensuse.org/download.html?project=openSUSE:Tools&amp;package=osc&amp;bcolor=004&amp;acolor=ff0&amp;fcolor=fff&amp;hcolor=0ff"/&gt;
</screen>
</sect2>
</sect1>
Expand Down
2 changes: 1 addition & 1 deletion xml/obs_concepts_dod.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
susetags, rpmmd and deb), we recommend that you use a mirror server URL in
&lt;download&gt; in order to reduce traffic on the master server and
configure a &lt;master&gt; with an <command>https</command> url and a
<command>sslfinger</command> in order to avoid man in the middle attacks by
<command>sslfingerprint</command> in order to avoid man in the middle attacks by
peer verification. </para>
</sect2>
<sect2>
Expand Down
5 changes: 1 addition & 4 deletions xml/obs_notifications.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,7 @@

In case you exceed 300 notifications you have the possibility to use the
button "Mark all as 'Read" that will appear on the right side to mark all
notifications of the chosen filter as read. In case you exceed 300
notifications you have the possibility to use the button "Mark all as
'Read" that will appear on the right side to mark all notifications of the
chosen filter as read.
notifications of the chosen filter as read.
<figure>
<title>Mark all as read.</title>
<mediaobject>
Expand Down
2 changes: 1 addition & 1 deletion xml/obs_source_service.xml
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
</para>
<screen>https://<replaceable>YOUR_INSTANCE</replaceable>/trigger/webhook?id=$TOKEN_ID</screen>
<para>
and fill the secret box with your token string. Please not that github requires that you
and fill the secret box with your token string. Please note that github requires that you
must also define the token id as part of the webhook string. All other settings can stay
untouched and just hit the <guimenu>Add webhook</guimenu> button.
</para>
Expand Down
2 changes: 1 addition & 1 deletion xml/osc_building.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ The buildroot was: /var/tmp/build-root/openSUSE_Tumbleweed-x86_64</screen>
The default build environment for local builds is usually chroot. While this is simplest environment
and is therefore easy and fast to handle, it has also a number of shortcomings. For one it is
not safe against attacks, so you must not build sources or using build dependencies from a resource
which you do not trust. Furthermore the environment is not fully isolated and runs not the kernel the
which you do not trust. Furthermore the environment is not fully isolated and runs on the kernel the
target distribution runs. This means esp image builds and kernel/hardware specific builds may fail or
won't produce the same result. The server side is usually set to inside of KVM therefore to avoid this.
</para>
Expand Down

0 comments on commit 371508a

Please sign in to comment.