Re: [PATCH xorg-docs 2/4] Update configure.ac for gitlab migration

2018-11-17 Thread Alan Coopersmith

On 11/17/18 02:46 PM, Alan Coopersmith wrote:

Signed-off-by: Alan Coopersmith 
---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 80d7307..de17002 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl  Process this file with autoconf to create configure.
  AC_PREREQ([2.60])
  AC_INIT([xorg-docs],
  [1.7.1],
-[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+[https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues],
  [xorg-docs])
  AC_CONFIG_SRCDIR([Makefile.am])
  



I expect we'll make the equivalent change to all our repos, this is just
the one I was working on when I realized that we needed it.

--
-Alan Coopersmith-   alan.coopersm...@oracle.com
 Oracle Solaris Engineering - https://blogs.oracle.com/alanc
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xorg-docs 4/4] Mass http -> https replacement where appropriate

2018-11-17 Thread Alan Coopersmith
Signed-off-by: Alan Coopersmith 
---
 MAINTAINERS | 84 -
 general/License.xml |  8 ++--
 general/README.xml  | 24 ++--
 general/ReleaseNotes.xml| 28 +++---
 general/fonts/fonts.xml | 17 -
 general/input/XKB-Config.xml|  4 +-
 general/input/XKB-Enhancing.xml |  2 +-
 general/platforms/Darwin.xml| 12 +++---
 general/platforms/Solaris.xml   |  6 +--
 man/X.man   |  2 +-
 man/XOrgFoundation.man  |  2 +-
 registry|  8 ++--
 12 files changed, 97 insertions(+), 100 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index b09dd1f..2c6eab0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -35,7 +35,7 @@ S: Status, one of the following:
should be using that.
 
 For patch submission instructions, see:
-http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+https://www.x.org/wiki/Development/Documentation/SubmittingPatches
 
 Send all patches for modules without a specific maintainer address listed
 to xorg-devel@lists.x.org
@@ -292,84 +292,84 @@ Composite extension
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Configuration subsystem
 P: Adam Jackson
 M: a...@nwnk.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Damage extension
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Device Independent X (DIX)
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 DRI subsystem
 P: Adam Jackson
 M: a...@nwnk.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 EXA subsystem
 P: Eric Anholt
 M: anh...@freebsd.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 GL subsystem
 P: Ian Romanick
 M: i...@us.ibm.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 KDrive
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Loader subsystem
 P: Adam Jackson
 M: a...@nwnk.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Randr extension
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Render extension
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 XAA subsystem
 P: Adam Jackson
 M: a...@nwnk.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Despised
 
 XACE subsystem (security policy extensions framework)
@@ -383,14 +383,14 @@ Xfixes extension
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 XKB
 P: Daniel Stone
 M: dan...@fooishbar.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained, being seriously overhauled
 S: Please contact Daniel if you're planning to work on this
 
@@ -400,7 +400,7 @@ M:  dan...@fooishbar.org
 P: Peter Hutterer
 M: peter.hutte...@who-t.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained, being overhauled
 S: Please contact Daniel or Peter if you're planning to work on this
 
@@ -418,42 +418,42 @@ FreeBSD
 P: Eric Anholt
 M: anh...@freebsd.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Linux/i386
 P: Egbert Eich
 M: e...@freedesktop.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Linux/x86_64
 P: Egbert Eich
 M: e...@freedesktop.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Linux/ia64
 P: Jesse Barnes
 M: jbar...@virtuousgeek.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Linux/ppc
 P: Benjamin Herrenschmidt
 M: b...@kernel.crashing.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://wiki.x.org
 S: Maintained
 
 Linux/sparc
 P: ?
 M: ?
 L: xorg-devel@lists.x.org
-W: 

[PATCH xorg-docs 1/4] Update docs for gitlab migration

2018-11-17 Thread Alan Coopersmith
Signed-off-by: Alan Coopersmith 
---
 general/README.xml| 15 +++
 general/ReleaseNotes.xml  | 14 ++
 general/platforms/Solaris.xml |  3 +--
 man/XOrgFoundation.man|  4 ++--
 registry  |  2 +-
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/general/README.xml b/general/README.xml
index 7446fa0..b7fe484 100644
--- a/general/README.xml
+++ b/general/README.xml
@@ -243,13 +243,12 @@ page.
 
 
 If you have any new work or enhancements/bug fixes for existing work,
