You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by ps...@apache.org on 2012/11/27 14:52:32 UTC

svn commit: r1414187 - in /wookie/site/trunk/content: ./ docs/ docs/developer/ docs/developer/features/

Author: psharples
Date: Tue Nov 27 13:52:29 2012
New Revision: 1414187

URL: http://svn.apache.org/viewvc?rev=1414187&view=rev
Log:
More changes for move from incubator to TLP.

Modified:
    wookie/site/trunk/content/docs/developer/features.mdtext
    wookie/site/trunk/content/docs/developer/features/oauth.mdtext
    wookie/site/trunk/content/docs/developer/release-configuration.mdtext
    wookie/site/trunk/content/docs/developer/release-management.mdtext
    wookie/site/trunk/content/docs/developer/release-overview.mdtext
    wookie/site/trunk/content/docs/developer/release-process.mdtext
    wookie/site/trunk/content/docs/source.mdtext
    wookie/site/trunk/content/get-involved.mdtext
    wookie/site/trunk/content/mailing-lists.mdtext

Modified: wookie/site/trunk/content/docs/developer/features.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/docs/developer/features.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/docs/developer/features.mdtext (original)
+++ wookie/site/trunk/content/docs/developer/features.mdtext Tue Nov 27 13:52:29 2012
@@ -90,9 +90,9 @@ If both properties are commented out in 
 
 
   [1]: http://www.w3.org/TR/widgets/#the-feature-element-and-its-attributes
-  [2]: http://svn.apache.org/repos/asf/incubator/wookie/trunk/widgets/camera/
-  [3]: http://svn.apache.org/repos/asf/incubator/wookie/trunk/widgets/widget-template/jqueryMobile/
-  [4]: http://svn.apache.org/repos/asf/incubator/wookie/trunk/scratchpad/widgets/fbfriend/
+  [2]: http://svn.apache.org/repos/asf/wookie/trunk/widgets/camera/
+  [3]: http://svn.apache.org/repos/asf/wookie/trunk/widgets/widget-template/jqueryMobile/
+  [4]: http://svn.apache.org/repos/asf/wookie/trunk/scratchpad/widgets/fbfriend/
   [5]: features/oauth.html
-  [6]: http://svn.apache.org/repos/asf/incubator/wookie/trunk/features/wave/README
-  [7]: http://svn.apache.org/repos/asf/incubator/wookie/trunk/widgets/natter/
\ No newline at end of file
+  [6]: http://svn.apache.org/repos/asf/wookie/trunk/features/wave/README
+  [7]: http://svn.apache.org/repos/asf/wookie/trunk/widgets/natter/
\ No newline at end of file

Modified: wookie/site/trunk/content/docs/developer/features/oauth.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/docs/developer/features/oauth.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/docs/developer/features/oauth.mdtext (original)
+++ wookie/site/trunk/content/docs/developer/features/oauth.mdtext Tue Nov 27 13:52:29 2012
@@ -38,5 +38,5 @@ Steps to create a widget connecting to o
   * To remove token from database, make call to oauth.invalidateToken()
 
 
-  [1]: http://svn.apache.org/repos/asf/incubator/wookie/trunk/scratchpad/widgets/fbfriend/
-  [2]: http://svn.apache.org/repos/asf/incubator/wookie/trunk/scratchpad/widgets/fbfriend/config.xml
\ No newline at end of file
+  [1]: http://svn.apache.org/repos/asf/wookie/trunk/scratchpad/widgets/fbfriend/
+  [2]: http://svn.apache.org/repos/asf/wookie/trunk/scratchpad/widgets/fbfriend/config.xml
\ No newline at end of file

Modified: wookie/site/trunk/content/docs/developer/release-configuration.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/docs/developer/release-configuration.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/docs/developer/release-configuration.mdtext (original)
+++ wookie/site/trunk/content/docs/developer/release-configuration.mdtext Tue Nov 27 13:52:29 2012
@@ -90,11 +90,11 @@ Apache recommend using GNU Privacy Guard
 
  5. Backup your home directory to another media ||
 
