From f78f52cff1b6a38bc2a53a68df4675f88d95b20e Mon Sep 17 00:00:00 2001 From: Mark Komarinski Date: Tue, 2 Feb 2016 11:10:25 -0500 Subject: [PATCH 1/3] Remove most other references to CVS, replace with git and GitHub --- LDP/guide/docbook/LDP-Author-Guide/ag-maintain.xml | 4 ++-- LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml | 6 +++--- LDP/guide/docbook/LDP-Author-Guide/conventions.xml | 2 +- LDP/guide/docbook/LDP-Author-Guide/templates.xml | 2 +- LDP/guide/docbook/LDP-Author-Guide/validate-why.xml | 5 +++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-maintain.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-maintain.xml index 2ec0dc8d..2bf05de4 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/ag-maintain.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/ag-maintain.xml @@ -44,9 +44,9 @@
Fixing Your Own Documents - If you find an error in your own document, please fix it and re-submit the document. You can re-submit your files by emailing them to submit@en.tldp.org. + If you find an error in your own document, please fix it and re-submit the document. If you do not have GitHub access, you can send an e-mail to discuss@en.tldp.org with notification that you have changes and a volunteer will work with you to handle the change. - If you have been using the CVS, you can submit your changes to the CVS tree and then send a note to the submit mailing list (submit@en.tldp.org). In your email please give the exact path of your document in the CVS tree. + If you are using GitHub, you can commit your changes to your local repository and then generate a pull request to have it added to the central repository. Remember to update the revision history at the top of the document.
diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml index a7c7d37f..61502bfe 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/ag-submit.xml @@ -12,14 +12,14 @@ As part of the review process a Review Coordinator will add your - document to the CVS (including any associated image files) and + document to the git repository (including any associated image files) and notify the submit mailing list that your document is ready for publication. - Subsequent updates to your document can be made via the CVS. Please read - for more information. + Subsequent updates to your document can be made via git if you like. Please read + for more information. - -
- epcEdit screen shot - - - - - - - - - The screen shot of the epcEdit - program shows a - tree on the left side that has the document in a - hierarchy, while the right side shows the document. - Tags are shown with a gray background. - - -
- - -
-Morphon XML editor - - - http://www.morphon.com/xmleditor/index.shtml - - - This is a commercial application which is currently - available for free (with an optional user registration). - It is written in Java, allowing it to run on any platform - that has a Java Virtual Machine (that is, works in both - Windows and Linux). - - - On the plus sides of XMLEditor is the left side of the - screen shows the hierarchy of the document (starting with Book - and so on). Selecting an item in the list brings you to that - part of the document so you can edit it. The right part of the - screen shows the text without any markup or tags being shown. - If you have external files as ELEMENTS (as the LDP Author Guide - does), XMLEditor will follow the links and load the files, so - you always work on the entire work. On the minus side of this, - you will get errors if a file is missing. - -
-
nedit nedit @@ -109,16 +31,16 @@ nedit - - http://nedit.org + + http://sourceforge.net/projects/nedit/ To be fair, nedit is more for programmers, so it might seem a bit of overkill for new users and especially non-programmers. All that aside, it's - extremely powerful, allowing for syntax highlighting. Unlike - epcEdit, nedit doesn't allow you to automatically insert tags + extremely powerful, allowing for syntax highlighting. + nedit doesn't allow you to automatically insert tags or automatically validate your code. However, it does allow for shell commands to be run against the contents of the window (as opposed to saving the file, then checking). From b6ea6df0c65c1a026c512af832805e6b19f9dfbc Mon Sep 17 00:00:00 2001 From: Mark Komarinski Date: Wed, 3 Feb 2016 13:37:56 -0500 Subject: [PATCH 3/3] Add by-nc-sa 4.0 as a valid license --- LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml index 8d763eb1..39f3492b 100644 --- a/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml +++ b/LDP/guide/docbook/LDP-Author-Guide/ag-distribute.xml @@ -100,7 +100,7 @@ url="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License (GFDL), one of the Creative Commons - Licenses (such as Attribution-Share-Alike), or the LDP license (currently under review). The full text of the license must be included in your document, including the title and version of the license you are using. The LDP will not accept new documents that do not meet licensing requirements. + Licenses (such as Attribution-NonCommercial-ShareAlike and Attribution-ShareAlike), or the LDP license (currently under review). The full text of the license must be included in your document, including the title and version of the license you are using. The LDP will not accept new documents that do not meet licensing requirements. Debian-compatible licenses