-please send them as git format patches to
-xorg-de...@lists.freedesktop.org or to our
-https://bugs.freedesktop.org/;>bug tracking system
-using the xorg component.  This will help ensure that they are included
+please submit them via
+https://gitlab.freedesktop.org/xorg;>the gitlab.freedesktop.org 
code management system.
+This will help ensure that they are included
 in future releases.   More details on patch submission and review
 process are available on the
-http://www.x.org/wiki/Development/Documentation/SubmittingPatches;>
+https://www.x.org/wiki/Development/Documentation/SubmittingPatches;>
 SubmittingPatches page of the X.Org wiki.
 
 
@@ -309,7 +308,7 @@ build system and modular code base.
 The X source code for this and all releases/snapshots as well as
 development versions can also be accessed via the Freedesktop.org git
 repository.  It's also possible to browse the http://cgit.freedesktop.org/xorg/;
+url="https://gitlab.freedesktop.org/xorg/;
 >freedesktop git repository.
 
@@ -327,8 +326,8 @@ To check out the latest development version, don't specify 
any tag.
 
 
 Bugs should be reported to freedesktop.org's https://bugs.freedesktop.org/;>bug tracking system
-using the xorg component.  Before
+url="https://gitlab.freedesktop.org/xorg/;>code management system.
+Before
 reporting bugs, please check the server log file, which can be found at
 /var/log/Xorg.0.log on most platforms.  If you can't
 resolve the problem yourself, send the entire log file with your bug report but
diff --git a/general/ReleaseNotes.xml b/general/ReleaseNotes.xml
index 0b0c913..0aa9ee1 100644
--- a/general/ReleaseNotes.xml
+++ b/general/ReleaseNotes.xml
@@ -86,11 +86,9 @@
 
 
 
-  We encourage you to report bugs using
-  freedesktop.org's https://bugs.freedesktop.org/;>
-   bug tracking system using the xorg product, and to
-  submit bug fixes and enhancements to
-  xorg-devel@lists.x.org.
+  We encourage you to report bugs, and to
+  submit bug fixes and enhancements via
+https://gitlab.freedesktop.org/xorg;>the gitlab.freedesktop.org 
code management system.
   More details on patch submission and review process are available on the
   http://www.x.org/wiki/Development/Documentation/SubmittingPatches;>
@@ -1030,8 +1028,8 @@ 
url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html;
 turn these selected warnings into errors by adding
 --disable-selective-werror to the configure command
 for the affected module.   If that is necessary for any X.Org modules,
-please report a bug in the xorg product on
-https://bugs.freedesktop.org/; />.
+please report a bug in the project for that module on
+https://gitlab.freedesktop.org/xorg; />.
   
 
   
@@ -1346,7 +1344,7 @@ 
url="http://who-t.blogspot.com/2012/01/xkb-breaking-grabs-cve-2012-0064.html;
   This section lists the credits for the X11R release.
   For a more detailed breakdown, refer to the ChangeLog file in
   the source tree for each module, the history in http://cgit.freedesktop.org/xorg/;>the xorg product in
+   url="https://gitlab.freedesktop.org/xorg;>the xorg projects in
freedesktop.org's git repositories or the
   'git log' information for individual source files.
 
diff --git a/general/platforms/Solaris.xml b/general/platforms/Solaris.xml
index dfd2106..953e733 100644
--- a/general/platforms/Solaris.xml
+++ b/general/platforms/Solaris.xml
@@ -165,8 +165,7 @@ Xqueue is NOT supported 
under Solaris.
 
 
 Bug reports should be reported at
-http://bugs.freedesktop.org/;> using the
-xorg product or sent to x...@lists.freedesktop.org.
+https://gitlab.freedesktop.org/xorg; />.
 
 
 
