1 diff --git a/beta/index.php b/beta/index.php
2 index 8653213..e3efa8d 100644
6 <p>Our CI system builds a special version of the grml-medium amd64
7 flavour after every Grml git code change. This build is usually not
8 tested and includes experimental code that may not have been tested
9 - or may never be released.
10 + either and that may never be released.
11 <a href="http://jenkins.grml.org/job/grml-medium-amd64/">See here.</a></p>
14 <h2>Release Candidates</h2>
16 - <p>Shortly before a release will happen, a release candidate will
17 - usually be announced on <a href="/irc/">IRC</a>.</p>
18 + <p>Shortly before we publish a new release, a release candidate is
19 + usually announced on <a href="/irc/">IRC</a>.</p>
23 diff --git a/bugs/index.php b/bugs/index.php
24 index f7a8c58..7acb37e 100644
29 <p>Note: all bugs are made public.</p>
31 - <p><b>Thank you for helping us improving Grml!</b></p>
32 + <p><b>Thank you for helping us improve Grml!</b></p>
35 <?php include '../static_bottom.inc'; ?>
36 diff --git a/bugs/known/index.php b/bugs/known/index.php
37 index caa564c..5403659 100644
38 --- a/bugs/known/index.php
39 +++ b/bugs/known/index.php
42 <p>Additional issues can be found in the Grml Bugtracker. <a href="http://bts.grml.org/grml/">List of Open Issues</a>.</p>
44 - <p>If you find additional bugs, please <a href="/bugs/">please report them</a>.</p>
45 + <p>If you find additional bugs, please <a href="/bugs/">report them</a>.</p>
47 <h2>Known Bugs in Grml 2011.05</h2>
49 diff --git a/config/index.php b/config/index.php
50 index 0532da3..0c2784b 100644
51 --- a/config/index.php
52 +++ b/config/index.php
55 <h1>Configuration</h1>
57 - <p>Starting with version 0.5 Grml provided a configuration system. For
58 - more details take a look at <a href="grml-autoconfig.1.html">grml-autoconfig.1.html</a>.</p>
59 + <p>Starting with version 0.5 Grml provides a configuration system. Please
60 + see <a href="grml-autoconfig.1.html">grml-autoconfig.1.html</a> for details.</p>
62 - <p>On Grml releases <=2009.05 the documentation is available on the
63 - grml ISO via 'man save-config' and <a
64 + <p>In Grml releases up to and including 2009.05 the documentation is available on the
65 + grml ISO via 'man save-config' and as <a
66 href="file:///usr/share/doc/grml-saveconfig/grml-config.html">/usr/share/doc/grml-saveconfig/grml-config.html</a>.</p>
68 - <p>On Grml releases >2009.05 the documentation is available on the
69 - grml-ISO via 'man 1 grml-autoconfig' and <a
70 + <p>In Grml releases after 2009.05 the documentation is available on the
71 + grml-ISO via 'man 1 grml-autoconfig' and as <a
72 href="file:///usr/share/doc/grml-autoconfig/grml-autoconfig.1.html">/usr/share/doc/grml-autoconfig/grml-autoconfig.1.html</a>.</p>
74 <p><strong>Tip:</strong> Make sure to also check out the new <a
75 href="http://wiki.grml.org/doku.php?id=persistency">persistency
76 - features</a> on Grml.</p>
77 + features</a> of Grml.</p>
79 <p>Any further wishes, feedback, bug reports? Please <a
80 href="/contact/">contact us</a>!</p>
81 diff --git a/contact/index.php b/contact/index.php
82 index 671d0e1..9b1dd70 100644
83 --- a/contact/index.php
84 +++ b/contact/index.php
87 <p>For general questions please join the Grml user mailinglist (see below).</p>
89 - <p>If you have found a bug please <a href="/bugs/">report that here</a>.</p>
90 + <p>If you have found a bug please <a href="/bugs/">report it</a>.</p>
92 - <p>For commercial support and services please send us a mail
93 + <p>For commercial support and services please send us mail
94 to business (at) grml.org.</p>
96 <a name="mailinglist"></a>
97 <h2>Mailing lists</h2>
99 - <p>If you want to be noticed when a <strong>new Grml
100 - release</strong> is available subscribe to the
101 + <p>If you want to be notified when a <strong>new Grml
102 + release</strong> is available, subscribe to the
103 read-only <a href="http://ml.grml.org/mailman/listinfo/grml-announce">Grml
104 - announce mailinglist</a>.</p>
105 + announce mailing list</a>.</p>
107 - <p>If you want to participate on the <strong>mailinglist of
108 - Grml</strong> please subscribe to the <a
109 + <p>If you want to participate in the <strong>mailing list of
110 + Grml</strong>, please subscribe to the <a
111 href="http://ml.grml.org/mailman/listinfo/grml">Grml user
112 - mailinglist</a>. Anyone can post to this mailinglist list, but if you
113 - are not already subscribed, your message will be moderated. In this way,
114 - we limit the amount of spam entering the message lists. The Grml user
115 - mailinglist is available <a
116 + mailing list</a>. Anyone can post to this mailing list, but if you
117 + are not already subscribed, your message will need moderator approval before being posted. This way
118 + we limit the amount of spam that makes it to the list. The Grml user
119 + mailing list is available <a
120 href="http://dir.gmane.org/gmane.linux.distributions.grml.user">via
121 gmane</a> as well.</p>
123 - <p>If you are interested in following <strong>development of
124 + <p>If you are interested in following the <strong>development of
125 Grml</strong> you might be interested in the <a
126 href="http://ml.grml.org/mailman/listinfo/grml-devel">Grml developer
127 - mailinglist</a>. The <a
128 + mailing list</a>. The <a
129 href="http://ml.grml.org/mailman/listinfo/git-commits">Grml repository
130 - commits mailinglist</a> tracks all the pushed commits to <a
131 + commits mailing list</a> tracks all the pushed commits to <a
132 href="http://git.grml.org/">Grml's git repositories</a>. Changes in
133 Grml's Debian repository can be tracked via the <a
134 href="http://ml.grml.org/mailman/listinfo/grml-testing-changes">Grml
135 - Testing-changes mailinglist</a>. The <a
136 + Testing-changes mailing list</a>. The <a
137 href="http://ml.grml.org/mailman/listinfo/bugs-changes">bug-changes</a>
138 - mailinglist tracks all messages sent to <a
139 + mailing list tracks all messages sent to <a
140 href="http://bts.grml.org/">Grml's Bug Tracking System</a>.</p>
142 - <p><strong>Notice:</strong> All Grml mailinglists are <strong>english
143 + <p><strong>Notice:</strong> All Grml mailing lists are <strong>English
149 - <p>You can find us at <a href="irc://irc.freenode.net/grml">#grml on
150 - irc.freenode.org</a>. Channel language is english.</p>
151 + <p>You can find us in <a href="irc://irc.freenode.net/grml">#grml on
152 + irc.freenode.org</a>. Channel language is English.</p>
156 diff --git a/copyright/index.php b/copyright/index.php
157 index 6c81b4d..0454a10 100644
158 --- a/copyright/index.php
159 +++ b/copyright/index.php
161 href="http://www.gnu.org/copyleft/gpl.html">the GNU General
162 Public License</a>. Debian packages of the grml software are
164 - href="http://deb.grml.org/">grml-repository</a>, sources are
165 + href="http://deb.grml.org/">grml repository</a>; sources are
167 - href="http://sources.grml.org/">sources.grml.org</a>.</p>
168 + href="http://sources.grml.org/">http://sources.grml.org/</a>.</p>
170 - <p>If not otherwise specified, the software on the ISO falls under
171 + <p>If not otherwise specified, the software packaged as grml and published in the form of ISO images falls under
172 <a href="http://www.gnu.org/copyleft/gpl.html">the GNU General Public
173 License</a>. Take a look at /usr/share/doc/$PACKAGE/copyright for
175 + the specific license terms of each shipped package.</p>
177 <p>You can copy, modify, redistribute and even resell the CD without
178 - restrictions, as long as the recipient receives the same license.</p>
179 + restrictions, as long as you license it to your customers under the same license.
180 + (Note: this is just a summary of the terms of the GPL; always read the
181 + <a href="http://www.gnu.org/copyleft/gpl.html">full text</a> of the license
182 + and preferably consult a lawyer if you have any doubt whether what you want to
183 + do is permitted by the GPL.)</p>
187 diff --git a/daily/index.html b/daily/index.html
188 index add3eb5..89b1aea 100644
189 --- a/daily/index.html
190 +++ b/daily/index.html
195 -<p>This webpage provides <strong>automatically generated snapshots</strong> of
196 +<p>This page provides <strong>automatically generated snapshots</strong> of
197 the <a href="http://grml.org/">Grml Linux Live system</a> which were built
198 using <a href="http://grml.org/grml-live/">grml-live</a>. If you don't know
199 -what's Grml please visit <a href="http://grml.org/faq/">the Grml FAQ</a>.</p>
200 +what Grml is, please see <a href="http://grml.org/faq/">the Grml FAQ</a>.</p>
202 -<p>WARNING: Feel free to use the ISOs but please notice that they are not
203 -official <a href="http://grml.org/download/">stable releases</a>. They provide
204 -the latest changes, but they also might have known issues. In fact, they may not
205 +<p>WARNING: Feel free to use the ISOs but please note that they are not
206 +official <a href="http://grml.org/download/">stable releases</a>. They contain
207 +the latest code, but bugs are also likely. In fact, these snapshots may not
208 work at all. So: <strong>PLEASE USE THEM WITH CAUTION!</strong></p>
210 <p>Please <a href="http://grml.org/bugs/">report any bugs you notice</a>.</p>
211 @@ -44,12 +44,13 @@ work at all. So: <strong>PLEASE USE THEM WITH CAUTION!</strong></p>
214 <p>Note: the first link on each line points to the most recent available
215 -snapshot of the corresponding Grml flavour. The 'sha1'-link points to the according
216 -sha1 checksum file. The link named 'Older Versions' points to the directory of
217 -the corresponding Grml flavour providing the current as well as older available
219 +snapshot of the corresponding Grml flavour. The linked .sha1 files contain
220 +the sha1 checksum of the corresponding snapshot.
221 +The link named 'Older Versions' points to a directory that contains older available snapshots
222 +of the respective Grml flavour (as well as the latest snapshot).
225 -<h3>Debian/testing based Grml-ISOs</h3>
226 +<h3>Debian testing based Grml images</h3>
229 <li>grml64_testing (64bit):
230 @@ -66,7 +67,7 @@ snapshots.</p>
234 -<h3>Debian/unstable based Grml-ISOs</h3>
235 +<h3>Debian unstable based Grml images</h3>
238 <li>grml64_sid (64bit):
239 @@ -97,7 +98,7 @@ system within <a href="http://grml.org/grml-live/">grml-live</a>. Place these in
241 <p>Problems? Questions? <a href="http://grml.org/contact/">Contact us</a>. But
242 please do not forget to provide all the relevant information (especially which
243 -Grml flavour and version you are refering to).</p>
244 +Grml flavour and version you are referring to).</p>
248 diff --git a/index.php b/index.php
249 index 26bb25c..a75c79b 100644
253 <p>Grml is a bootable live system (Live-CD) based on <a
254 href="http://www.debian.org/">Debian</a>. Grml includes a
255 collection of GNU/Linux software especially for system
256 - administrators. It is not necessary to install anything to a
257 - harddisk. It specializes on administrative tasks like installation,
258 + administrators. Users don't have to install anything on fixed
259 + storage. Grml is especially well suited for administrative tasks like installation,
260 deployment and system rescue. <a href="/features/">Read