The following commit has been merged in the master branch:
commit a22d53623750772bb78b2914369c908252b84be3
Author: Andreas Tille <[email protected]>
Date: Sat Nov 26 15:45:41 2016 +0100
Remove Mandriva from doc, since link was not active any more.
diff --git a/debian/changelog b/debian/changelog
index 13df278..ccf8522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
blends (0.6.95) UNRELEASED; urgency=medium
- [ Petter Reinholdtsen ]
+ [ Ole Streicher ]
* Adjusted blend-gen-control to handle RFC822 style continuation
- lines as well as backslash style (Closes: #840094). Patch by Ole
- Streicher.
+ lines as well as backslash style (Closes: #840094).
+
+ [ Andreas Tille ]
+ * Remove Mandriva from doc, since link was not active any more.
-- Ole Streicher <[email protected]> Mon, 12 Sep 2016 09:40:48 +0200
diff --git a/doc/en/02_about.xml b/doc/en/02_about.xml
index 2ff6362..ca73b5b 100644
--- a/doc/en/02_about.xml
+++ b/doc/en/02_about.xml
@@ -71,7 +71,7 @@
<varlistentry>
<term>RPM (RedHat Package Manager)</term>
<listitem>
- <para>which is supported by RedHat, SuSE, Mandriva and others.</para>
+ <para>which is supported by RedHat, SuSE and others.</para>
</listitem>
</varlistentry>
@@ -138,10 +138,9 @@
<para>
Distributors you might know are
- <ulink url="http://www.mandriva.com/";>Mandriva</ulink>,
<ulink url="http://www.redhat.com/";>RedHat</ulink>,
- <ulink url="http://www.suse.com/";>SuSE</ulink>
- (now owned by <ulink url="http://www.novell.com/linux/";>Novell</ulink>)
+ <ulink url="http://www.suse.com/";>SuSE</ulink>,
+ <ulink url="https://www.ubuntu.com/";>Ubuntu</ulink>
and others.
</para>
<para>
diff --git a/doc/en/03_general_ideas.xml b/doc/en/03_general_ideas.xml
index 1895bf2..d11d5de 100644
--- a/doc/en/03_general_ideas.xml
+++ b/doc/en/03_general_ideas.xml
@@ -6,10 +6,10 @@
Commercial Linux distributors sell certain products that try to
address special user needs.
- <variablelist><varlistentry><term>Enterprise
solutions</term><listitem><itemizedlist><listitem><para>Corporate Server -
Mandriva</para></listitem><listitem><para>Advanced Server -
RedHat</para></listitem><listitem><para>Enterprise Server -
SuSE</para></listitem></itemizedlist></listitem></varlistentry><varlistentry><term>Small
Office and Home Office (SOHO)</term><listitem><para>There are a couple of
workstation or home editions, as well as
+ <variablelist><varlistentry><term>Enterprise
solutions</term><listitem><itemizedlist><listitem><para>Advanced Server -
RedHat</para></listitem><listitem><para>Enterprise Server -
SuSE</para></listitem></itemizedlist></listitem></varlistentry><varlistentry><term>Small
Office and Home Office (SOHO)</term><listitem><para>There are a couple of
workstation or home editions, as well as
office desktops built by several GNU/Linux distributors.
- </para></listitem></varlistentry><varlistentry><term>Special task
products</term><listitem><variablelist><varlistentry><term>Mail
server</term><listitem><para>SuSE Linux Openexchange
Server</para></listitem></varlistentry><varlistentry><term>Firewall</term><listitem><para>Multi
Network Firewall - Mandriva, SuSE Firewall on CD,
-
...</para></listitem></varlistentry><varlistentry><term>Cluster</term><listitem><para>Mandriva
Clustering</para></listitem></varlistentry><varlistentry><term>Content
Management
System</term><listitem><para>RedHat</para></listitem></varlistentry><varlistentry><term>Portal
Server</term><listitem><para>RedHat</para></listitem></varlistentry></variablelist></listitem></varlistentry></variablelist>
+ </para></listitem></varlistentry><varlistentry><term>Special task
products</term><listitem><variablelist><varlistentry><term>Mail
server</term><listitem><para>SuSE Linux Openexchange
Server</para></listitem></varlistentry><varlistentry><term>Firewall</term><listitem><para>SuSE
Firewall on CD,
+
...</para></listitem></varlistentry><varlistentry><term>Content Management
System</term><listitem><para>RedHat</para></listitem></varlistentry><varlistentry><term>Portal
Server</term><listitem><para>RedHat</para></listitem></varlistentry></variablelist></listitem></varlistentry></variablelist>
This is only a small set of examples of commercial GNU/Linux
distributors addressing specific user interests with certain products.
--
Git repository for blends code
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