diff --git a/man/XOrgFoundation.man b/man/XOrgFoundation.man
index 0ed0779..13d7da7 100644
--- a/man/XOrgFoundation.man
+++ b/man/XOrgFoundation.man
@@ -52,6 +52,6 @@ The X.Org Foundation's web site is http://www.x.org/
 .PP
 The X.Org Foundation's public ftp site is ftp://ftp.x.org/
 .PP
-Information about the X.Org Foundation git repository is on the
-X.Org web site at http://www.x.org/wiki/Development/git
+The X.Org Foundation's public source repositories are at
+https://gitlab.freedesktop.org/xorg
 .fi
diff --git a/registry b/registry
index 4c332ed..81c28f9 100644
--- a/registry
+++ b/registry
@@ -21,7 +21,7 @@ Please allow up to 4 weeks for a formal response to 
registration and 

[PATCH xorg-docs 3/4] Update MAINTAINERS for gitlab migration

2018-11-17 Thread Alan Coopersmith
Replace dozens of links to wiki.x.org with gitlab project links
Change status to "Deactivated" for projects marked "Archived" in gitlab

Signed-off-by: Alan Coopersmith 
---
 MAINTAINERS | 218 ++--
 1 file changed, 109 insertions(+), 109 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 5316057..b09dd1f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -46,14 +46,14 @@ DRM library
 P: Adam Jackson
 M: a...@nwnk.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/mesa/drm
 S: Maintained
 
 PCI Access Library
 P: Ian Romanick
 M: ?
 L: xorg-devel@lists.x.org
-W: http://wiki.freedesktop.org/wiki/PciRework
+W: https://gitlab.freedesktop.org/xorg/lib/libpciaccess
 S: Supported
 
 X.Org apps
@@ -81,63 +81,63 @@ xauth
 P: Dr. Tilmann Bubeck
 M: t.bub...@reinform.de
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xauth
 S: Maintained
 
 xbiff
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xbiff
 S: Maintained
 
 xcalc 
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xcalc
 S: Maintained
 
 xclock
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xclock
 S: Maintained
 
 xconsole
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xconsole
 S: Maintained
 
 xdm
 P: Alan Coopersmith
 M: alan.coopersm...@oracle.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xdm
 S: Maintained
 
 xedit
 P: Paulo César Pereira de Andrade
 M: p...@mandriva.com.br
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xedit
 S: Maintained
 
 xinput
 P: Peter Hutterer
 M: peter.hutte...@who-t.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xinput
 S: Maintained
 
 xkbcomp
 P: Daniel Stone
 M: dan...@fooishbar.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xkbcomp
 S: Maintained
 S: XKB being overhauled
 S: Please contact Daniel if you're planning to work on this
@@ -146,21 +146,21 @@ xload
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xload
 S: Maintained
 
 xman 
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xman
 S: Maintained
 
 xmessage
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xmessage
 S: Maintained
 
 xmh
@@ -176,14 +176,14 @@ xsetroot
 P: Matthieu Herrb
 M: matthieu.he...@laas.fr
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app/xsetroot
 S: Maintained
 
 all others
 P: ?
 M: xorg-devel@lists.x.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/app
 S: Unmaintained
 
 X.Org libraries
@@ -204,7 +204,7 @@ X11, Xcomposite, Xcursor, Xdamage, Xfixes, Xrandr, Xrender
 P: Keith Packard
 M: keith.pack...@intel.com
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/lib
 S: Maintained
 
 Xdmcp
@@ -228,14 +228,14 @@ Xi
 P: Peter Hutterer
 M: peter.hutte...@who-t.net
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/lib/libxi
 S: Maintained
 
 xkbfile
 P: Daniel Stone
 M: dan...@fooishbar.org
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
+W: https://gitlab.freedesktop.org/xorg/lib/libxkbfile
 S: Maintained
 S: XKB being overhauled
 S: Please contact Daniel if you're planning to work on this
@@ -283,7 +283,7 @@ xtrans
 P:  Bill Crawford
 M:  billcrawford1...@gmail.com
 L:  xorg-devel@lists.x.org
-W:  http://wiki.x.org
+W:  https://gitlab.freedesktop.org/xorg/lib/libxtrans
 S:  Maintained
 
 X.Org core
