Merge remote-tracking branch 'upstream/master'

2 files changed, 63 insertions, 47 deletions

diff --git a/english/users/com/brandlive.wml b/english/users/com/brandlive.wml
new file mode 100644
index 00000000000..549de5c7b8d
--- /dev/null
+++ b/english/users/com/brandlive.wml
@@ -0,0 +1,16 @@
+# From:  Biuro <biuro@brandlive.pl>
+# Email: https://lists.debian.org/debian-www/2022/02/msg00011.html
+
+<define-tag pagetitle>BrandLive, Warsaw, Poland</define-tag>
+<define-tag webpage>https://brandlive.pl</define-tag>
+
+#use wml::debian::users
+	
+<p>We are using Debian on five of our servers (64-bit versions), and on two of
+our workstations. Our servers are running applications written in PHP, database
+software (mysql, postgresql), and ftp.
+</p>
+
+<p>
+We chose Debian because it is a stable and simple.
+</p>
diff --git a/english/users/index.wml b/english/users/index.wml
index d36a121aec8..8c39040ebfd 100644
--- a/english/users/index.wml
+++ b/english/users/index.wml
@@ -4,12 +4,12 @@
 # $Id$
 
 <p>
-  Included here are descriptions of some organizations which
-  have deployed Debian, and have chosen to submit a short description
-  of how they use Debian, and why they chose it.  The entries are
-  listed alphabetically.  If you would like to be included in this
-  list, please
-  <a href="#submissions">follow these instructions</a>.
+ Included here are descriptions of some organizations which
+ have deployed Debian, and have chosen to submit a short description
+ of how they use Debian, and why they chose it. The entries are
+ listed alphabetically. If you would like to be included in this
+ list, please
+ <a href="#submissions">follow these instructions</a>.
 </p>
 
 <toc-display />
@@ -30,60 +30,60 @@
 
 <h2><a name="submissions" id="submissions">Submissions</a></h2>
 <p>
-  In order to be added to this list, please include the following
-  information in an email to
-  <a
-  href="mailto:debian-www@lists.debian.org?subject=Who's%20using%20Debian%3F">debian-www@lists.debian.org</a>
-  (please keep the subject line, <q>Who's using Debian</q>, or we may not notice your submission).
-  The submissions should be sent in English.  If you do not speak
-  English, please send your submission to the
-  <a href="https://lists.debian.org/i18n.html">appropriate translation list</a>.
-  Notice that your submission mail will be posted to a public mailing list.
+ In order to be added to this list, please include the following
+ information in an email to
+ <a
+ href="mailto:debian-www@lists.debian.org?subject=Who's%20using%20Debian%3F">debian-www@lists.debian.org</a>
+ (please keep the subject line, <q>Who's using Debian</q>, or we may not notice your submission).
+ The submissions should be sent in English. If you do not speak
+ English, please send your submission to the
+ <a href="https://lists.debian.org/i18n.html">appropriate translation list</a>.
+ Notice that your submission mail will be posted to a public mailing list.
 </p>
 
 <p>
-  Only submit information about organizations you represent.  You may have to 
-  ask for permission inside your organization before making a submission here. 
-  If you're a consultant who make at least part of your income from doing 
-  <strong>paid</strong> support for Debian, please instead go to our 
-  <a href="$(HOME)/consultants/">Consultants</a> page.
+ Only submit information about organizations you represent. You may have to 
+ ask for permission inside your organization before making a submission here. 
+ If you're a consultant who make at least part of your income from doing 
+ <strong>paid</strong> support for Debian, please instead go to our 
+ <a href="$(HOME)/consultants/">Consultants</a> page.
 </p>
 
 <p>
-  Please don't submit information about private individuals.  We value your 
-  support, but don't have enough people to maintain information about our 
-  many individual users.
+ Please don't submit information about private individuals. We value your 
+ support, but don't have enough people to maintain information about our 
+ many individual users.
 </p>
 
 <p>
-  <strong>Only include information you're comfortable becoming public 
-  knowledge.</strong>
+ <strong>Only include information you're comfortable becoming public 
+ knowledge.</strong>
 </p>
 
 <ol>
-  <li>
-    <p>
-      Name of organization (in the form of <em>division</em>, <em>organization</em>, <em>city/town</em> (optional), <em>region/province</em> (optional), <em>country</em>).
-      An example is: AI Lab, Massachusetts Institute of Technology, USA
-    </p>
-    <p>
-      Not all entries are in this form yet, but we'd like to convert the ones which aren't.
-    </p>
-  </li>
-  <li>Organization type (pick only one of <q>educational</q>, <q>non-profit</q>, <q>commercial</q>, or <q>government</q>)</li>
-  <li>Home page link <em>(optional)</em></li>
-  <li>A short paragraph or two describing how your organization uses Debian.
-    Try to include details such as the number of workstations/servers,
-    the software they run (no need to specify version),
-    and why you chose Debian over the
-    competition.
-  </li>
+ <li>
+ <p>
+ Name of organization (in the form of <em>division</em>, <em>organization</em>, <em>city/town</em> (optional), <em>region/province</em> (optional), <em>country</em>).
+ An example is: AI Lab, Massachusetts Institute of Technology, USA
+ </p>
+ <p>
+ Not all entries are in this form yet, but we'd like to convert the ones which aren't.
+ </p>
+ </li>
+ <li>Organization type (pick only one of <q>educational</q>, <q>non-profit</q>, <q>commercial</q>, or <q>government</q>)</li>
+ <li>Home page link <em>(optional)</em></li>
+ <li>A short paragraph or two describing how your organization uses Debian.
+ Try to include details such as the number of workstations/servers,
+ the software they run (no need to specify version),
+ and why you chose Debian over the
+ competition.
+ </li>
 </ol>
 
 <p>
-  If you represent an organization considering to become a Debian Partner, 
-  please see our <a href="$(HOME)/partners/">Partners Program</a> for more 
-  information about how to provide ongoing assistance to Debian.
-  For donations to Debian, please see our <a href="$(HOME)/donations/">\
-  Donations</a> page.
+ If you represent an organization considering to become a Debian Partner, 
+ please see our <a href="$(HOME)/partners/">Partners Program</a> for more 
+ information about how to provide ongoing assistance to Debian.
+ For donations to Debian, please see our <a href="$(HOME)/donations/">\
+ Donations</a> page.
 </p>