- 6. Add your public key to the [SVN repository](https://svn.apache.org/repos/asf/incubator/wookie/KEYS). See the commands describe at the beginning of this KEYS file to perform this task. The gpg key-pair is used to sign the published artifacts for the Wookie releases.
+ 6. Add your public key to the [SVN repository](https://svn.apache.org/repos/asf/wookie/KEYS). See the commands describe at the beginning of this KEYS file to perform this task. The gpg key-pair is used to sign the published artifacts for the Wookie releases.
 
         $ gpg --list-sigs && gpg --armor -- export
 
-    The [KEYS](https://svn.apache.org/repos/asf/incubator/wookie/KEYS) file is updated via normal svn commit procedures.
+    The [KEYS](https://svn.apache.org/repos/asf/wookie/KEYS) file is updated via normal svn commit procedures.
 
  7. Submit your public key to a key server. E.g. [MIT](http://pgp.mit.edu/)
 

Modified: wookie/site/trunk/content/docs/developer/release-management.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/docs/developer/release-management.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/docs/developer/release-management.mdtext (original)
+++ wookie/site/trunk/content/docs/developer/release-management.mdtext Tue Nov 27 13:52:29 2012
@@ -19,11 +19,12 @@ Notice:    Licensed to the Apache Softwa
 # Release Management
 
 Release artifacts are distributed via the Apache Nexus repository for both SNAPSHOT and versioned releases. 
-In addition to Nexus, a source and standalone binary and WAR archive release will be made available via the [Apache Incubator Distribution Area](http://www.apache.org/dist/incubator/wookie/).
+In addition to Nexus, a source and standalone binary and WAR archive release will be made available via the [Apache Distribution Area](http://www.apache.org/dist/wookie/).
+Note: Artifacts created prior to graduation can be found in the [Apache Incubator Distribution Area](http://www.apache.org/dist/incubator/wookie/).
 
 To familiarize yourself with the notions and requirements for releasing artifacts, please checkout the Apache Release FAQ.
 
-### Apache Wookie (Incubating) Release Guidelines
+### Apache Wookie Release Guidelines
 
   1. [Release Manager Configuration Guide](/docs/developer/release-configuration.html)
   1. [Release Overview](/docs/developer/release-overview.html)

Modified: wookie/site/trunk/content/docs/developer/release-overview.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/docs/developer/release-overview.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/docs/developer/release-overview.mdtext (original)
+++ wookie/site/trunk/content/docs/developer/release-overview.mdtext Tue Nov 27 13:52:29 2012
@@ -18,7 +18,7 @@ Notice:    Licensed to the Apache Softwa
 
 # Introduction
 
-This document is an overview of the release process for Apache Wookie (Incubating). 
+This document is an overview of the release process for Apache Wookie. 
 
 # Release Phases
 
@@ -191,26 +191,20 @@ release.
 If you are a PMC member you should not vote +1 unless you are satisfied that the software is,
 to the best of your knowledge, ready for release.
 
-## Request incubator approval
-
-Whilst in the incubator the project needs to have official approvel from the Incubator PMC.
-As with the community vote this should be a formality, however, many incubator PMC
-members will check the legal status of the release as an added precaution.
-
 ## Release
 
 All there is to do now is get the release out there.
 
-### Upload to incubator distribution site
+### Upload to distribution site
 
-Once you have uploaded the files to the incubator distribution site you will need to check
+Once you have uploaded the files to the distribution site you will need to check
 permissions and wait for mirroring to take place.
 
 ### Announce the release
 
 The release announcement needs to be posted to:
 
-  * announce@
-  * wookie-users@
-  * wookie-dev@
+  * announce@apache.org
+  * users@wookie.apache.org
+  * dev@wookie.apache.org
   * project website
\ No newline at end of file

Modified: wookie/site/trunk/content/docs/developer/release-process.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/docs/developer/release-process.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/docs/developer/release-process.mdtext (original)
+++ wookie/site/trunk/content/docs/developer/release-process.mdtext Tue Nov 27 13:52:29 2012
@@ -18,7 +18,7 @@ Notice:    Licensed to the Apache Softwa
 
 # Release Process
 
-This document is an overview of the release process for Apache Wookie (Incubating).
+This document is an overview of the release process for Apache Wookie.
 Wookie uses a series of ant scripts coupled together with Apache Ivy to allow automatic building of the code into its various release artifacts. 
 It can also be used to automatically sign binaries and deploy artifacts to the Nexus Repository.
 
@@ -29,7 +29,7 @@ Make sure the [Release Setup](release-co
 You should familiarize yourself with the ant scripts in the project as they are used to create the artifacts. We will go over the specific tasks for generating them 
 in more detail later.
 
-Note the following 3 artifacts that are to be generated. Eventually these should be made available to download from [http://www.apache.org/dist/incubator/wookie/](http://www.apache.org/dist/incubator/wookie/)
+Note the following 3 artifacts that are to be generated. Eventually these should be made available to download from [http://www.apache.org/dist/wookie/](http://www.apache.org/dist/wookie/)
 
   1. A source release (apache-wookie-VERSION-src.zip) (and also a tar.gz version)
     - this is for users who wish to download the code and build it themselves
@@ -60,7 +60,7 @@ Additionally there are 3 Nexus artifacts
     - The only exception to this is if an issue directly addresses the build process, such as "create build for release" type issue.
 
 ### 2. Communicate with committers regarding new release
-Send an email to wookie-dev@incubator.apache.org and start a vote to discuss whether everybody agrees it is okay to go ahead and make a release.
+Send an email to dev@wookie.apache.org and start a vote to discuss whether everybody agrees it is okay to go ahead and make a release.
 Ideally we'd want a +3 from the committers, but this is not always possible.  
 
 ### 3. Check all Licenses, notices and other related files
@@ -121,18 +121,18 @@ Ideally we'd want a +3 from the committe
     Find...
     
          <scm>
-            <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wookie/trunk</connection>
-            <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/wookie/trunk/</developerConnection>
-            <url>http://svn.apache.org/viewvc/incubator/wookie/trunk/</url>
+            <connection>scm:svn:http://svn.apache.org/repos/asf/wookie/trunk</connection>
+            <developerConnection>scm:svn:https://svn.apache.org/repos/asf/wookie/trunk/</developerConnection>
+            <url>http://svn.apache.org/viewvc/wookie/trunk/</url>
          </scm>
 
 
     ...and update it (with correct version number) to read...
 
         <scm>
-            <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wookie/tags/${project.version}</connection>
-            <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/wookie/tags/${project.version}/</developerConnection>
-            <url>http://svn.apache.org/viewvc/incubator/wookie/tags/${project.version}/</url>
+            <connection>scm:svn:http://svn.apache.org/repos/asf/wookie/tags/${project.version}</connection>
+            <developerConnection>scm:svn:https://svn.apache.org/repos/asf/wookie/tags/${project.version}/</developerConnection>
+            <url>http://svn.apache.org/viewvc/wookie/tags/${project.version}/</url>
         </scm>
 
     Where ${project.version} is going to be your tag name.
@@ -146,7 +146,7 @@ Ideally we'd want a +3 from the committe
 
 ### 6. Inform committers of temporary code freeze
 
-  Send an email to wookie-dev@incubator.apache.org informing that you are about to tag the trunk.
+  Send an email to dev@wookie.apache.org informing that you are about to tag the trunk.
   (just in case there are commits while you are doing it.  It only takes a minute to tag it, so not a long freeze.)
 
 ### 7. Create a tag of the current trunk state.
@@ -154,25 +154,25 @@ Ideally we'd want a +3 from the committe
   1. Ensure you have checked out a clean copy of the trunk from svn.
   1. In Eclipse select the wookie root folder and right click. Choose team -> Tag...
   1. A dialog appears.
-  1. In the Tag: box enter the release version number i.e. '0.10.0-incubating'
+  1. In the Tag: box enter the release version number i.e. '0.12.0'
     - use the same version here as you entered in step (5.2) when updating the pom-template files
-  1. In the Comment box enter something sensible i.e. 'wookie release 0.10.0-incubating'
+  1. In the Comment box enter something sensible i.e. 'wookie release 0.12.0'
   1. Click ok to create the tag.
   1. If you tick the "Start working in the tag" box, the tag will be created and your local copy will update to the tagged version
   1. Verify the tag was created correctly & in the right place. 
-    - In the Eclipse SVN Repository Exploring view you can navigate to svn.apache.org/repos/asf/incubator/wookie/tags/ and make sure the tag exists.
+    - In the Eclipse SVN Repository Exploring view you can navigate to svn.apache.org/repos/asf/wookie/tags/ and make sure the tag exists.
 
 ### 8. Roll version number forward in all properties files in the trunk.
 
   1. If you haven't already, switch back to the trunk. 
   1. Find all the files listed in step (#5.1) above.
-  1. Update all the entries to the next version-SNAPSHOT - i.e. 0.11.0-incubating-SNAPSHOT
+  1. Update all the entries to the next version-SNAPSHOT - i.e. 0.13.0-incubating-SNAPSHOT
   1. Update the 3 pom-template.xml files in step (#5.2) above so that they point back at the trunk again
   1. Commit your changes
 
 ### 9. Inform commiters that you have finished
 
-  Send an email to wookie-dev@incubator.apache.org informing that you have tagged the trunk for the build and that the trunk has now rolled to the next version. (which also means the freeze has been lifted)
+  Send an email to dev@wookie.apache.org informing that you have tagged the trunk for the build and that the trunk has now rolled to the next version. (which also means the freeze has been lifted)
 
 ### 10. Run the build script
 
@@ -181,19 +181,19 @@ Ideally we'd want a +3 from the committe
   1. This should generate a new folder at the root of wookie called 'release' containing the following structure...
   
         release
-            ${project.version}-incubating
+            ${project.version}
                   binary
                         standalone
-                              apache-wookie-${project.version}-incubating-standalone.tar.gz
-                              apache-wookie-${project.version}-incubating-standalone.zip
+                              apache-wookie-${project.version}-standalone.tar.gz
+                              apache-wookie-${project.version}-standalone.zip
                               rat-report.txt
                         war
-                              apache-wookie-${project.version}-incubating-war.tar.gz
-                              apache-wookie-${project.version}-incubating-war.zip
+                              apache-wookie-${project.version}-war.tar.gz
+                              apache-wookie-${project.version}-war.zip
                               rat-report.txt
                   source
-                        apache-wookie-${project.version}-incubating-src.tar.gz
-                        apache-wookie-${project.version}-incubating-src.zip
+                        apache-wookie-${project.version}-src.tar.gz
+                        apache-wookie-${project.version}-src.zip
                         rat-report.txt
                   runsignatures.bat
 
@@ -218,15 +218,15 @@ Ideally we'd want a +3 from the committe
   1. Make sure you delete the 3 rat-report.txt files (otherwise the next stage will upload them)
   1. From the 'wookie/release' folder run the following to upload the generated build folder and artifacts...
 
-        scp -r ${project.version} ${user.name}@people.apache.org:/www/people.apache.org/builds/incubator/wookie/
+        scp -r ${project.version} ${user.name}@people.apache.org:/www/people.apache.org/builds/wookie/
 
     ...substituting the ${project.version} with the folder name of the generated artifacts i.e...
 
-        scp -r ./0.10.0-incubating joebloggs@people.apache.org:/www/people.apache.org/builds/incubator/wookie/
+        scp -r ./0.10.0-incubating joebloggs@people.apache.org:/www/people.apache.org/builds/wookie/
 
     (Note: the pscp utility comes with putty, rather than scp)
     
-  1. Verify they are downloadable from http://people.apache.org/builds/incubator/wookie
+  1. Verify they are downloadable from http://people.apache.org/builds/wookie
 	
 ### 12. Upload the Nexus release artifacts
 
@@ -260,10 +260,10 @@ Ideally we'd want a +3 from the committe
     - Staging repositories (under Build Promotion) --> Name column --> org.apache.wookie
     - click checkbox for the open staging repo (org.apache.wookie-XXX) and press Close in the menu bar.
 		
-### 13. Put the release candidate up for a vote on the wookie-dev list
+### 13. Put the release candidate up for a vote on the dev@wookie.apache.org list
 
-  1. Create a VOTE email thread on wookie-dev@ to record votes as replies, like [this](release-vote.txt)
-  1. Create a DISCUSS email thread on wookie-dev@ for any vote questions, [this](release-discuss.txt)
+  1. Create a VOTE email thread on dev@wookie.apache.org to record votes as replies, like [this](release-vote.txt)
+  1. Create a DISCUSS email thread on dev@wookie.apache.org for any vote questions, [this](release-discuss.txt)
   1. Perform a review of the release and cast your vote. See the following for more details on Apache releases
 
     [http://www.apache.org/dev/release.html](http://www.apache.org/dev/release.html)
@@ -275,16 +275,7 @@ Ideally we'd want a +3 from the committe
     - reply to the initial email and prepend to the original subject "[RESULT]"
     - Include a list of everyone who voted +1, 0 or -1.
 
-### 14. Put the release candidate up for a vote on the incubator general list
-
-  1. Create similar VOTE email on the general@incubator.apache.org list, like [this](release-vote-general.txt) 
-    - Depending on how many binding +1 IPMC votes the release candidates received, you may need to wait for additional ones from the general list
-  1. After the vote has been open for at least 72 hours and has at least three +1 IPMC votes (in total) then post the results to the vote thread
-    - reply to the initial email and prepend to the original subject "[RESULT]"
-    - Include a list of everyone who voted +1, 0 or -1.
-  1. NOTE: For the release candidate to be successful it must at least have received at least 3 +1 IPMC votes combined from both wookie-dev and general.
-	
-### 15. Finalizing a release
+### 14. Finalizing a release
 
   1. Promote the staged nexus artifacts
     - https://repository.apache.org/index.html
@@ -293,7 +284,7 @@ Ideally we'd want a +3 from the committe
   1. Copy the release artifacts over to the distribution area
     - login to people.apache.org and copy across the build folder
 
-      cp -r /www/people.apache.org/builds/incubator/wookie/${project.version}-incubating /www/www.apache.org/dist/incubator/wookie
+      cp -r /www/people.apache.org/builds/wookie/${project.version} /www/www.apache.org/dist/wookie
  
     (replacing the version name accordingly)
 
@@ -301,7 +292,7 @@ Ideally we'd want a +3 from the committe
   1. Delete the staged version (cleanup)
     - login to people.apache.org (if not already) and delete the old staged release 
 
-      rm -rfv /www/people.apache.org/builds/incubator/wookie/${project.version}-incubating
+      rm -rfv /www/people.apache.org/builds/wookie/${project.version}
 
     (replacing the version name accordingly)
 
@@ -315,20 +306,20 @@ Ideally we'd want a +3 from the committe
     - Wait 24hrs after committing releases for mirrors to replicate
     - Publish updates to the download page
 
-### 16. Update JIRA
+### 15. Update JIRA
 
   1. Update the JIRA versions page to close all issues, mark the version as "released", and set the date to the date that the release was approved. 
   You may also need to make a new release entry for the next release.
 
-### 17. Announcing the release
+### 16. Announcing the release
 
   1. Make a news announcement on the Wookie News page.
   1. Make an announcement about the release on the following lists 
-    - wookie-dev@incubator.apache.org
-    - wookie-users@incubator.apache.org
+    - dev@wookie.apache.org
+    - user@wookie.apache.org
     - announce@apache.org
 
-### 18. Recovering from a vetoed release
+### 17. Recovering from a vetoed release
 
   1. Reply to the initial vote email and prepend to the original subject -
 
@@ -336,11 +327,11 @@ Ideally we'd want a +3 from the committe
 
   1. Delete the svn tag you created in step (7) above. Either use eclipse to do this or via command prompt
 
-      $ svn del https://svn.apache.org/repos/asf/incubator/wookie/tags/${project.version} -m "deleting tag from rolled back release"
+      $ svn del https://svn.apache.org/repos/asf/wookie/tags/${project.version} -m "deleting tag from rolled back release"
 
   1. Delete the build artifacts on people
 
-      $ rm -rfv /www/people.apache.org/builds/incubator/wookie/${project.version}
+      $ rm -rfv /www/people.apache.org/builds/wookie/${project.version}
 
   1. Drop the nexus staging repo
     - https://repository.apache.org/index.html

Modified: wookie/site/trunk/content/docs/source.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/docs/source.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/docs/source.mdtext (original)
+++ wookie/site/trunk/content/docs/source.mdtext Tue Nov 27 13:52:29 2012
@@ -31,8 +31,8 @@ To build from source follow these summar
   - Install [Java JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html) (note the JRE is not sufficient)
   - Install [Apache Subversion](http://subversion.apache.org/packages.html) (or your preferred SVN client, these instructions assume you are using the command line)
   - Install [Apache Ant](http://archive.apache.org/dist/ant/binaries/) 
-  - Either checkout Wookie from [SVN](http://svn.apache.org/repos/asf/incubator/wookie/trunk)
-    - svn co http://svn.apache.org/repos/asf/incubator/wookie/trunk wookie
+  - Either checkout Wookie from [SVN](http://svn.apache.org/repos/asf/wookie/trunk)
+    - svn co http://svn.apache.org/repos/asf/wookie/trunk wookie
   - or, download latest stable release (see also [Release Signing Keys][19])
     -  [apache-wookie-0.11.0-incubating-src.tar.gz][13] [MD5 Checksum][14] [Signature][15]
     -  [apache-wookie-0.11.0-incubating-src.zip][16] [MD5 Checksum][17] [Signature][18]
@@ -52,7 +52,7 @@ If you are running Ubuntu Linux the comm
     sudo apt-get install openjdk-6-jdk
     sudo apt-get install subversion
     sudo apt-get install ant1.7
-    svn co http://svn.apache.org/repos/asf/incubator/wookie/trunk ~/projects/wookie
+    svn co http://svn.apache.org/repos/asf/wookie/trunk ~/projects/wookie
 
 Now skip to "Running Wookie" below.
 
@@ -66,7 +66,7 @@ If you are running Windows you need to d
 
 Once you've installed those applications you should checkout the source as follows:
 
-    svn co http://svn.apache.org/repos/asf/incubator/wookie/trunk ~/projects/wookie
+    svn co http://svn.apache.org/repos/asf/wookie/trunk ~/projects/wookie
 
 ### Running Wookie
 

Modified: wookie/site/trunk/content/get-involved.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/get-involved.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/get-involved.mdtext (original)
+++ wookie/site/trunk/content/get-involved.mdtext Tue Nov 27 13:52:29 2012
@@ -47,4 +47,4 @@ Your first engagement with the project s
 [mailing lists][1].
 
 
- [1]:/wookie/mailing-lists.html
\ No newline at end of file
+ [1]:/mailing-lists.html
\ No newline at end of file

Modified: wookie/site/trunk/content/mailing-lists.mdtext
URL: http://svn.apache.org/viewvc/wookie/site/trunk/content/mailing-lists.mdtext?rev=1414187&r1=1414186&r2=1414187&view=diff
==============================================================================
--- wookie/site/trunk/content/mailing-lists.mdtext (original)
+++ wookie/site/trunk/content/mailing-lists.mdtext Tue Nov 27 13:52:29 2012
@@ -18,12 +18,12 @@ Notice:    Licensed to the Apache Softwa
 
 We welcome you to join our mailing lists and let us know about your thoughts or ideas about Wookie.
 
-- For developers: wookie-dev@incubator.apache.org - [Archives][1]
-  - You must be subscribed to post - send an email to [wookie-dev-subscribe@incubator.apache.org][2]
-- For users: wookie-user@incubator.apache.org
-  - You must be subscribed to post - send an email to [wookie-user-subscribe@incubator.apache.org][3]
+- For developers: dev@incubator.apache.org - [Archives][1]
+  - You must be subscribed to post - send an email to [dev-subscribe@wookie.apache.org][2]
+- For users: user@wookie.apache.org
+  - You must be subscribed to post - send an email to [user-subscribe@wookie.apache.org][3]
 
 
   [1]: http://markmail.org/search/?q=list:wookie
-  [2]: mailto:wookie-dev-subscribe@incubator.apache.org
-  [3]: mailto:wookie-user-subscribe@incubator.apache.org
\ No newline at end of file
+  [2]: mailto:dev-subscribe@wookie.apache.org
+  [3]: mailto:user-subscribe@wookie.apache.org
\ No newline at end of file