summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-08-06 10:34:13 +0200
committerChristian Weiske <cweiske@cweiske.de>2011-08-06 10:34:13 +0200
commit2807d040834ea9fcd825d5b1c9b3e1e005d81664 (patch)
tree3816ec7e9923ccb1ccd6f1987e307eec958406bc
parent5571ec0a4dc9b2297dc6e3f65fc1bbf3dfc5004b (diff)
downloadsemanticscuttle-2807d040834ea9fcd825d5b1c9b3e1e005d81664.tar.gz
semanticscuttle-2807d040834ea9fcd825d5b1c9b3e1e005d81664.tar.bz2
Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem
-rw-r--r--data/config.default.php4
-rw-r--r--doc/ChangeLog1
-rw-r--r--doc/configuration.rst21
3 files changed, 25 insertions, 1 deletions
diff --git a/data/config.default.php b/data/config.default.php
index c850521..9c2f7f3 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -81,13 +81,15 @@ $theme = 'default';
/**
* SemanticScuttle root directory.
- *
* Set to NULL to autodetect the root url of the website.
*
* If your installation is in a subdirectory like
* "http://www.example.com/semanticscuttle/" then
* replace NULL by your address (between "" and with trailing '/')
*
+ * The autodetection works for both HTTP and HTTPS urls.
+ * If you offer HTTP *only*, then set your root url here.
+ *
* @var string
*/
$root = null;
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 860a213..b7bf843 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -7,6 +7,7 @@ ChangeLog for SemantiScuttle
-------------------
- Fix bug #3385724: Rename tag ends with XML Parsing Error
- Fix bug #3386178: "system:unfiled" secret tag does not work
+- Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem
Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the
``system:unfiled`` tags.
diff --git a/doc/configuration.rst b/doc/configuration.rst
index f457ebb..c34318a 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -56,3 +56,24 @@ per-host configuration files:
- ``data/config.$hostname.php``
- ``/etc/semanticscuttle/config.$hostname.php``
+
+
+Configuration options
+=====================
+``$root`` URL
+-------------
+Normally, this configuration setting is detected automatically and will
+work for both HTTP and HTTPS installations.
+
+If your installation is available on **HTTP only**, then you need to configure
+it.
+
+The value is the full URL to your installation, including a trailing
+slash::
+
+ $root = "http://homepage.example.org/semanticscuttle/";
+
+or::
+
+ $root = "http://bookmarks.example.org/";
+