diff options
author | 2011-08-06 10:38:44 +0200 | |
---|---|---|
committer | 2011-08-06 10:38:44 +0200 | |
commit | d2e437b4db84300e2b543c5827d8f517a81afaef (patch) | |
tree | 7863a0a733514684bef0917ccf3ebf3b2a0aac5a /doc | |
parent | 5743a34a6c7757d3030479f96326f09fe5dce0b2 (diff) | |
parent | 097ecf9c510e1435d02be7843bc7e865570338ac (diff) | |
download | scuttle-d2e437b4db84300e2b543c5827d8f517a81afaef.tar.gz scuttle-d2e437b4db84300e2b543c5827d8f517a81afaef.zip |
Merge branch '0.98'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ChangeLog | 10 | ||||
-rw-r--r-- | doc/UPGRADE.txt | 6 | ||||
-rw-r--r-- | doc/configuration.rst | 23 |
3 files changed, 39 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 8fc6743..b7bf843 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -3,6 +3,16 @@ ChangeLog for SemantiScuttle .. contents:: +0.98.2 - 2011-08-XX +------------------- +- 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. + + 0.98.1 - 2011-08-01 ------------------- - Fix bug #3375635: XML parsing problem in top.inc.php diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt index b144af2..e405431 100644 --- a/doc/UPGRADE.txt +++ b/doc/UPGRADE.txt @@ -4,6 +4,12 @@ Upgrading SemanticScuttle from a previous version .. contents:: +From version 0.94-0.98.1 to 0.98.2 +================================== +Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the +``system:unfiled`` tags. + + From version 0.97 to 0.98 ========================= Database updates diff --git a/doc/configuration.rst b/doc/configuration.rst index f457ebb..c8a8bd9 100644 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@ -2,6 +2,8 @@ Configuration files =================== +.. contents:: + SemanticScuttle uses at least two configuration files: 1. Default configuration file ``config.default.php`` @@ -56,3 +58,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/"; + |