Documentation

diff --git a/build.moxie b/build.moxie
index c5210ef191bc4d106faff8e8b276fa0b3e902456..e5f7c739298047c7fc04f308bb8dfe29de1d2adb 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -19,7 +19,7 @@ releaseDate: 2014-10-28
 
 # Project urls
 url: 'http://gitblit.com'
-issuesUrl: 'http://code.google.com/p/gitblit/issues/list'
+issuesUrl: 'https://github.com/gitblit/gitblit'
 socialNetworkUrl: 'https://plus.google.com/114464678392593421684'
 forumUrl: 'http://groups.google.com/group/gitblit'
 mavenUrl: 'http://gitblit.github.io/gitblit-maven'

diff --git a/build.xml b/build.xml
index 65fc0432cad2316e486ddc3c298c9e741db3ecd4..c7dc499cb4f2515bb8cab46f54866cab74ca994b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -553,8 +553,6 @@
                                        <page name="release history" out="releases.html">\r
                                                <template src="releasehistory.ftl" data="${releaselog}" />\r
                                        </page>\r
-                                       <divider />\r
-                                       <page name="roadmap" src="roadmap.mkd" />                                       \r
                                </menu>\r
                                \r
                                <menu name="downloads">\r
@@ -585,7 +583,6 @@
                                        <link name="Github" src="${project.scmUrl}" />\r
                                        <link name="Issues" src="${project.issuesUrl}" />\r
                                        <link name="Discussion" src="${project.forumUrl}" />\r
-                                       <link name="Google+" src="${project.socialNetworkUrl}" />\r
                                        <link name="Twitter" src="https://twitter.com/gitblit" />\r
                                        <link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />\r
                     <divider />\r
@@ -593,7 +590,6 @@
                                        <link name="Gitblit SSH and Plugin Management asciicast" src="https://asciinema.org/a/9342" />\r
                     <link name="GitMinutes #29: James Moger on Gitblit" src="http://episodes.gitminutes.com/2014/05/gitminutes-29-james-moger-on-gitblit.html" />\r
                                        <divider />\r
-                                       <link name="+JamesMoger" src="https://plus.google.com/+JamesMoger" />\r
                                        <link name="@JamesMoger" src="https://twitter.com/JamesMoger" />\r
                                </menu>\r
                                <divider />\r
@@ -897,7 +893,6 @@
                                                <link name="Github" src="${project.scmUrl}" />\r
                                                <link name="Issues" src="${project.issuesUrl}" />\r
                                                <link name="Discussion" src="${project.forumUrl}" />\r
-                                               <link name="Google+" src="${project.socialNetworkUrl}" />\r
                                                <link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />\r
                                        </menu>\r
                                </structure>\r

diff --git a/releases.moxie b/releases.moxie
index 3de8e9cdcd07aea8c1be2172ffb08ce8efa433b5..7a3927d7a5c174fcb34b6fb3f443e8513cbb66bd 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -7,12 +7,7 @@ r27: {
     date: ${project.buildDate}
     note: ~
     html: ~
-    text: ''
-          The new gitblit.properties file "includes" defaults.properties which is the original
-          gitblit.properties file. You may continue using your existing gitblit.properties file
-          as before, however, you might find future upgrades simpler by adopting the new "include"
-          design.
-          ''
+    text: ~
     security: ~
     fixes:
     - Fix exception when viewing a ticket with a patchset where the integration branch does not exist (issue-521, ticket-212)
@@ -40,6 +35,7 @@ r27: {
     - Support for chain-loading properties files (ticket-110) 
     - Add Priority & Severity fields for tickets (pr-220, ticket-157)
     - Add Maintenance ticket type (pr-223, ticket-206)
+    - Add commitdiff option to ignore whitespace (ticket-233)
     - Add configurable tab length for blob views (ticket-253)
     - Implement image diffs (pr-229)
     - Add support for configurable HTTP proxy host/port in PluginManager (pr-235)

diff --git a/src/site/roadmap.mkd b/src/site/roadmap.mkd
deleted file mode 100644 (file)
index ea64321..0000000
--- a/src/site/roadmap.mkd
+++ /dev/null
@@ -1,8 +0,0 @@
-## Roadmap\r
-\r
-This is not exactly a formal roadmap but it is a priority list of what might be implemented in future releases.  \r
-This list is volatile and may not reflect what will be in the next release.\r
-\r
-* Add support for Project owners/administrators (ticket-75)\r
-* Add Project create/update pages\r
-* Integrate improvements for git-flow (ticket-55)\r

diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd
index ae954bfa8868f2d23d1e47f37564caee3830d63f..aec5c42a846a5fd6e3f7bcce8f2496a2636925f2 100644 (file)
--- a/src/site/siteindex.mkd
+++ b/src/site/siteindex.mkd
@@ -23,12 +23,9 @@
                <tbody>\r
                <tr><th>License</th><td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a></td></tr>\r
                <tr><th>Sources</th><td><a href="${project.scmUrl}">GitHub</a></td></tr>                \r
-               <tr><th>Issues</th><td><a href="${project.issuesUrl}">GoogleCode</a></td></tr>\r
+               <tr><th>Issues</th><td><a href="${project.issuesUrl}">GitHub</a></td></tr>\r
                <tr><th>Discussion</th><td><a href="${project.forumUrl}">Gitblit Group</a></td></tr>\r
-               <tr><th>Google+</th><td><a href="${project.socialNetworkUrl}">Gitblit+</a></td></tr>\r
                <tr><th>Ohloh</th><td><a target="_top" href="http://www.ohloh.net/p/gitblit"><img border="0" width="100" height="16" src="http://www.ohloh.net/p/gitblit/widgets/project_thin_badge.gif" alt="Ohloh project report for Gitblit" /></a></td></tr>\r
-               <tr><th>Donations</th><td>If you enjoy Gitblit and want to support its development, please consider making a donation to <a href="http://www.stjude.org">St. Jude Children's Research Hospital</a>.\r
-               <a href="http://www.stjude.org" alt="St. Jude Children's Research Hospital"><img style="padding-top:10px;" src="stjude_150x150.gif"/></a></td></tr>\r
                </tbody>\r
                </table>\r
        </div>\r