[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.11.11-1-8-g1dc5647

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=ae3340e

The following commit has been merged in the master branch:
commit ae3340e9a7173496a8b1605c35c0b8621a5372f2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Sep 5 17:03:14 2014 +0200

    kdm: Remove xdm documentation from the README.Debian file. (Closes: #247196)
---
 debian/changelog         |  3 ++-
 debian/kdm.README.Debian | 57 ------------------------------------------------
 2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 76729be..0bc7f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kde-workspace (4:4.11.11-2) UNRELEASED; urgency=medium
 
-  * 
+  * kdm: Remove xdm documentation from the README.Debian file. (Closes:
+    #247196)
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Sep 2014 17:00:54 +0200
 
diff --git a/debian/kdm.README.Debian b/debian/kdm.README.Debian
index bad62c4..6b037da 100644
--- a/debian/kdm.README.Debian
+++ b/debian/kdm.README.Debian
@@ -33,60 +33,3 @@ and background configuration file (backgroundrc):
 
 You just need to create a file with overridden value(s) and put it in
 kdm override directory (default is /etc/default/kdm.d).
-
-================================================
-Below this is direct from the xdm package README
-================================================
-
-Debian README for the xdm package:
-
-Newcomers to the X Window System should first read the file
-/usr/share/doc/x11-common/FAQ.gz. You can view this file with your
-favorite pager program after decompressing it.  For example:
-    $ zcat /usr/share/doc/x11-common/FAQ.gz | pager
-
-The default configuration for the X display manager (xdm) under Debian
-GNU/Linux presumes that one wishes xdm to manage one local session.  (In
-other words, the xdm login screen occupies one virtual console
-automatically at boot.)  If one does not wish to run a local X server, the
-following line should be commented out of /etc/X11/xdm/Xservers:
-
-:0 local /usr/bin/X11/X vt7 -deferglyphs 16
-
-Several configuration files are shipped with the xdm package; they reside
-in the /etc/X11/xdm/ directory.  Extensive documentation about the xdm
-configuration files may be found in the xdm(1) manual page.
-
-xdm-config contains X resources specific to xdm itself.  See the X(1)
-manual page for more information about X resources, and the xdm(1) manual
-pages for documentation of the available xdm resources.
-
-Xresources contains X resources that are designed to be specfic to sessions
-running under xdm.  Note that this file does contain the resource entries
-for xdm itself -- those are contained in the file xdm-config.  See the X(1)
-manual page for more information about X resources.
-
-The above three files, despite being X resource files, are not placed in the
-/etc/X11/Xresources directory (see /usr/share/doc/xbase/README.Debian) because
-they should not be used automatically in all X sessions; the /etc/X11/Xsession
-script merges in the resources of all files found in /etc/X11/Xresources, and
-this action would be inappropriate for these resource files.
-
-Xservers contains entries to start the X server(s) on the local machine, and
-on any remote X terminals that do not support XDMCP.  This file is internally
-documented.
-
-Xaccess determines what hosts on the network may use the services of the
-running xdm daemon.  This file is internally documented.  Note that as of
-version 3.3.4-1 of the xdm package, all remote XDMCP access is turned off
-by default.
-
-Xstartup is a shell script which is run (as root) after a user has logged in
-on a server.
-
-Xreset is a shell script which is run (as root) after a user's X session ends on
-a server.
-
-xdm.options contains configuration options for xdm that are specific to the
-Debian GNU/Linux system.  See the xdm.options(5) manual page for more
-information.

-- 
KDE Base Workspace module packaging