You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/07/19 00:46:20 UTC

svn commit: r1504708 - in /accumulo/site/trunk: ./ content/css/accumulo.css content/git.mdtext content/source.mdtext templates/sidenav.mdtext templates/skeleton.html

Author: elserj
Date: Thu Jul 18 22:46:20 2013
New Revision: 1504708

URL: http://svn.apache.org/r1504708
Log:
ACCUMULO-1498 Merge back in all of the changes to the site

Added:
    accumulo/site/trunk/content/git.mdtext
      - copied unchanged from r1504703, accumulo/site/branches/git/content/git.mdtext
Modified:
    accumulo/site/trunk/   (props changed)
    accumulo/site/trunk/content/css/accumulo.css
    accumulo/site/trunk/content/source.mdtext
    accumulo/site/trunk/templates/sidenav.mdtext
    accumulo/site/trunk/templates/skeleton.html

Propchange: accumulo/site/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /accumulo/site/branches/git:1490088-1504703

Modified: accumulo/site/trunk/content/css/accumulo.css
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/css/accumulo.css?rev=1504708&r1=1504707&r2=1504708&view=diff
==============================================================================
--- accumulo/site/trunk/content/css/accumulo.css (original)
+++ accumulo/site/trunk/content/css/accumulo.css Thu Jul 18 22:46:20 2013
@@ -61,7 +61,8 @@ h1, h2, h3, h4, h5, h6 {
 }
 #content h1 {
     font-size: 1.4em;
-    padding: 15px;
+    padding-top: 15px;
+    padding-bottom: 15px;
 }
 #content h2 {
     border-bottom: 1px dashed #666666;

Modified: accumulo/site/trunk/content/source.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/source.mdtext?rev=1504708&r1=1504707&r2=1504708&view=diff
==============================================================================
--- accumulo/site/trunk/content/source.mdtext (original)
+++ accumulo/site/trunk/content/source.mdtext Thu Jul 18 22:46:20 2013
@@ -18,12 +18,12 @@ Notice:    Licensed to the Apache Softwa
 
 ##  Source Code
 
-Apache Accumulo™ source code is maintained using [Git][gitscm] version control 
-([browse][viewvc]).  It builds with [Apache Maven][maven].
+Apache Accumulo™ source code is maintained using [Git][git] version control 
+([browse][cgit]|[checkout][anongit]).  It builds with [Apache Maven][maven].
 
 ## Website
 
-Accumulo's web site is also maintained in Subversion using Apache's [Content Management System][cms].
+Accumulo's web site is maintained in [Subversion][subversion] using Apache's [Content Management System][cms].
 Committers may edit the site by following [these instructions][cmsusage].  Non-committers should follow
 [this FAQ entry][cmsanon].
 
@@ -39,7 +39,7 @@ will wait for you to enter a newline to 
 'thrift' command is in your path. Watch out for THRIFT-1367; you may need to configure Thrift with
 --without-ruby.
 
-#### Checking out from git
+#### Checking out from Git
 
 
 To check out the code:
@@ -102,9 +102,7 @@ Changes should be merged from earlier br
 ### Release Guide
 Accumulo's release guide can be found [here][release].
 
-[gitscm]: http://gitscm.com/
 [maven]: http://maven.apache.org/
-[viewvc]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary
 [srcheaders]: http://www.apache.org/legal/src-headers.html
 [styles]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;f=contrib;h=e43cff51b721cf7fc48ce5e3cf5c9b25cd3d1166;hb=HEAD
 [jenkins]: http://jenkins-ci.org/
@@ -114,7 +112,10 @@ Accumulo's release guide can be found [h
 [13build]: https://builds.apache.org/job/Accumulo-1.3.x/
 [jiraloc]: https://issues.apache.org/jira/browse/accumulo
 [jira]: http://www.atlassian.com/software/jira/overview
-[release]: /governance/releasing.html
+[release]: governance/releasing.html
 [cms]: http://www.apache.org/dev/cms.html
 [cmsusage]: http://www.apache.org/dev/cms.html#usage
-[cmsanon]: http://www.apache.org/dev/cmsref.html#non-committer
\ No newline at end of file
+[cmsanon]: http://www.apache.org/dev/cmsref.html#non-committer
+[git]: http://git-scm.com/
+[cgit]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary
+[anongit]: http://git-wip-us.apache.org/repos/asf/accumulo.git

Modified: accumulo/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/templates/sidenav.mdtext?rev=1504708&r1=1504707&r2=1504708&view=diff
==============================================================================
--- accumulo/site/trunk/templates/sidenav.mdtext (original)
+++ accumulo/site/trunk/templates/sidenav.mdtext Thu Jul 18 22:46:20 2013
@@ -1,28 +1,29 @@
 # Project
  - [Home](/)
- - [Downloads](/downloads)
- - [Features](/notable_features.html)
+ - [Downloads](downloads)
+ - [Features](notable_features.html)
  - [License](http://www.apache.org/licenses/LICENSE-2.0)
 
 # Community
- - [Get Involved](/get_involved.html)
- - [Mailing Lists](/mailing_list.html)
- - [People](/people.html)
+ - [Get Involved](get_involved.html)
+ - [Mailing Lists](mailing_list.html)
+ - [People](people.html)
 
 # Development
- - [Source & Guide](/source.html)
+ - [Source & Guide](source.html)
+ - [Git WIP](git.html)
  - [Issues](https://issues.apache.org/jira/browse/accumulo)
  - [Builds](https://builds.apache.org/view/A-D/view/Accumulo/)
 
 # Documentation
- - Manual [1.4](/1.4/user_manual) / [1.5](/1.5/accumulo_user_manual.html)
- - Javadoc [1.4](/1.4/apidocs) / [1.5](/1.5/apidocs)
- - Examples [1.4](/1.4/examples) / [1.5](/1.5/examples)
- - [Screenshots](/screenshots.html)
- - [Papers & Other Links](/papers.html)
- - [Glossary](/glossary.html)
+ - Manual [1.4](/1.4/user_manual) / [1.5](1.5/accumulo_user_manual.html)
+ - Javadoc [1.4](/1.4/apidocs) / [1.5](1.5/apidocs)
+ - Examples [1.4](/1.4/examples) / [1.5](1.5/examples)
+ - [Screenshots](screenshots.html)
+ - [Papers & Other Links](papers.html)
+ - [Glossary](glossary.html)
 # ASF links
   - [Apache Software Foundation](http://www.apache.org)
   - [Sponsorship](http://www.apache.org/foundation/sponsorship.html)
   - [Security](http://www.apache.org/security/)
-  - [Thanks](http://www.apache.org/foundation/thanks.html)
\ No newline at end of file
+  - [Thanks](http://www.apache.org/foundation/thanks.html)

Modified: accumulo/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/templates/skeleton.html?rev=1504708&r1=1504707&r2=1504708&view=diff
==============================================================================
--- accumulo/site/trunk/templates/skeleton.html (original)
+++ accumulo/site/trunk/templates/skeleton.html Thu Jul 18 22:46:20 2013
@@ -17,7 +17,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="css/accumulo.css" rel="stylesheet" type="text/css">
   <title>{% block title %}{{ headers.title }}{% endblock %}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
@@ -49,7 +49,7 @@
   </div>
 
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo" src="images/accumulo-logo.png"/>&trade;
   </div>
 
   <div id="content">
@@ -59,7 +59,7 @@
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="images/feather-small.gif"/ width="100">
     </a>
     <div class="copyright">
       <p>