@@ -409,8 +409,8 @@ P:  Drew Parsons
 P: Felix Schulte
 M: ?
 L: xorg-devel@lists.x.org
-W: http://wiki.x.org
-S: Maintained
+W: https://gitlab.freedesktop.org/xorg/xserver-xprint
+S: Deactivated
 
 X.Org OS ports
 

[PATCH xorg-docs 0/4] Update docs for gitlab migration & http->https

2018-11-17 Thread Alan Coopersmith
This series is also covered by
https://gitlab.freedesktop.org/xorg/doc/xorg-docs/merge_requests/1
but email still seems to get more attention than merge requests on
the less active repos.

[PATCH xorg-docs 1/4] Update docs for gitlab migration
[PATCH xorg-docs 2/4] Update configure.ac for gitlab migration
[PATCH xorg-docs 3/4] Update MAINTAINERS for gitlab migration
[PATCH xorg-docs 4/4] Mass http -> https replacement where

There are still plenty of other things to update in MAINTAINERS,
like entries for Keith using his intel.com email, or changing
the xf86-video-nv driver to a state other than "Maintained", but
I'm leaving those as an exercise for others at this point.

(There's also some other things I see in the docs to cleanup before
 doing a release, but that's a project for another day, while this
 batch is ready to go.)

-Alan Coopersmith-   alan.coopersm...@oracle.com
 Oracle Solaris Engineering - https://blogs.oracle.com/alanc
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xorg-docs 2/4] Update configure.ac for gitlab migration

2018-11-17 Thread Alan Coopersmith
Signed-off-by: Alan Coopersmith 
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 80d7307..de17002 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl  Process this file with autoconf to create configure.
 AC_PREREQ([2.60])
 AC_INIT([xorg-docs],
 [1.7.1],
-[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+[https://gitlab.freedesktop.org/xorg/doc/xorg-docs/issues],
 [xorg-docs])
 AC_CONFIG_SRCDIR([Makefile.am])
 
-- 
2.15.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: Migrating x.org wiki to GitLab

2018-11-17 Thread Zach Reizner
On Wed, Nov 14, 2018 at 3:38 PM Eric Anholt  wrote:
>
> Zach  writes:
>
> > Hello X.Org Developers,
> >
> > I have been working on migrating the x.org/wiki/ to GitLab pages. The
> > tracking issue is at
> > https://gitlab.freedesktop.org/freedesktop/freedesktop/issues/80 and
> > the current development branch is at
> > https://gitlab.freedesktop.org/zachr/xorg-wiki/tree/hugo. You can see
> > the pages rendered from ToT at
> > https://zachr.pages.freedesktop.org/xorg-wiki/.
> >
> > As part of the migration process, I have converted the markdown flavor
> > from ikiwiki to hugo using a custom script. Not everything in the old
> > flavor can be replicated practically in the new flavor, so there will
> > be junk in the converted pages, unfortunately. As we identify which of
> > the approximately 1000 converted pages is actually seen by human eyes,
> > we will fix the glitches.
> >
> > Additionally, I have designed a new theme which is aiming for
> > accessibility and clarity. What you see on there isn't final, but is
> > hopefully good enough.
> >
> > When the migration is done, the primary advantage will be much more
> > streamlined edits by the community. Thanks to the hugo static site
> > generator, editors will be able to render locally in under 1 second to
> > verify that their change renders nicely. Getting their change
> > published is a simple merge request, and then the site automatically
> > gets rebuilt and published by GitLab. If all goes well, the entire
> > process can be done in 5 minutes.
> >
> > Please let me know if you have any objections or questions about the 
> > migration.
>
> I'd love to see ikiwiki go away and have people be able to edit the wiki
> inside gitlab (as well as work from a local clone).  Does your
> conversion let people do things from a web ui, or do they have to do
> offline generation to test things?

There isn't any web UI, besides the generic gitlab editor for files in
a repo. The gitlab-ci should automatically regenerate pages in any
forked repo, but that would be clunky in comparison to cloning and
generating locally.
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel