From 1e98963e093a21f06e91cbc2326464568e5115f0 Mon Sep 17 00:00:00 2001
From: Vanessa Richie <vanessa.richie@forgerock.com>
Date: Wed, 09 Jan 2013 22:16:54 +0000
Subject: [PATCH] Rolling back to previous version and adding changes manually.

---
 opendj3/src/main/docbkx/shared/sec-joining-the-community.xml  |   29 ++++++++++++++++-------------
 opendj3/src/main/docbkx/shared/sec-formatting-conventions.xml |    4 ++--
 opendj3/src/main/docbkx/shared/sec-accessing-doc-online.xml   |   16 ++++++++--------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/opendj3/src/main/docbkx/shared/sec-accessing-doc-online.xml b/opendj3/src/main/docbkx/shared/sec-accessing-doc-online.xml
index 3364313..d429685 100644
--- a/opendj3/src/main/docbkx/shared/sec-accessing-doc-online.xml
+++ b/opendj3/src/main/docbkx/shared/sec-accessing-doc-online.xml
@@ -29,7 +29,7 @@
  xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
  xmlns:xlink='http://www.w3.org/1999/xlink'
  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
- <title>Accessing OpenAM Documentation Online</title>
+ <title>Accessing OpenDJ Documentation Online</title>
 
  <para>Core documentation, such as what you are now reading, aims to
  be technically accurate and complete with respect to the software
@@ -42,11 +42,11 @@
  <para>Fully baked core documentation is available at <link
  xlink:href='http://docs.forgerock.org/'>docs.forgerock.org</link>.</para>
 
- <para>The <link
- xlink:href="https://wikis.forgerock.org/confluence/display/OPENAM/Home"
- xlink:show="new">OpenAM Wiki</link> regularly brings you more, fresh content.
- In addition, you are welcome to <link xlink:show="new"
- xlink:href='https://idp.forgerock.org/openam/UI/Login?service=register'
- >sign up</link> and then edit the Wiki if you notice an error, or if you
- have something to share.</para>
+ <para>The <link xlink:show="new"
+ xlink:href="https://wikis.forgerock.org/confluence/display/OPENDJ/Home">OpenDJ
+ Wiki</link> regularly brings you more, fresh content. In addition, you are
+ welcome to <link xlink:show="new"
+ xlink:href="https://idp.forgerock.org/openam/UI/Login?service=register">sign
+ up</link> and then edit the Wiki if you notice an error, or if you have
+ something to share.</para>
 </section>
diff --git a/opendj3/src/main/docbkx/shared/sec-formatting-conventions.xml b/opendj3/src/main/docbkx/shared/sec-formatting-conventions.xml
index d16f15d..5d54a77 100644
--- a/opendj3/src/main/docbkx/shared/sec-formatting-conventions.xml
+++ b/opendj3/src/main/docbkx/shared/sec-formatting-conventions.xml
@@ -43,8 +43,8 @@
  and so forth are marked (UNIX). Sections pertaining to Microsoft Windows
  might be marked (Windows). To avoid repetition, however, file system
  directory names are often given only in UNIX format as in
- <filename>/path/to/OpenAM</filename>, even if the text applies to
- <filename>C:\path\to\OpenAM</filename> as well.</para>
+ <filename>/path/to/OpenDJ</filename>, even if the text applies to
+ <filename>C:\path\to\OpenDJ</filename> as well.</para>
 
  <para>Absolute path names usually begin with the placeholder
  <filename>/path/to/</filename>, which might translate to
diff --git a/opendj3/src/main/docbkx/shared/sec-joining-the-community.xml b/opendj3/src/main/docbkx/shared/sec-joining-the-community.xml
index 878de55..da52561 100644
--- a/opendj3/src/main/docbkx/shared/sec-joining-the-community.xml
+++ b/opendj3/src/main/docbkx/shared/sec-joining-the-community.xml
@@ -29,28 +29,31 @@
  xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
  xmlns:xlink='http://www.w3.org/1999/xlink'
  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
- <title>Joining the OpenAM Community</title>
+ <title>Joining the OpenDJ Community</title>
 
- <para>After you <link xlink:show="new"
+ <para>After you <link
  xlink:href='https://idp.forgerock.org/openam/UI/Login?service=register'
  >sign up</link> at ForgeRock, you can also login to the Wiki and the issue
  database to follow what is happening with the project.</para>
 
- <para>If you have questions regarding OpenAM which are not answered by the
+ <para>If you have questions regarding OpenDJ which are not answered by the
  documentation, there is a mailing list which can be found at
- <link xlink:href='https://lists.forgerock.org/mailman/listinfo/openam'
- xlink:show="new">https://lists.forgerock.org/mailman/listinfo/openam</link>
- where you are likely to find an answer. You can also make suggestions 
+ <link xlink:href='https://lists.forgerock.org/mailman/listinfo/opendj'
+ >https://lists.forgerock.org/mailman/listinfo/opendj</link> where you are
+ likely to find an answer. You can also make suggestions 
  regarding updates at the documentation mailing list 
  (<link xlink:href='https://lists.forgerock.org/mailman/listinfo/docs'
  xlink:show="new">https://lists.forgerock.org/mailman/listinfo/docs</link>).</para>
 
- <para>The Wiki has information on how to check out OpenAM source code.
- There is also a mailing list for OpenAM development that can be found at
- <link xlink:href='https://lists.forgerock.org/mailman/listinfo/openam-dev'
- xlink:show="new">https://lists.forgerock.org/mailman/listinfo/openam-dev</link>.
+ <para>You can join the IRC discussion in the #opendj room at
+ irc.freenode.net.</para>
+
+ <para>The Wiki has information on how to check out OpenDJ source code.
+ There is also a mailing list for OpenDJ development that can be found at
+ <link xlink:href='https://lists.forgerock.org/mailman/listinfo/opendj-dev'
+ >https://lists.forgerock.org/mailman/listinfo/opendj-dev</link>.
  Should you want to contribute a patch, test, or feature, or want to author
- part of the core documentation, first have a look on the ForgeRock site
- at <link xlink:href='http://www.forgerock.org/get_involved.html'
- xlink:show="new">how to get involved</link>.</para>
+ part of the core documentation, first have a look on the ForgeRock Community
+ page at <link xlink:href='http://www.forgerock.org/get_involved.html'>
+ how to get involved</link>.</para>
 </section>

--
Gitblit v1.10.0