aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING2
-rw-r--r--Makefile4
-rw-r--r--README2
-rw-r--r--docs/quickstart.md4
-rw-r--r--make.bat2
-rw-r--r--make.py10
-rw-r--r--resources/slides_content2.lua4
-rw-r--r--site/user/quick/windows.md2
-rw-r--r--skia.gyp2
9 files changed, 16 insertions, 16 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 900cad5ec8..aaa83a5eb9 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1 +1 @@
-Please see the guidelines for contributing code at https://sites.google.com/site/skiadocs/developer-documentation/contributing-code
+Please see the guidelines for contributing code at https://skia.org/dev/contrib/
diff --git a/Makefile b/Makefile
index 68e7b294ff..baaabfa70b 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@
# If you want more fine-grained control, you can run gyp and then build the
# gyp-generated projects yourself.
#
-# See https://sites.google.com/site/skiadocs/ for complete documentation.
+# See https://skia.org for complete documentation.
SKIA_OUT ?= out
BUILDTYPE ?= Debug
@@ -67,7 +67,7 @@ default: most
uname := $(shell uname)
ifneq (,$(findstring CYGWIN, $(uname)))
- $(error Cannot build using Make on Windows. See https://sites.google.com/site/skiadocs/user-documentation/quick-start-guides/windows)
+ $(error Cannot build using Make on Windows. See https://skia.org/user/quick/windows)
endif
# If user requests "make all", chain to our explicitly-declared "everything"
diff --git a/README b/README
index a60bca657d..b28fb27e83 100644
--- a/README
+++ b/README
@@ -1,3 +1,3 @@
Skia is a complete 2D graphic library for drawing Text, Geometries, and Images.
-See full details, and build instructions, at https://sites.google.com/site/skiadocs/home
+See full details, and build instructions, at https://skia.org.
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 6c779a7d38..12002caa64 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -4,8 +4,8 @@ Skia Quickstart Guide
WARNING: Several steps in this guide are out of sync with our automatically-
tested, officially-supported processes for checking out and building Skia.
-The officially supported processes are the ones documented in skiadocs; see
-https://sites.google.com/site/skiadocs/user-documentation/quick-start-guides
+The officially supported processes are the ones documented in https://skia.org;
+see https://skia.org/user/quick.
The steps documented within this file are more experimental in nature.
diff --git a/make.bat b/make.bat
index 94d0755912..64b4b703ce 100644
--- a/make.bat
+++ b/make.bat
@@ -5,7 +5,7 @@
@ECHO OFF
rem Launches make.py on Windows, after setting Visual Studio environment variables.
-rem See https://sites.google.com/site/skiadocs/user-documentation/quick-start-guides/windows
+rem See https://skia.org/user/quick/windows.
rem Skip environment setup on bots.
if "%CHROME_HEADLESS%"=="1" goto run_python
diff --git a/make.py b/make.py
index 2bb00a230f..414cc9f5bb 100644
--- a/make.py
+++ b/make.py
@@ -4,7 +4,7 @@
# found in the LICENSE file.
# "Makefile" replacement to build skia for Windows.
-# More info at https://sites.google.com/site/skiadocs/
+# More info at https://skia.org.
#
# Some usage examples:
# make clean
@@ -150,19 +150,19 @@ def Make(args):
elif os.name == 'posix':
if sys.platform == 'darwin':
print 'Mac developers should not run this script; see ' \
- 'https://sites.google.com/site/skiadocs/user-documentation/quick-start-guides/mac'
+ 'https://skia.org/user/quick/macos'
sys.exit(1)
elif sys.platform == 'cygwin':
print 'Windows development on Cygwin is not currently supported; see ' \
- 'https://sites.google.com/site/skiadocs/user-documentation/quick-start-guides/windows'
+ 'https://skia.org/user/quick/windows'
sys.exit(1)
else:
print 'Unix developers should not run this script; see ' \
- 'https://sites.google.com/site/skiadocs/user-documentation/quick-start-guides/linux'
+ 'https://skia.org/user/quick/linux'
sys.exit(1)
else:
print 'unknown platform (os.name=%s, sys.platform=%s); see %s' % (
- os.name, sys.platform, 'https://sites.google.com/site/skiadocs/')
+ os.name, sys.platform, 'https://skia.org/user/quick')
sys.exit(1)
sys.exit(0)
diff --git a/resources/slides_content2.lua b/resources/slides_content2.lua
index 3b4eb09445..2b293a244a 100644
--- a/resources/slides_content2.lua
+++ b/resources/slides_content2.lua
@@ -1,8 +1,8 @@
Skia Update
Skia : Access
-- code.google.com/p/skia
-- sites.google.com/site/skiadocs
+- https://skia.org
+- https://skia.googlesource.com/skia
Skia : Overview
- portable graphics engine
diff --git a/site/user/quick/windows.md b/site/user/quick/windows.md
index 0607857b9d..53eb5d9a2e 100644
--- a/site/user/quick/windows.md
+++ b/site/user/quick/windows.md
@@ -34,7 +34,7 @@ Make sure the following have been installed:
Check out the source code
-------------------------
-see https://sites.google.com/site/skiadocs/developer-documentation/contributing-code/downloading
+see https://skia.org/user/download
Generate Visual Studio projects
-------------------------------
diff --git a/skia.gyp b/skia.gyp
index e554df1dcc..2205de1cc6 100644
--- a/skia.gyp
+++ b/skia.gyp
@@ -6,7 +6,7 @@
# More targets are defined within the gyp/ directory, but those are
# not intended for external use and may change without notice.
#
-# Full documentation at https://sites.google.com/site/skiadocs/
+# Full documentation at https://skia.org.
#
{
'targets': [