From b51f75f7c9366b58f6a3d56384b9210ec88e904c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl-Heinz=20G=C3=B6dderz=20=28GuKKDevel=29?=
 <Devel@GuKK-Online.de>
Date: Sat, 8 Dec 2018 11:00:01 +0100
Subject: [PATCH] adding content for .htaccess; important because of include
 includes/general.php

---
 source/DIR-includes.rst | 35 +----------------------------------
 source/DIR-www.rst      | 10 ++++++++++
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/source/DIR-includes.rst b/source/DIR-includes.rst
index be43d1a..2b1725b 100644
--- a/source/DIR-includes.rst
+++ b/source/DIR-includes.rst
@@ -68,40 +68,7 @@ Directory :file:`includes`
         includes/lib/l10n.php
         includes/lib/check_weak_key.php
         includes/notary.inc.php
-        includes/general.php
-        includes/account_stuff.php
-        includes/notary.inc.php
-        SOME__sanitizeHTML
-        ..         ?-check_email
-        ..         ?-make_hash
-        includes/mysql.php__sendmail
-        ..         ?-account_email_delete
-        ..         ?-checkWeakKeySPKAC
-        ..         ?-write_user_agreement
-        ..         ?-generatecertpath
-        ..         ?-checkWeakKeyCSR
-        ..         ?-waitForResult
-        ..         ?-checkEmail
-        ..         ?-account_domain_delete
-        ..         ?-clean_csr
-        ..         ?-extractit
-        ..         ?-getcn
-        ..         ?-getalt
-        ..         ?-HashAlgorithms::clean_csr
-        ..         ?-checkWeakKeyX509
-        ..         ?-unset
-        ..         ?-valid_ticket_number
-        ..         ?-write_se_log
-        ..         ?-revoke_all_private_cert
-        ..         ?-runCommand
-        ..         ?-check_client_cert_running
-        ..         ?-check_server_cert_running
-        ..        ?-check_gpg_cert_running
-        ..        ?-check_is_orgadmin
-        ..        ?-account_delete
-
-
-
+        
     .. php:function:: buildSubject(array $domains, $include_xmpp_addr = true)
 
         Build a subject string as needed by the signer
diff --git a/source/DIR-www.rst b/source/DIR-www.rst
index ad3c70d..358103f 100644
--- a/source/DIR-www.rst
+++ b/source/DIR-www.rst
@@ -42,6 +42,16 @@ This contains the PHP code that is the entry point to the application:
 .. sourcefile:: www/help.php
 
 .. sourcefile:: www/.htaccess
+    :uses:
+        includes/general.php
+    :links:
+        http://www.cacert.org/policy/CertificationPracticeStatement.html
+
+    The file :file:`www/.htaccess` is the file that contains some statements to control the whole process of the website. 
+    It contains a general include-statement for including :file:`ìncludes/general.php` (auto_prepend_file /www/includes/general.php). Therefor a 'include(../includes/general.php) is not needed.
+    
+    Also a permanent redirection is made from :file:`/cps.php` to <http://www.cacert.org/policy/CertificationPracticeStatement.html> (RedirectPermanent /cps.php http://www.cacert.org/policy/CertificationPracticeStatement.html).
+
 
 .. sourcefile:: www/index.php
    :uses: