aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorklondike <klondike@xiscosoft.es>2010-11-17 14:30:03 +0100
committerklondike <klondike@xiscosoft.es>2010-11-17 14:30:03 +0100
commit52258df44a6fb051a46b8970633a4ff4cb3abc35 (patch)
treedff8c20515b441b2129cee1240b017bd4c8f0275
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/hardened-docs... (diff)
parentfix e-mail (diff)
downloadhardened-docs-52258df44a6fb051a46b8970633a4ff4cb3abc35.tar.gz
hardened-docs-52258df44a6fb051a46b8970633a4ff4cb3abc35.tar.bz2
hardened-docs-52258df44a6fb051a46b8970633a4ff4cb3abc35.zip
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/hardened-docs into orderedordered
-rw-r--r--README2
-rw-r--r--html/hardenedfaq.html2
-rw-r--r--xml/hardenedfaq.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 7ac9170..a41ceb8 100644
--- a/README
+++ b/README
@@ -8,4 +8,4 @@ Francisco Blas Izquierdo Riera (klondike) <klondike at xiscosoft.es>
Anthony G. Basile (blueness) <basile at opensource.dyc.edu>
Magnus Granberg (Zorry) <zorry at gentoo.org>
Matthew Summers (quantumsummers) <quantumsummers at gentoo.org>
-Sven Vermeulen (SwifT) <swift at gentoo.org>
+Sven Vermeulen (SwifT) <sven.vermeulen at siphos.be>
diff --git a/html/hardenedfaq.html b/html/hardenedfaq.html
index 63a0f8f..9300a69 100644
--- a/html/hardenedfaq.html
+++ b/html/hardenedfaq.html
@@ -367,7 +367,7 @@ located at <a href="grsecurity.html">http://www.gentoo.org/proj/en/hardened/grse
<p class="secthead"><a name="grsecnew"></a><a name="doc_chap4_sect3">Can I use Grsecurity with a recent kernel not on the tree?</a></p>
<p>
Usually we release a new version of hardened sources not long after a new
-PaX/Grsecurity patch isreleased, so the best option is just waiting a bit for
+PaX/Grsecurity patch is released, so the best option is just waiting a bit for
the kernel team to adapt the patches and then test them. Anyway if you are very
impatient, you can download the patches from
<a href="http://grsecurity.net/download.php">http://grsecurity.net/download.php</a> and try to patch the sources
diff --git a/xml/hardenedfaq.xml b/xml/hardenedfaq.xml
index 06adbb7..1efbda2 100644
--- a/xml/hardenedfaq.xml
+++ b/xml/hardenedfaq.xml
@@ -464,7 +464,7 @@ located at <uri>http://www.gentoo.org/proj/en/hardened/grsecurity.xml</uri>.
<p>
Usually we release a new version of hardened sources not long after a new
-PaX/Grsecurity patch isreleased, so the best option is just waiting a bit for
+PaX/Grsecurity patch is released, so the best option is just waiting a bit for
the kernel team to adapt the patches and then test them. Anyway if you are very
impatient, you can download the patches from
<uri>http://grsecurity.net/download.php</uri> and try to patch the sources